From abc1d3db70c51d59ad60ae493bd58e7985392598 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Sat, 23 Jul 2022 07:46:32 -0700
Subject: [PATCH 01/69] Big Memory Leak in One Test (#2958)

* Big Memory Leak in One Test

Many tests leak a little by not issuing disconnectWorksheets at the end. CellMatcherTest leaks a lot by opening a spreadsheet many times. Phpunit reported a high watermark of 390MB; fixing CellMatcherTest brings that figure down to 242MB. I have also changed it to use a formal assertion in many cases where markTestSkipped was (IMO inappropriately) used.

* Another Leak

Issue2301Test lacks a disconnect. Adding one reduces HWM from 242MB to 224.
---
 .../Reader/Xlsx/Issue2301Test.php             |   2 +
 .../ConditionalFormatting/CellMatcherTest.php | 105 +++++++-----------
 2 files changed, 44 insertions(+), 63 deletions(-)

diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/Issue2301Test.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/Issue2301Test.php
index 4484b9e0..7a5829f7 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xlsx/Issue2301Test.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/Issue2301Test.php
@@ -24,5 +24,7 @@ class Issue2301Test extends \PHPUnit\Framework\TestCase
         self::assertSame('Arial CE', $font->getName());
         self::assertSame(9.0, $font->getSize());
         self::assertSame('protected', $sheet->getCell('BT10')->getStyle()->getProtection()->getHidden());
+        $spreadsheet->disconnectWorksheets();
+        unset($spreadsheet);
     }
 }
diff --git a/tests/PhpSpreadsheetTests/Style/ConditionalFormatting/CellMatcherTest.php b/tests/PhpSpreadsheetTests/Style/ConditionalFormatting/CellMatcherTest.php
index 3c96403b..2c6d0da8 100644
--- a/tests/PhpSpreadsheetTests/Style/ConditionalFormatting/CellMatcherTest.php
+++ b/tests/PhpSpreadsheetTests/Style/ConditionalFormatting/CellMatcherTest.php
@@ -10,15 +10,24 @@ use PHPUnit\Framework\TestCase;
 class CellMatcherTest extends TestCase
 {
     /**
-     * @var Spreadsheet
+     * @var ?Spreadsheet
      */
     protected $spreadsheet;
 
-    protected function setUp(): void
+    protected function loadSpreadsheet(): Spreadsheet
     {
         $filename = 'tests/data/Style/ConditionalFormatting/CellMatcher.xlsx';
         $reader = IOFactory::createReader('Xlsx');
-        $this->spreadsheet = $reader->load($filename);
+
+        return $reader->load($filename);
+    }
+
+    protected function tearDown(): void
+    {
+        if ($this->spreadsheet !== null) {
+            $this->spreadsheet->disconnectWorksheets();
+            $this->spreadsheet = null;
+        }
     }
 
     /**
@@ -26,16 +35,13 @@ class CellMatcherTest extends TestCase
      */
     public function testBasicCellIsComparison(string $sheetname, string $cellAddress, array $expectedMatches): void
     {
+        $this->spreadsheet = $this->loadSpreadsheet();
         $worksheet = $this->spreadsheet->getSheetByName($sheetname);
-        if ($worksheet === null) {
-            self::markTestSkipped("{$sheetname} not found in test workbook");
-        }
+        self::assertNotNull($worksheet, "$sheetname not found in test workbook");
         $cell = $worksheet->getCell($cellAddress);
 
         $cfRange = $worksheet->getConditionalRange($cell->getCoordinate());
-        if ($cfRange === null) {
-            self::markTestSkipped("{$cellAddress} is not in a Conditional Format range");
-        }
+        self::assertNotNull($cfRange, "{$cellAddress} is not in a Conditional Format range");
         $cfStyles = $worksheet->getConditionalStyles($cell->getCoordinate());
 
         $matcher = new CellMatcher($cell, $cfRange);
@@ -82,16 +88,13 @@ class CellMatcherTest extends TestCase
      */
     public function testRangeCellIsComparison(string $sheetname, string $cellAddress, bool $expectedMatch): void
     {
+        $this->spreadsheet = $this->loadSpreadsheet();
         $worksheet = $this->spreadsheet->getSheetByName($sheetname);
-        if ($worksheet === null) {
-            self::markTestSkipped("{$sheetname} not found in test workbook");
-        }
+        self::assertNotNull($worksheet, "$sheetname not found in test workbook");
         $cell = $worksheet->getCell($cellAddress);
 
         $cfRange = $worksheet->getConditionalRange($cell->getCoordinate());
-        if ($cfRange === null) {
-            self::markTestSkipped("{$cellAddress} is not in a Conditional Format range");
-        }
+        self::assertNotNull($cfRange, "$cellAddress is not in a Conditional Format range");
         $cfStyle = $worksheet->getConditionalStyles($cell->getCoordinate());
 
         $matcher = new CellMatcher($cell, $cfRange);
@@ -128,16 +131,13 @@ class CellMatcherTest extends TestCase
      */
     public function testCellIsMultipleExpression(string $sheetname, string $cellAddress, array $expectedMatches): void
     {
+        $this->spreadsheet = $this->loadSpreadsheet();
         $worksheet = $this->spreadsheet->getSheetByName($sheetname);
-        if ($worksheet === null) {
-            self::markTestSkipped("{$sheetname} not found in test workbook");
-        }
+        self::assertNotNull($worksheet, "$sheetname not found in test workbook");
         $cell = $worksheet->getCell($cellAddress);
 
         $cfRange = $worksheet->getConditionalRange($cell->getCoordinate());
-        if ($cfRange === null) {
-            self::markTestSkipped("{$cellAddress} is not in a Conditional Format range");
-        }
+        self::assertNotNull($cfRange, "$cellAddress is not in a Conditional Format range");
         $cfStyles = $worksheet->getConditionalStyles($cell->getCoordinate());
 
         $matcher = new CellMatcher($cell, $cfRange);
@@ -167,16 +167,13 @@ class CellMatcherTest extends TestCase
      */
     public function testCellIsExpression(string $sheetname, string $cellAddress, bool $expectedMatch): void
     {
+        $this->spreadsheet = $this->loadSpreadsheet();
         $worksheet = $this->spreadsheet->getSheetByName($sheetname);
-        if ($worksheet === null) {
-            self::markTestSkipped("{$sheetname} not found in test workbook");
-        }
+        self::assertNotNull($worksheet, "$sheetname not found in test workbook");
         $cell = $worksheet->getCell($cellAddress);
 
         $cfRange = $worksheet->getConditionalRange($cell->getCoordinate());
-        if ($cfRange === null) {
-            self::markTestSkipped("{$cellAddress} is not in a Conditional Format range");
-        }
+        self::assertNotNull($cfRange, "$cellAddress is not in a Conditional Format range");
         $cfStyle = $worksheet->getConditionalStyles($cell->getCoordinate());
 
         $matcher = new CellMatcher($cell, $cfRange);
@@ -216,16 +213,13 @@ class CellMatcherTest extends TestCase
      */
     public function testTextExpressions(string $sheetname, string $cellAddress, bool $expectedMatch): void
     {
+        $this->spreadsheet = $this->loadSpreadsheet();
         $worksheet = $this->spreadsheet->getSheetByName($sheetname);
-        if ($worksheet === null) {
-            self::markTestSkipped("{$sheetname} not found in test workbook");
-        }
+        self::assertNotNull($worksheet, "$sheetname not found in test workbook");
         $cell = $worksheet->getCell($cellAddress);
 
         $cfRange = $worksheet->getConditionalRange($cell->getCoordinate());
-        if ($cfRange === null) {
-            self::markTestSkipped("{$cellAddress} is not in a Conditional Format range");
-        }
+        self::assertNotNull($cfRange, "$cellAddress is not in a Conditional Format range");
         $cfStyle = $worksheet->getConditionalStyles($cell->getCoordinate());
 
         $matcher = new CellMatcher($cell, $cfRange);
@@ -329,16 +323,13 @@ class CellMatcherTest extends TestCase
      */
     public function testBlankExpressions(string $sheetname, string $cellAddress, array $expectedMatches): void
     {
+        $this->spreadsheet = $this->loadSpreadsheet();
         $worksheet = $this->spreadsheet->getSheetByName($sheetname);
-        if ($worksheet === null) {
-            self::markTestSkipped("{$sheetname} not found in test workbook");
-        }
+        self::assertNotNull($worksheet, "$sheetname not found in test workbook");
         $cell = $worksheet->getCell($cellAddress);
 
         $cfRange = $worksheet->getConditionalRange($cell->getCoordinate());
-        if ($cfRange === null) {
-            self::markTestSkipped("{$cellAddress} is not in a Conditional Format range");
-        }
+        self::assertNotNull($cfRange, "$cellAddress is not in a Conditional Format range");
         $cfStyles = $worksheet->getConditionalStyles($cell->getCoordinate());
 
         $matcher = new CellMatcher($cell, $cfRange);
@@ -365,16 +356,13 @@ class CellMatcherTest extends TestCase
      */
     public function testErrorExpressions(string $sheetname, string $cellAddress, array $expectedMatches): void
     {
+        $this->spreadsheet = $this->loadSpreadsheet();
         $worksheet = $this->spreadsheet->getSheetByName($sheetname);
-        if ($worksheet === null) {
-            self::markTestSkipped("{$sheetname} not found in test workbook");
-        }
+        self::assertNotNull($worksheet, "$sheetname not found in test workbook");
         $cell = $worksheet->getCell($cellAddress);
 
         $cfRange = $worksheet->getConditionalRange($cell->getCoordinate());
-        if ($cfRange === null) {
-            self::markTestSkipped("{$cellAddress} is not in a Conditional Format range");
-        }
+        self::assertNotNull($cfRange, "$cellAddress is not in a Conditional Format range");
         $cfStyles = $worksheet->getConditionalStyles($cell->getCoordinate());
 
         $matcher = new CellMatcher($cell, $cfRange);
@@ -400,16 +388,13 @@ class CellMatcherTest extends TestCase
      */
     public function testDateOccurringExpressions(string $sheetname, string $cellAddress, bool $expectedMatch): void
     {
+        $this->spreadsheet = $this->loadSpreadsheet();
         $worksheet = $this->spreadsheet->getSheetByName($sheetname);
-        if ($worksheet === null) {
-            self::markTestSkipped("{$sheetname} not found in test workbook");
-        }
+        self::assertNotNull($worksheet, "$sheetname not found in test workbook");
         $cell = $worksheet->getCell($cellAddress);
 
         $cfRange = $worksheet->getConditionalRange($cell->getCoordinate());
-        if ($cfRange === null) {
-            self::markTestSkipped("{$cellAddress} is not in a Conditional Format range");
-        }
+        self::assertNotNull($cfRange, "$cellAddress is not in a Conditional Format range");
         $cfStyle = $worksheet->getConditionalStyles($cell->getCoordinate());
 
         $matcher = new CellMatcher($cell, $cfRange);
@@ -447,16 +432,13 @@ class CellMatcherTest extends TestCase
      */
     public function testDuplicatesExpressions(string $sheetname, string $cellAddress, array $expectedMatches): void
     {
+        $this->spreadsheet = $this->loadSpreadsheet();
         $worksheet = $this->spreadsheet->getSheetByName($sheetname);
-        if ($worksheet === null) {
-            self::markTestSkipped("{$sheetname} not found in test workbook");
-        }
+        self::assertNotNull($worksheet, "$sheetname not found in test workbook");
         $cell = $worksheet->getCell($cellAddress);
 
         $cfRange = $worksheet->getConditionalRange($cell->getCoordinate());
-        if ($cfRange === null) {
-            self::markTestSkipped("{$cellAddress} is not in a Conditional Format range");
-        }
+        self::AssertNotNull($cfRange, "$cellAddress is not in a Conditional Format range");
         $cfStyles = $worksheet->getConditionalStyles($cell->getCoordinate());
 
         $matcher = new CellMatcher($cell, $cfRange);
@@ -486,16 +468,13 @@ class CellMatcherTest extends TestCase
      */
     public function testCrossWorksheetExpressions(string $sheetname, string $cellAddress, bool $expectedMatch): void
     {
+        $this->spreadsheet = $this->loadSpreadsheet();
         $worksheet = $this->spreadsheet->getSheetByName($sheetname);
-        if ($worksheet === null) {
-            self::markTestSkipped("{$sheetname} not found in test workbook");
-        }
+        self::assertNotNull($worksheet, "$sheetname not found in test workbook");
         $cell = $worksheet->getCell($cellAddress);
 
         $cfRange = $worksheet->getConditionalRange($cell->getCoordinate());
-        if ($cfRange === null) {
-            self::markTestSkipped("{$cellAddress} is not in a Conditional Format range");
-        }
+        self::assertNotNull($cfRange, "$cellAddress is not in a Conditional Format range");
         $cfStyle = $worksheet->getConditionalStyles($cell->getCoordinate());
 
         $matcher = new CellMatcher($cell, $cfRange);

From b8456105dd5ea44210b5f33dcac3ab732af4444d Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Sat, 23 Jul 2022 08:06:13 -0700
Subject: [PATCH 02/69] Charts - Gradients, Transparency, Hidden Axes (#2950)

Fix #2257. Fix #2929. Fix #2935 (probably in a way that will not satisfy the requester). 2257 and 2929 requested changes that ultimately affect the same section of code, so it's appropriate to deal with them together. 2257 requests the ability to make the chart background transparent (so that the Excel gridlines are visible beneath the chart), and the ability to hide an Axis. 2929 requests the ability to set a gradient background on the chart.
---
 samples/Chart/33_Chart_create_scatter3.php    | 192 ++++++++++++++++++
 samples/Chart/33_Chart_create_scatter4.php    | 130 ++++++++++++
 .../templates/32readwriteScatterChart10.xlsx  | Bin 0 -> 12363 bytes
 .../templates/32readwriteScatterChart9.xlsx   | Bin 0 -> 12554 bytes
 src/PhpSpreadsheet/Chart/Axis.php             |   5 +-
 src/PhpSpreadsheet/Chart/Chart.php            |  15 ++
 src/PhpSpreadsheet/Chart/ChartColor.php       |  32 ++-
 src/PhpSpreadsheet/Chart/DataSeries.php       |   2 +-
 src/PhpSpreadsheet/Chart/DataSeriesValues.php |   2 +-
 src/PhpSpreadsheet/Chart/PlotArea.php         |  62 ++++++
 src/PhpSpreadsheet/Reader/Xlsx/Chart.php      |  51 +++++
 src/PhpSpreadsheet/Writer/Xlsx/Chart.php      |  56 ++++-
 .../Chart/Charts32ScatterTest.php             |  85 ++++++++
 13 files changed, 619 insertions(+), 13 deletions(-)
 create mode 100644 samples/Chart/33_Chart_create_scatter3.php
 create mode 100644 samples/Chart/33_Chart_create_scatter4.php
 create mode 100644 samples/templates/32readwriteScatterChart10.xlsx
 create mode 100644 samples/templates/32readwriteScatterChart9.xlsx

diff --git a/samples/Chart/33_Chart_create_scatter3.php b/samples/Chart/33_Chart_create_scatter3.php
new file mode 100644
index 00000000..b4fc97b1
--- /dev/null
+++ b/samples/Chart/33_Chart_create_scatter3.php
@@ -0,0 +1,192 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Chart\Axis;
+use PhpOffice\PhpSpreadsheet\Chart\Chart;
+use PhpOffice\PhpSpreadsheet\Chart\ChartColor;
+use PhpOffice\PhpSpreadsheet\Chart\DataSeries;
+use PhpOffice\PhpSpreadsheet\Chart\DataSeriesValues;
+use PhpOffice\PhpSpreadsheet\Chart\Legend as ChartLegend;
+use PhpOffice\PhpSpreadsheet\Chart\PlotArea;
+use PhpOffice\PhpSpreadsheet\Chart\Properties;
+use PhpOffice\PhpSpreadsheet\Chart\Title;
+use PhpOffice\PhpSpreadsheet\IOFactory;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../Header.php';
+
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+// changed data to simulate a trend chart - Xaxis are dates; Yaxis are 3 meausurements from each date
+$worksheet->fromArray(
+    [
+        ['', 'metric1', 'metric2', 'metric3'],
+        ['=DATEVALUE("2021-01-01")', 12.1, 15.1, 21.1],
+        ['=DATEVALUE("2021-01-04")', 56.2, 73.2, 86.2],
+        ['=DATEVALUE("2021-01-07")', 52.2, 61.2, 69.2],
+        ['=DATEVALUE("2021-01-10")', 30.2, 32.2, 0.2],
+    ]
+);
+$worksheet->getStyle('A2:A5')->getNumberFormat()->setFormatCode(Properties::FORMAT_CODE_DATE_ISO8601);
+$worksheet->getColumnDimension('A')->setAutoSize(true);
+$worksheet->setSelectedCells('A1');
+
+// Set the Labels for each data series we want to plot
+//     Datatype
+//     Cell reference for data
+//     Format Code
+//     Number of datapoints in series
+//     Data values
+//     Data Marker
+$dataSeriesLabels = [
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, 'Worksheet!$B$1', null, 1), // was 2010
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, 'Worksheet!$C$1', null, 1), // was 2011
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, 'Worksheet!$D$1', null, 1), // was 2012
+];
+// Set the X-Axis Labels
+// changed from STRING to NUMBER
+// added 2 additional x-axis values associated with each of the 3 metrics
+// added FORMATE_CODE_NUMBER
+$xAxisTickValues = [
+    //new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, 'Worksheet!$A$2:$A$5', null, 4), // Q1 to Q4
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_NUMBER, 'Worksheet!$A$2:$A$5', Properties::FORMAT_CODE_DATE, 4),
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_NUMBER, 'Worksheet!$A$2:$A$5', Properties::FORMAT_CODE_DATE, 4),
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_NUMBER, 'Worksheet!$A$2:$A$5', Properties::FORMAT_CODE_DATE, 4),
+];
+// Set the Data values for each data series we want to plot
+//     Datatype
+//     Cell reference for data
+//     Format Code
+//     Number of datapoints in series
+//     Data values
+//     Data Marker
+// added FORMAT_CODE_NUMBER
+$dataSeriesValues = [
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_NUMBER, 'Worksheet!$B$2:$B$5', Properties::FORMAT_CODE_NUMBER, 4),
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_NUMBER, 'Worksheet!$C$2:$C$5', Properties::FORMAT_CODE_NUMBER, 4),
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_NUMBER, 'Worksheet!$D$2:$D$5', Properties::FORMAT_CODE_NUMBER, 4),
+];
+
+// series 1
+// marker details
+$dataSeriesValues[0]
+    ->setPointMarker('diamond')
+    ->setPointSize(5)
+    ->getMarkerFillColor()
+    ->setColorProperties('0070C0', null, ChartColor::EXCEL_COLOR_TYPE_RGB);
+$dataSeriesValues[0]
+    ->getMarkerBorderColor()
+    ->setColorProperties('002060', null, ChartColor::EXCEL_COLOR_TYPE_RGB);
+
+// line details - smooth line, connected
+$dataSeriesValues[0]
+    ->setScatterLines(true)
+    ->setSmoothLine(true)
+    ->setLineColorProperties('accent1', 40, ChartColor::EXCEL_COLOR_TYPE_SCHEME); // value, alpha, type
+$dataSeriesValues[0]->setLineStyleProperties(
+    2.5, // width in points
+    Properties::LINE_STYLE_COMPOUND_TRIPLE, // compound
+    Properties::LINE_STYLE_DASH_SQUARE_DOT, // dash
+    Properties::LINE_STYLE_CAP_SQUARE, // cap
+    Properties::LINE_STYLE_JOIN_MITER, // join
+    Properties::LINE_STYLE_ARROW_TYPE_OPEN, // head type
+    Properties::LINE_STYLE_ARROW_SIZE_4, // head size preset index
+    Properties::LINE_STYLE_ARROW_TYPE_ARROW, // end type
+    Properties::LINE_STYLE_ARROW_SIZE_6 // end size preset index
+);
+
+// series 2 - straight line - no special effects, connected, straight line
+$dataSeriesValues[1] // square fill
+    ->setPointMarker('square')
+    ->setPointSize(6)
+    ->getMarkerBorderColor()
+    ->setColorProperties('accent6', 3, ChartColor::EXCEL_COLOR_TYPE_SCHEME);
+$dataSeriesValues[1] // square border
+    ->getMarkerFillColor()
+    ->setColorProperties('0FFF00', null, ChartColor::EXCEL_COLOR_TYPE_RGB);
+$dataSeriesValues[1]
+    ->setScatterLines(true)
+    ->setSmoothLine(false)
+    ->setLineColorProperties('FF0000', 80, ChartColor::EXCEL_COLOR_TYPE_RGB);
+$dataSeriesValues[1]->setLineWidth(2.0);
+
+// series 3 - markers, no line
+$dataSeriesValues[2] // triangle fill
+    //->setPointMarker('triangle') // let Excel choose shape
+    ->setPointSize(7)
+    ->getMarkerFillColor()
+    ->setColorProperties('FFFF00', null, ChartColor::EXCEL_COLOR_TYPE_RGB);
+$dataSeriesValues[2] // triangle border
+    ->getMarkerBorderColor()
+    ->setColorProperties('accent4', null, ChartColor::EXCEL_COLOR_TYPE_SCHEME);
+$dataSeriesValues[2]->setScatterLines(false); // points not connected
+
+  // Added so that Xaxis shows dates instead of Excel-equivalent-year1900-numbers
+$xAxis = new Axis();
+//$xAxis->setAxisNumberProperties(Properties::FORMAT_CODE_DATE );
+$xAxis->setAxisNumberProperties(Properties::FORMAT_CODE_DATE_ISO8601, true);
+$xAxis->setAxisOption('textRotation', '45');
+$xAxis->setAxisOption('hidden', '1');
+
+$yAxis = new Axis();
+$yAxis->setLineStyleProperties(
+    2.5,     // width in points
+    Properties::LINE_STYLE_COMPOUND_SIMPLE,
+    Properties::LINE_STYLE_DASH_DASH_DOT,
+    Properties::LINE_STYLE_CAP_FLAT,
+    Properties::LINE_STYLE_JOIN_BEVEL
+);
+$yAxis->setLineColorProperties('ffc000', null, ChartColor::EXCEL_COLOR_TYPE_RGB);
+$yAxis->setAxisOption('hidden', '1');
+
+// Build the dataseries
+$series = new DataSeries(
+    DataSeries::TYPE_SCATTERCHART, // plotType
+    null, // plotGrouping (Scatter charts don't have any grouping)
+    range(0, count($dataSeriesValues) - 1), // plotOrder
+    $dataSeriesLabels, // plotLabel
+    $xAxisTickValues, // plotCategory
+    $dataSeriesValues, // plotValues
+    null, // plotDirection
+    false, // smooth line
+    DataSeries::STYLE_SMOOTHMARKER  // plotStyle
+);
+
+// Set the series in the plot area
+$plotArea = new PlotArea(null, [$series]);
+$plotArea->setNoFill(true);
+// Set the chart legend
+$legend = new ChartLegend(ChartLegend::POSITION_TOPRIGHT, null, false);
+
+$title = new Title('Test Scatter Trend Chart');
+//$yAxisLabel = new Title('Value ($k)');
+
+// Create the chart
+$chart = new Chart(
+    'chart1', // name
+    $title, // title
+    $legend, // legend
+    $plotArea, // plotArea
+    true, // plotVisibleOnly
+    DataSeries::EMPTY_AS_GAP, // displayBlanksAs
+    null, // xAxisLabel
+    null, //$yAxisLabel,  // yAxisLabel
+    // added xAxis for correct date display
+    $xAxis, // xAxis
+    $yAxis, // yAxis
+);
+$chart->setNoFill(true);
+
+// Set the position where the chart should appear in the worksheet
+$chart->setTopLeftPosition('A7');
+$chart->setBottomRightPosition('P20');
+// Add the chart to the worksheet
+$worksheet->addChart($chart);
+
+// Save Excel 2007 file
+$filename = $helper->getFilename(__FILE__);
+$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
+$writer->setIncludeCharts(true);
+$callStartTime = microtime(true);
+$writer->save($filename);
+$spreadsheet->disconnectWorksheets();
+$helper->logWrite($writer, $filename, $callStartTime);
diff --git a/samples/Chart/33_Chart_create_scatter4.php b/samples/Chart/33_Chart_create_scatter4.php
new file mode 100644
index 00000000..d42933b6
--- /dev/null
+++ b/samples/Chart/33_Chart_create_scatter4.php
@@ -0,0 +1,130 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Chart\Chart;
+use PhpOffice\PhpSpreadsheet\Chart\ChartColor;
+use PhpOffice\PhpSpreadsheet\Chart\DataSeries;
+use PhpOffice\PhpSpreadsheet\Chart\DataSeriesValues;
+use PhpOffice\PhpSpreadsheet\Chart\Legend as ChartLegend;
+use PhpOffice\PhpSpreadsheet\Chart\PlotArea;
+use PhpOffice\PhpSpreadsheet\Chart\Title;
+use PhpOffice\PhpSpreadsheet\IOFactory;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../Header.php';
+
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+$worksheet->fromArray(
+    [
+        ['', 2010, 2011, 2012],
+        ['Q1', 12, 15, 21],
+        ['Q2', 56, 73, 86],
+        ['Q3', 52, 61, 69],
+        ['Q4', 30, 32, 0],
+    ]
+);
+
+// Set the Labels for each data series we want to plot
+//     Datatype
+//     Cell reference for data
+//     Format Code
+//     Number of datapoints in series
+//     Data values
+//     Data Marker
+$dataSeriesLabels = [
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, 'Worksheet!$B$1', null, 1), // 2010
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, 'Worksheet!$C$1', null, 1), // 2011
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, 'Worksheet!$D$1', null, 1), // 2012
+];
+// Set the X-Axis Labels
+$xAxisTickValues = [
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, 'Worksheet!$A$2:$A$5', null, 4), // Q1 to Q4
+];
+// Set the Data values for each data series we want to plot
+//     Datatype
+//     Cell reference for data
+//     Format Code
+//     Number of datapoints in series
+//     Data values
+//     Data Marker
+$dataSeriesValues = [
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_NUMBER, 'Worksheet!$B$2:$B$5', null, 4),
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_NUMBER, 'Worksheet!$C$2:$C$5', null, 4),
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_NUMBER, 'Worksheet!$D$2:$D$5', null, 4),
+];
+
+// Build the dataseries
+$series = new DataSeries(
+    DataSeries::TYPE_SCATTERCHART, // plotType
+    null, // plotGrouping (Scatter charts don't have any grouping)
+    range(0, count($dataSeriesValues) - 1), // plotOrder
+    $dataSeriesLabels, // plotLabel
+    $xAxisTickValues, // plotCategory
+    $dataSeriesValues, // plotValues
+    null, // plotDirection
+    null, // smooth line
+    DataSeries::STYLE_LINEMARKER  // plotStyle
+);
+
+// Set the series in the plot area
+$plotArea = new PlotArea(null, [$series]);
+
+$pos1 = 0; // pos = 0% (extreme low side or lower left corner)
+$brightness1 = 0; // 0%
+$gsColor1 = new ChartColor();
+$gsColor1->setColorProperties('FF0000', 75, 'srgbClr', $brightness1); // red
+$gradientStop1 = [$pos1, $gsColor1];
+
+$pos2 = 0.5; // pos = 50% (middle)
+$brightness2 = 0.5; // 50%
+$gsColor2 = new ChartColor();
+$gsColor2->setColorProperties('FFFF00', 50, 'srgbClr', $brightness2); // yellow
+$gradientStop2 = [$pos2, $gsColor2];
+
+$pos3 = 1.0; // pos = 100% (extreme high side or upper right corner)
+$brightness3 = 0.5; // 50%
+$gsColor3 = new ChartColor();
+$gsColor3->setColorProperties('00B050', 50, 'srgbClr', $brightness3); // green
+$gradientStop3 = [$pos3, $gsColor3];
+
+$gradientFillStops = [
+    $gradientStop1,
+    $gradientStop2,
+    $gradientStop3,
+];
+$gradientFillAngle = 315.0; // 45deg above horiz
+
+$plotArea->setGradientFillProperties($gradientFillStops, $gradientFillAngle);
+
+// Set the chart legend
+$legend = new ChartLegend(ChartLegend::POSITION_TOPRIGHT, null, false);
+
+$title = new Title('Test Scatter Chart');
+$yAxisLabel = new Title('Value ($k)');
+
+// Create the chart
+$chart = new Chart(
+    'chart1', // name
+    $title, // title
+    $legend, // legend
+    $plotArea, // plotArea
+    true, // plotVisibleOnly
+    DataSeries::EMPTY_AS_GAP, // displayBlanksAs
+    null, // xAxisLabel
+    $yAxisLabel  // yAxisLabel
+);
+
+// Set the position where the chart should appear in the worksheet
+$chart->setTopLeftPosition('A7');
+$chart->setBottomRightPosition('H20');
+
+// Add the chart to the worksheet
+$worksheet->addChart($chart);
+
+// Save Excel 2007 file
+$filename = $helper->getFilename(__FILE__);
+$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
+$writer->setIncludeCharts(true);
+$callStartTime = microtime(true);
+$writer->save($filename);
+$helper->logWrite($writer, $filename, $callStartTime);
diff --git a/samples/templates/32readwriteScatterChart10.xlsx b/samples/templates/32readwriteScatterChart10.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..7d5ac0d280f328c2685e6de590a78a2e30a9cb00
GIT binary patch
literal 12363
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
PL;~ysi6~3|^RNF0pR-I-

literal 0
HcmV?d00001

diff --git a/samples/templates/32readwriteScatterChart9.xlsx b/samples/templates/32readwriteScatterChart9.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..3a0b51b2f85429405f5d07484620113e44ffb455
GIT binary patch
literal 12554
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

literal 0
HcmV?d00001

diff --git a/src/PhpSpreadsheet/Chart/Axis.php b/src/PhpSpreadsheet/Chart/Axis.php
index 70ff1b31..bd7082ff 100644
--- a/src/PhpSpreadsheet/Chart/Axis.php
+++ b/src/PhpSpreadsheet/Chart/Axis.php
@@ -61,6 +61,7 @@ class Axis extends Properties
         'horizontal_crosses' => self::HORIZONTAL_CROSSES_AUTOZERO,
         'horizontal_crosses_value' => null,
         'textRotation' => null,
+        'hidden' => null,
     ];
 
     /**
@@ -138,7 +139,8 @@ class Axis extends Properties
         ?string $maximum = null,
         ?string $majorUnit = null,
         ?string $minorUnit = null,
-        ?string $textRotation = null
+        ?string $textRotation = null,
+        ?string $hidden = null
     ): void {
         $this->axisOptions['axis_labels'] = $axisLabels;
         $this->setAxisOption('horizontal_crosses_value', $horizontalCrossesValue);
@@ -151,6 +153,7 @@ class Axis extends Properties
         $this->setAxisOption('major_unit', $majorUnit);
         $this->setAxisOption('minor_unit', $minorUnit);
         $this->setAxisOption('textRotation', $textRotation);
+        $this->setAxisOption('hidden', $hidden);
     }
 
     /**
diff --git a/src/PhpSpreadsheet/Chart/Chart.php b/src/PhpSpreadsheet/Chart/Chart.php
index 3f89e6fb..e850f502 100644
--- a/src/PhpSpreadsheet/Chart/Chart.php
+++ b/src/PhpSpreadsheet/Chart/Chart.php
@@ -144,6 +144,9 @@ class Chart
     /** @var bool */
     private $autoTitleDeleted = false;
 
+    /** @var bool */
+    private $noFill = false;
+
     /**
      * Create a new Chart.
      * majorGridlines and minorGridlines are deprecated, moved to Axis.
@@ -747,4 +750,16 @@ class Chart
 
         return $this;
     }
+
+    public function getNoFill(): bool
+    {
+        return $this->noFill;
+    }
+
+    public function setNoFill(bool $noFill): self
+    {
+        $this->noFill = $noFill;
+
+        return $this;
+    }
 }
diff --git a/src/PhpSpreadsheet/Chart/ChartColor.php b/src/PhpSpreadsheet/Chart/ChartColor.php
index 7f87e391..87f31020 100644
--- a/src/PhpSpreadsheet/Chart/ChartColor.php
+++ b/src/PhpSpreadsheet/Chart/ChartColor.php
@@ -24,15 +24,18 @@ class ChartColor
     /** @var ?int */
     private $alpha;
 
+    /** @var ?int */
+    private $brightness;
+
     /**
      * @param string|string[] $value
      */
-    public function __construct($value = '', ?int $alpha = null, ?string $type = null)
+    public function __construct($value = '', ?int $alpha = null, ?string $type = null, ?int $brightness = null)
     {
         if (is_array($value)) {
             $this->setColorPropertiesArray($value);
         } else {
-            $this->setColorProperties($value, $alpha, $type);
+            $this->setColorProperties($value, $alpha, $type, $brightness);
         }
     }
 
@@ -72,10 +75,23 @@ class ChartColor
         return $this;
     }
 
+    public function getBrightness(): ?int
+    {
+        return $this->brightness;
+    }
+
+    public function setBrightness(?int $brightness): self
+    {
+        $this->brightness = $brightness;
+
+        return $this;
+    }
+
     /**
      * @param null|float|int|string $alpha
+     * @param null|float|int|string $brightness
      */
-    public function setColorProperties(?string $color, $alpha = null, ?string $type = null): self
+    public function setColorProperties(?string $color, $alpha = null, ?string $type = null, $brightness = null): self
     {
         if (empty($type) && !empty($color)) {
             if (substr($color, 0, 1) === '*') {
@@ -99,6 +115,11 @@ class ChartColor
         } elseif (is_numeric($alpha)) {
             $this->setAlpha((int) $alpha);
         }
+        if ($brightness === null) {
+            $this->setBrightness(null);
+        } elseif (is_numeric($brightness)) {
+            $this->setBrightness((int) $brightness);
+        }
 
         return $this;
     }
@@ -108,7 +129,8 @@ class ChartColor
         return $this->setColorProperties(
             $color['value'] ?? '',
             $color['alpha'] ?? null,
-            $color['type'] ?? null
+            $color['type'] ?? null,
+            $color['brightness'] ?? null
         );
     }
 
@@ -133,6 +155,8 @@ class ChartColor
             $retVal = $this->type;
         } elseif ($propertyName === 'alpha') {
             $retVal = $this->alpha;
+        } elseif ($propertyName === 'brightness') {
+            $retVal = $this->brightness;
         }
 
         return $retVal;
diff --git a/src/PhpSpreadsheet/Chart/DataSeries.php b/src/PhpSpreadsheet/Chart/DataSeries.php
index 548145e7..5d33e96d 100644
--- a/src/PhpSpreadsheet/Chart/DataSeries.php
+++ b/src/PhpSpreadsheet/Chart/DataSeries.php
@@ -94,7 +94,7 @@ class DataSeries
     private $plotCategory = [];
 
     /**
-     * Smooth Line.
+     * Smooth Line. Must be specified for both DataSeries and DataSeriesValues.
      *
      * @var bool
      */
diff --git a/src/PhpSpreadsheet/Chart/DataSeriesValues.php b/src/PhpSpreadsheet/Chart/DataSeriesValues.php
index bc0e04d1..cb5fa742 100644
--- a/src/PhpSpreadsheet/Chart/DataSeriesValues.php
+++ b/src/PhpSpreadsheet/Chart/DataSeriesValues.php
@@ -536,7 +536,7 @@ class DataSeriesValues extends Properties
     }
 
     /**
-     * Smooth Line.
+     * Smooth Line. Must be specified for both DataSeries and DataSeriesValues.
      *
      * @var bool
      */
diff --git a/src/PhpSpreadsheet/Chart/PlotArea.php b/src/PhpSpreadsheet/Chart/PlotArea.php
index 4bd49ece..ccde4bb2 100644
--- a/src/PhpSpreadsheet/Chart/PlotArea.php
+++ b/src/PhpSpreadsheet/Chart/PlotArea.php
@@ -6,6 +6,30 @@ use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 
 class PlotArea
 {
+    /**
+     * No fill in plot area (show Excel gridlines through chart).
+     *
+     * @var bool
+     */
+    private $noFill = false;
+
+    /**
+     * PlotArea Gradient Stop list.
+     * Each entry is a 2-element array.
+     *     First is position in %.
+     *     Second is ChartColor.
+     *
+     * @var array[]
+     */
+    private $gradientFillStops = [];
+
+    /**
+     * PlotArea Gradient Angle.
+     *
+     * @var ?float
+     */
+    private $gradientFillAngle;
+
     /**
      * PlotArea Layout.
      *
@@ -101,4 +125,42 @@ class PlotArea
             $plotSeries->refresh($worksheet);
         }
     }
+
+    public function setNoFill(bool $noFill): self
+    {
+        $this->noFill = $noFill;
+
+        return $this;
+    }
+
+    public function getNoFill(): bool
+    {
+        return $this->noFill;
+    }
+
+    public function setGradientFillProperties(array $gradientFillStops, ?float $gradientFillAngle): self
+    {
+        $this->gradientFillStops = $gradientFillStops;
+        $this->gradientFillAngle = $gradientFillAngle;
+
+        return $this;
+    }
+
+    /**
+     * Get gradientFillAngle.
+     */
+    public function getGradientFillAngle(): ?float
+    {
+        return $this->gradientFillAngle;
+    }
+
+    /**
+     * Get gradientFillStops.
+     *
+     * @return array
+     */
+    public function getGradientFillStops()
+    {
+        return $this->gradientFillStops;
+    }
 }
diff --git a/src/PhpSpreadsheet/Reader/Xlsx/Chart.php b/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
index d49a5238..12ee0ade 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
@@ -73,8 +73,18 @@ class Chart
         $xAxis = new Axis();
         $yAxis = new Axis();
         $autoTitleDeleted = null;
+        $chartNoFill = false;
+        $gradientArray = [];
+        $gradientLin = null;
         foreach ($chartElementsC as $chartElementKey => $chartElement) {
             switch ($chartElementKey) {
+                case 'spPr':
+                    $possibleNoFill = $chartElementsC->spPr->children($this->aNamespace);
+                    if (isset($possibleNoFill->noFill)) {
+                        $chartNoFill = true;
+                    }
+
+                    break;
                 case 'chart':
                     foreach ($chartElement as $chartDetailsKey => $chartDetails) {
                         $chartDetailsC = $chartDetails->children($this->cNamespace);
@@ -95,8 +105,29 @@ class Chart
                                 $plotAreaLayout = $XaxisLabel = $YaxisLabel = null;
                                 $plotSeries = $plotAttributes = [];
                                 $catAxRead = false;
+                                $plotNoFill = false;
                                 foreach ($chartDetails as $chartDetailKey => $chartDetail) {
                                     switch ($chartDetailKey) {
+                                        case 'spPr':
+                                            $possibleNoFill = $chartDetails->spPr->children($this->aNamespace);
+                                            if (isset($possibleNoFill->noFill)) {
+                                                $plotNoFill = true;
+                                            }
+                                            if (isset($possibleNoFill->gradFill->gsLst)) {
+                                                foreach ($possibleNoFill->gradFill->gsLst->gs as $gradient) {
+                                                    /** @var float */
+                                                    $pos = self::getAttribute($gradient, 'pos', 'float');
+                                                    $gradientArray[] = [
+                                                        $pos / Properties::PERCENTAGE_MULTIPLIER,
+                                                        new ChartColor($this->readColor($gradient)),
+                                                    ];
+                                                }
+                                            }
+                                            if (isset($possibleNoFill->gradFill->lin)) {
+                                                $gradientLin = Properties::XmlToAngle((string) self::getAttribute($possibleNoFill->gradFill->lin, 'ang', 'string'));
+                                            }
+
+                                            break;
                                         case 'layout':
                                             $plotAreaLayout = $this->chartLayoutDetails($chartDetail);
 
@@ -288,6 +319,12 @@ class Chart
                                 }
                                 $plotArea = new PlotArea($plotAreaLayout, $plotSeries);
                                 $this->setChartAttributes($plotAreaLayout, $plotAttributes);
+                                if ($plotNoFill) {
+                                    $plotArea->setNoFill(true);
+                                }
+                                if (!empty($gradientArray)) {
+                                    $plotArea->setGradientFillProperties($gradientArray, $gradientLin);
+                                }
 
                                 break;
                             case 'plotVisOnly':
@@ -330,6 +367,9 @@ class Chart
             }
         }
         $chart = new \PhpOffice\PhpSpreadsheet\Chart\Chart($chartName, $title, $legend, $plotArea, $plotVisOnly, (string) $dispBlanksAs, $XaxisLabel, $YaxisLabel, $xAxis, $yAxis);
+        if ($chartNoFill) {
+            $chart->setNoFill(true);
+        }
         if (is_bool($autoTitleDeleted)) {
             $chart->setAutoTitleDeleted($autoTitleDeleted);
         }
@@ -1147,6 +1187,7 @@ class Chart
             'type' => null,
             'value' => null,
             'alpha' => null,
+            'brightness' => null,
         ];
         foreach (ChartColor::EXCEL_COLOR_TYPES as $type) {
             if (isset($colorXml->$type)) {
@@ -1159,6 +1200,13 @@ class Chart
                         $result['alpha'] = ChartColor::alphaFromXml($alpha);
                     }
                 }
+                if (isset($colorXml->$type->lumMod)) {
+                    /** @var string */
+                    $brightness = self::getAttribute($colorXml->$type->lumMod, 'val', 'string');
+                    if (is_numeric($brightness)) {
+                        $result['brightness'] = ChartColor::alphaFromXml($brightness);
+                    }
+                }
 
                 break;
             }
@@ -1236,6 +1284,9 @@ class Chart
         if (!isset($whichAxis)) {
             return;
         }
+        if (isset($chartDetail->delete)) {
+            $whichAxis->setAxisOption('hidden', (string) self::getAttribute($chartDetail->delete, 'val', 'string'));
+        }
         if (isset($chartDetail->numFmt)) {
             $whichAxis->setAxisNumberProperties(
                 (string) self::getAttribute($chartDetail->numFmt, 'formatCode', 'string'),
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Chart.php b/src/PhpSpreadsheet/Writer/Xlsx/Chart.php
index d9d96da6..278b64e7 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/Chart.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/Chart.php
@@ -106,11 +106,17 @@ class Chart extends WriterPart
         $objWriter->writeAttribute('val', '0');
         $objWriter->endElement();
 
-        $objWriter->endElement();
+        $objWriter->endElement(); // c:chart
+        if ($chart->getNoFill()) {
+            $objWriter->startElement('c:spPr');
+            $objWriter->startElement('a:noFill');
+            $objWriter->endElement(); // a:noFill
+            $objWriter->endElement(); // c:spPr
+        }
 
         $this->writePrintSettings($objWriter);
 
-        $objWriter->endElement();
+        $objWriter->endElement(); // c:chartSpace
 
         // Return
         return $objWriter->getData();
@@ -360,8 +366,35 @@ class Chart extends WriterPart
                 $this->writeSerAxis($objWriter, $id2, $id3);
             }
         }
+        $stops = $plotArea->getGradientFillStops();
+        if ($plotArea->getNoFill() || !empty($stops)) {
+            $objWriter->startElement('c:spPr');
+            if ($plotArea->getNoFill()) {
+                $objWriter->startElement('a:noFill');
+                $objWriter->endElement(); // a:noFill
+            }
+            if (!empty($stops)) {
+                $objWriter->startElement('a:gradFill');
+                $objWriter->startElement('a:gsLst');
+                foreach ($stops as $stop) {
+                    $objWriter->startElement('a:gs');
+                    $objWriter->writeAttribute('pos', (string) (Properties::PERCENTAGE_MULTIPLIER * (float) $stop[0]));
+                    $this->writeColor($objWriter, $stop[1], false);
+                    $objWriter->endElement(); // a:gs
+                }
+                $objWriter->endElement(); // a:gsLst
+                $angle = $plotArea->getGradientFillAngle();
+                if ($angle !== null) {
+                    $objWriter->startElement('a:lin');
+                    $objWriter->writeAttribute('ang', Properties::angleToXml($angle));
+                    $objWriter->endElement(); // a:lin
+                }
+                $objWriter->endElement(); // a:gradFill
+            }
+            $objWriter->endElement(); // c:spPr
+        }
 
-        $objWriter->endElement();
+        $objWriter->endElement(); // c:plotArea
     }
 
     private function writeDataLabelsBool(XMLWriter $objWriter, string $name, ?bool $value): void
@@ -492,7 +525,7 @@ class Chart extends WriterPart
         $objWriter->endElement(); // c:scaling
 
         $objWriter->startElement('c:delete');
-        $objWriter->writeAttribute('val', '0');
+        $objWriter->writeAttribute('val', $yAxis->getAxisOptionsProperty('hidden') ?? '0');
         $objWriter->endElement();
 
         $objWriter->startElement('c:axPos');
@@ -682,7 +715,7 @@ class Chart extends WriterPart
         $objWriter->endElement(); // c:scaling
 
         $objWriter->startElement('c:delete');
-        $objWriter->writeAttribute('val', '0');
+        $objWriter->writeAttribute('val', $xAxis->getAxisOptionsProperty('hidden') ?? '0');
         $objWriter->endElement();
 
         $objWriter->startElement('c:axPos');
@@ -1612,7 +1645,18 @@ class Chart extends WriterPart
             if (is_numeric($alpha)) {
                 $objWriter->startElement('a:alpha');
                 $objWriter->writeAttribute('val', ChartColor::alphaToXml((int) $alpha));
-                $objWriter->endElement();
+                $objWriter->endElement(); // a:alpha
+            }
+            $brightness = $chartColor->getBrightness();
+            if (is_numeric($brightness)) {
+                $brightness = (int) $brightness;
+                $lumOff = 100 - $brightness;
+                $objWriter->startElement('a:lumMod');
+                $objWriter->writeAttribute('val', ChartColor::alphaToXml($brightness));
+                $objWriter->endElement(); // a:lumMod
+                $objWriter->startElement('a:lumOff');
+                $objWriter->writeAttribute('val', ChartColor::alphaToXml($lumOff));
+                $objWriter->endElement(); // a:lumOff
             }
             $objWriter->endElement(); //a:srgbClr/schemeClr/prstClr
             if ($solidFill) {
diff --git a/tests/PhpSpreadsheetTests/Chart/Charts32ScatterTest.php b/tests/PhpSpreadsheetTests/Chart/Charts32ScatterTest.php
index 77b0a9b2..fcde7ae3 100644
--- a/tests/PhpSpreadsheetTests/Chart/Charts32ScatterTest.php
+++ b/tests/PhpSpreadsheetTests/Chart/Charts32ScatterTest.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Chart;
 
+use PhpOffice\PhpSpreadsheet\Chart\ChartColor;
 use PhpOffice\PhpSpreadsheet\Chart\Properties;
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx as XlsxReader;
 use PhpOffice\PhpSpreadsheet\RichText\RichText;
@@ -447,4 +448,88 @@ class Charts32ScatterTest extends AbstractFunctional
 
         $reloadedSpreadsheet->disconnectWorksheets();
     }
+
+    public function testScatter9(): void
+    {
+        // gradient testing
+        $file = self::DIRECTORY . '32readwriteScatterChart9.xlsx';
+        $reader = new XlsxReader();
+        $reader->setIncludeCharts(true);
+        $spreadsheet = $reader->load($file);
+        $sheet = $spreadsheet->getActiveSheet();
+        self::assertSame(1, $sheet->getChartCount());
+        /** @var callable */
+        $callableReader = [$this, 'readCharts'];
+        /** @var callable */
+        $callableWriter = [$this, 'writeCharts'];
+        $reloadedSpreadsheet = $this->writeAndReload($spreadsheet, 'Xlsx', $callableReader, $callableWriter);
+        $spreadsheet->disconnectWorksheets();
+
+        $sheet = $reloadedSpreadsheet->getActiveSheet();
+        self::assertSame('Worksheet', $sheet->getTitle());
+        $charts = $sheet->getChartCollection();
+        self::assertCount(1, $charts);
+        $chart = $charts[0];
+        self::assertNotNull($chart);
+        self::assertFalse($chart->getNoFill());
+        $plotArea = $chart->getPlotArea();
+        self::assertNotNull($plotArea);
+        self::assertFalse($plotArea->getNoFill());
+        self::assertEquals(315.0, $plotArea->getGradientFillAngle());
+        $stops = $plotArea->getGradientFillStops();
+        self::assertCount(3, $stops);
+        self::assertEquals(0.43808, $stops[0][0]);
+        self::assertEquals(0, $stops[1][0]);
+        self::assertEquals(0.91, $stops[2][0]);
+        $color = $stops[0][1];
+        self::assertInstanceOf(ChartColor::class, $color);
+        self::assertSame('srgbClr', $color->getType());
+        self::assertSame('CDDBEC', $color->getValue());
+        self::assertNull($color->getAlpha());
+        self::assertSame(20, $color->getBrightness());
+        $color = $stops[1][1];
+        self::assertInstanceOf(ChartColor::class, $color);
+        self::assertSame('srgbClr', $color->getType());
+        self::assertSame('FFC000', $color->getValue());
+        self::assertNull($color->getAlpha());
+        self::assertNull($color->getBrightness());
+        $color = $stops[2][1];
+        self::assertInstanceOf(ChartColor::class, $color);
+        self::assertSame('srgbClr', $color->getType());
+        self::assertSame('00B050', $color->getValue());
+        self::assertNull($color->getAlpha());
+        self::assertSame(4, $color->getBrightness());
+
+        $reloadedSpreadsheet->disconnectWorksheets();
+    }
+
+    public function testScatter10(): void
+    {
+        // nofill for Chart and PlotArea, hidden Axis
+        $file = self::DIRECTORY . '32readwriteScatterChart10.xlsx';
+        $reader = new XlsxReader();
+        $reader->setIncludeCharts(true);
+        $spreadsheet = $reader->load($file);
+        $sheet = $spreadsheet->getActiveSheet();
+        self::assertSame(1, $sheet->getChartCount());
+        /** @var callable */
+        $callableReader = [$this, 'readCharts'];
+        /** @var callable */
+        $callableWriter = [$this, 'writeCharts'];
+        $reloadedSpreadsheet = $this->writeAndReload($spreadsheet, 'Xlsx', $callableReader, $callableWriter);
+        $spreadsheet->disconnectWorksheets();
+
+        $sheet = $reloadedSpreadsheet->getActiveSheet();
+        self::assertSame('Worksheet', $sheet->getTitle());
+        $charts = $sheet->getChartCollection();
+        self::assertCount(1, $charts);
+        $chart = $charts[0];
+        self::assertNotNull($chart);
+        self::assertTrue($chart->getNoFill());
+        $plotArea = $chart->getPlotArea();
+        self::assertNotNull($plotArea);
+        self::assertTrue($plotArea->getNoFill());
+
+        $reloadedSpreadsheet->disconnectWorksheets();
+    }
 }

From e460c826067102c8d36e8c61fe5b5bf91532259f Mon Sep 17 00:00:00 2001
From: Jonathan Goode <u01jmg3@users.noreply.github.com>
Date: Thu, 28 Jul 2022 03:29:02 +0100
Subject: [PATCH 03/69] Fully flatten an array (#2956)

* Fully flatten an array

* Provide test coverage for CONCAT combined with INDEX/MATCH
---
 CHANGELOG.md                                  |  2 +-
 src/PhpSpreadsheet/Calculation/Functions.php  | 22 +++++-------
 .../Calculation/ArrayTest.php                 | 34 +++++++++++++++++++
 .../Functions/TextData/ConcatenateTest.php    | 25 ++++++++++++++
 4 files changed, 69 insertions(+), 14 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/ArrayTest.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2fd0cc1..7f07303a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,7 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Fixed
 
-- Nothing
+- Fully flatten an array [Issue #2955](https://github.com/PHPOffice/PhpSpreadsheet/issues/2955) [PR #2956](https://github.com/PHPOffice/PhpSpreadsheet/pull/2956)
 
 ## 1.24.1 - 2022-07-18
 
diff --git a/src/PhpSpreadsheet/Calculation/Functions.php b/src/PhpSpreadsheet/Calculation/Functions.php
index ddd3e200..b3d6998c 100644
--- a/src/PhpSpreadsheet/Calculation/Functions.php
+++ b/src/PhpSpreadsheet/Calculation/Functions.php
@@ -573,24 +573,20 @@ class Functions
             return (array) $array;
         }
 
-        $arrayValues = [];
-        foreach ($array as $value) {
+        $flattened = [];
+        $stack = array_values($array);
+
+        while ($stack) {
+            $value = array_shift($stack);
+
             if (is_array($value)) {
-                foreach ($value as $val) {
-                    if (is_array($val)) {
-                        foreach ($val as $v) {
-                            $arrayValues[] = $v;
-                        }
-                    } else {
-                        $arrayValues[] = $val;
-                    }
-                }
+                array_unshift($stack, ...array_values($value));
             } else {
-                $arrayValues[] = $value;
+                $flattened[] = $value;
             }
         }
 
-        return $arrayValues;
+        return $flattened;
     }
 
     /**
diff --git a/tests/PhpSpreadsheetTests/Calculation/ArrayTest.php b/tests/PhpSpreadsheetTests/Calculation/ArrayTest.php
new file mode 100644
index 00000000..60c336cf
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/ArrayTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PHPUnit\Framework\TestCase;
+
+class ArrayTest extends TestCase
+{
+    public function testMultiDimensionalArrayIsFlattened(): void
+    {
+        $array = [
+            0 => [
+                0 => [
+                    32 => [
+                        'B' => 'PHP',
+                    ],
+                ],
+            ],
+            1 => [
+                0 => [
+                    32 => [
+                        'C' => 'Spreadsheet',
+                    ],
+                ],
+            ],
+        ];
+
+        $values = Functions::flattenArray($array);
+
+        self::assertIsNotArray($values[0]);
+        self::assertIsNotArray($values[1]);
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ConcatenateTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ConcatenateTest.php
index 6c9a871d..31fb94fa 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ConcatenateTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ConcatenateTest.php
@@ -2,6 +2,8 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\TextData;
 
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
 class ConcatenateTest extends AllSetupTeardown
 {
     /**
@@ -30,4 +32,27 @@ class ConcatenateTest extends AllSetupTeardown
     {
         return require 'tests/data/Calculation/TextData/CONCATENATE.php';
     }
+
+    public function testConcatenateWithIndexMatch(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet1 = $spreadsheet->getActiveSheet();
+        $sheet1->setTitle('Formula');
+        $sheet1->fromArray(
+            [
+                ['Number', 'Formula'],
+                ['52101293', '=CONCAT(INDEX(Lookup!$B$2, MATCH($A2, Lookup!$A$2, 0)))'],
+            ]
+        );
+        $sheet2 = $spreadsheet->createSheet();
+        $sheet2->setTitle('Lookup');
+        $sheet2->fromArray(
+            [
+                ['Lookup', 'Match'],
+                ['52101293', 'PHP'],
+            ]
+        );
+        self::assertSame('PHP', $sheet1->getCell('B2')->getCalculatedValue());
+        $spreadsheet->disconnectWorksheets();
+    }
 }

From c0809b0c6cb2f8ad6e1ce359cfc44219ba7c841d Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Thu, 28 Jul 2022 07:03:26 -0700
Subject: [PATCH 04/69] Fix Spreadsheet Copy, Disable Clone, Improve Coverage
 (#2951)

* Fix Spreadsheet Copy, Disable Clone, Improve Coverage

This PR was supposed to be merely to increase coverage in Spreadsheet. However, in doing so, I discovered that neither clone nor copy worked correctly. Neither had been covered in the test suite. Copy not only did not work, it broke the source spreadsheet as well. I tried to debug and got nowhere; I even tried using myclabs/deep-copy which is already in use in the test suite, but it failed as well. However, write and reload ought to work just fine for copy. It can't be used for clone; however, since copy does what clone ought to do, there's no reason why clone needs to be used, so __clone is changed to throw an exception if attempted.

One other source change was needed, an obvious bug where an if condition uses 'or' when it should use 'and'. Also, one docblock declaration needed a change. Aside from that, the rest of this PR is test cases, and overall coverage passes 89% for the first time.

* Clone is Okay After All

But copy wasn't, changing it to just return clone. Perhaps save and reload will be needed instead at some point, but not yet.

* An Error I Cannot Reproduce

PHP8.1 unit test says error because GdImage can't be serialized. I can't reproduce this error on any of my test systems. I have no idea why GdImage is even involved. Using try/catch to see if it helps.

* Weird Failures in Github

I thought restoring clone was a good idea. That left me in a state where, after one change, copy/clone no longer worked on Github (unable to reproduce on any of my test systems). After a second change, copy worked but clone didn't, again unable to reproduce. So, reverting to original version - copy does save and reload, clone throws exception.
---
 phpstan-baseline.neon                         |  15 --
 src/PhpSpreadsheet/Spreadsheet.php            |  35 ++-
 tests/PhpSpreadsheetTests/DefinedNameTest.php |  12 +
 .../PhpSpreadsheetTests/NamedFormulaTest.php  |   6 +
 tests/PhpSpreadsheetTests/NamedRangeTest.php  |   6 +
 .../Reader/Xlsx/RibbonTest.php                |  30 +++
 .../SpreadsheetCoverageTest.php               | 209 ++++++++++++++++++
 tests/PhpSpreadsheetTests/Style/FontTest.php  |  17 ++
 8 files changed, 297 insertions(+), 33 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/SpreadsheetCoverageTest.php

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 5ef5522f..024f1fbd 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -2860,11 +2860,6 @@ parameters:
 			count: 1
 			path: src/PhpSpreadsheet/Spreadsheet.php
 
-		-
-			message: "#^Comparison operation \"\\<\\=\" between int\\<min, \\-1\\> and 1000 is always true\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Spreadsheet.php
-
 		-
 			message: "#^Parameter \\#1 \\$worksheet of method PhpOffice\\\\PhpSpreadsheet\\\\Spreadsheet\\:\\:getIndex\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet, PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null given\\.$#"
 			count: 1
@@ -2875,21 +2870,11 @@ parameters:
 			count: 1
 			path: src/PhpSpreadsheet/Spreadsheet.php
 
-		-
-			message: "#^Result of \\|\\| is always true\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Spreadsheet.php
-
 		-
 			message: "#^Strict comparison using \\=\\=\\= between PhpOffice\\\\PhpSpreadsheet\\\\Spreadsheet and null will always evaluate to false\\.$#"
 			count: 1
 			path: src/PhpSpreadsheet/Spreadsheet.php
 
-		-
-			message: "#^Strict comparison using \\=\\=\\= between string and null will always evaluate to false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Spreadsheet.php
-
 		-
 			message: "#^Unreachable statement \\- code above always terminates\\.$#"
 			count: 1
diff --git a/src/PhpSpreadsheet/Spreadsheet.php b/src/PhpSpreadsheet/Spreadsheet.php
index 33b4fe0c..4bb93987 100644
--- a/src/PhpSpreadsheet/Spreadsheet.php
+++ b/src/PhpSpreadsheet/Spreadsheet.php
@@ -3,10 +3,13 @@
 namespace PhpOffice\PhpSpreadsheet;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx as XlsxReader;
+use PhpOffice\PhpSpreadsheet\Shared\File;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Style\Style;
 use PhpOffice\PhpSpreadsheet\Worksheet\Iterator;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx as XlsxWriter;
 
 class Spreadsheet
 {
@@ -1120,28 +1123,24 @@ class Spreadsheet
      */
     public function copy()
     {
-        $copied = clone $this;
+        $filename = File::temporaryFilename();
+        $writer = new XlsxWriter($this);
+        $writer->setIncludeCharts(true);
+        $writer->save($filename);
 
-        $worksheetCount = count($this->workSheetCollection);
-        for ($i = 0; $i < $worksheetCount; ++$i) {
-            $this->workSheetCollection[$i] = $this->workSheetCollection[$i]->copy();
-            $this->workSheetCollection[$i]->rebindParent($this);
-        }
+        $reader = new XlsxReader();
+        $reader->setIncludeCharts(true);
+        $reloadedSpreadsheet = $reader->load($filename);
+        unlink($filename);
 
-        return $copied;
+        return $reloadedSpreadsheet;
     }
 
-    /**
-     * Implement PHP __clone to create a deep clone, not just a shallow copy.
-     */
     public function __clone()
     {
-        // @phpstan-ignore-next-line
-        foreach ($this as $key => $val) {
-            if (is_object($val) || (is_array($val))) {
-                $this->{$key} = unserialize(serialize($val));
-            }
-        }
+        throw new Exception(
+            'Do not use clone on spreadsheet. Use spreadsheet->copy() instead.'
+        );
     }
 
     /**
@@ -1562,7 +1561,7 @@ class Spreadsheet
      *       Workbook window is hidden and cannot be shown in the
      *       user interface.
      *
-     * @param string $visibility visibility status of the workbook
+     * @param null|string $visibility visibility status of the workbook
      */
     public function setVisibility($visibility): void
     {
@@ -1596,7 +1595,7 @@ class Spreadsheet
      */
     public function setTabRatio($tabRatio): void
     {
-        if ($tabRatio >= 0 || $tabRatio <= 1000) {
+        if ($tabRatio >= 0 && $tabRatio <= 1000) {
             $this->tabRatio = (int) $tabRatio;
         } else {
             throw new Exception('Tab ratio must be between 0 and 1000.');
diff --git a/tests/PhpSpreadsheetTests/DefinedNameTest.php b/tests/PhpSpreadsheetTests/DefinedNameTest.php
index 43eddc8a..82950880 100644
--- a/tests/PhpSpreadsheetTests/DefinedNameTest.php
+++ b/tests/PhpSpreadsheetTests/DefinedNameTest.php
@@ -85,6 +85,18 @@ class DefinedNameTest extends TestCase
         self::assertCount(1, $this->spreadsheet->getDefinedNames());
     }
 
+    public function testRemoveGlobalDefinedName(): void
+    {
+        $this->spreadsheet->addDefinedName(
+            DefinedName::createInstance('Any', $this->spreadsheet->getActiveSheet(), '=A1')
+        );
+        self::assertCount(1, $this->spreadsheet->getDefinedNames());
+
+        $this->spreadsheet->removeDefinedName('Any');
+        self::assertCount(0, $this->spreadsheet->getDefinedNames());
+        $this->spreadsheet->removeDefinedName('Other');
+    }
+
     public function testRemoveGlobalDefinedNameWhenDuplicateNames(): void
     {
         $this->spreadsheet->addDefinedName(
diff --git a/tests/PhpSpreadsheetTests/NamedFormulaTest.php b/tests/PhpSpreadsheetTests/NamedFormulaTest.php
index 4c4a6b11..02e9d818 100644
--- a/tests/PhpSpreadsheetTests/NamedFormulaTest.php
+++ b/tests/PhpSpreadsheetTests/NamedFormulaTest.php
@@ -133,4 +133,10 @@ class NamedFormulaTest extends TestCase
             $formula->getValue()
         );
     }
+
+    public function testRemoveNonExistentNamedFormula(): void
+    {
+        self::assertCount(0, $this->spreadsheet->getNamedFormulae());
+        $this->spreadsheet->removeNamedFormula('Any');
+    }
 }
diff --git a/tests/PhpSpreadsheetTests/NamedRangeTest.php b/tests/PhpSpreadsheetTests/NamedRangeTest.php
index c72b7b73..402e7eba 100644
--- a/tests/PhpSpreadsheetTests/NamedRangeTest.php
+++ b/tests/PhpSpreadsheetTests/NamedRangeTest.php
@@ -133,4 +133,10 @@ class NamedRangeTest extends TestCase
             $range->getValue()
         );
     }
+
+    public function testRemoveNonExistentNamedRange(): void
+    {
+        self::assertCount(0, $this->spreadsheet->getNamedRanges());
+        $this->spreadsheet->removeNamedRange('Any');
+    }
 }
diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/RibbonTest.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/RibbonTest.php
index 197ad47f..ab304e7b 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xlsx/RibbonTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/RibbonTest.php
@@ -44,4 +44,34 @@ class RibbonTest extends AbstractFunctional
         self::assertNull($reloadedSpreadsheet->getRibbonBinObjects());
         $reloadedSpreadsheet->disconnectWorksheets();
     }
+
+    /**
+     * Same as above but discard macros.
+     */
+    public function testDiscardMacros(): void
+    {
+        $filename = 'tests/data/Reader/XLSX/ribbon.donotopen.zip';
+        $reader = IOFactory::createReader('Xlsx');
+        $spreadsheet = $reader->load($filename);
+        self::assertTrue($spreadsheet->hasRibbon());
+        $target = $spreadsheet->getRibbonXMLData('target');
+        self::assertSame('customUI/customUI.xml', $target);
+        $data = $spreadsheet->getRibbonXMLData('data');
+        self::assertIsString($data);
+        self::assertSame(1522, strlen($data));
+        $vbaCode = (string) $spreadsheet->getMacrosCode();
+        self::assertSame(13312, strlen($vbaCode));
+        $spreadsheet->discardMacros();
+
+        $reloadedSpreadsheet = $this->writeAndReload($spreadsheet, 'Xlsx');
+        $spreadsheet->disconnectWorksheets();
+        self::assertTrue($reloadedSpreadsheet->hasRibbon());
+        $ribbonData = $reloadedSpreadsheet->getRibbonXmlData();
+        self::assertIsArray($ribbonData);
+        self::assertSame($target, $ribbonData['target'] ?? '');
+        self::assertSame($data, $ribbonData['data'] ?? '');
+        self::assertNull($reloadedSpreadsheet->getMacrosCode());
+        self::assertNull($reloadedSpreadsheet->getRibbonBinObjects());
+        $reloadedSpreadsheet->disconnectWorksheets();
+    }
 }
diff --git a/tests/PhpSpreadsheetTests/SpreadsheetCoverageTest.php b/tests/PhpSpreadsheetTests/SpreadsheetCoverageTest.php
new file mode 100644
index 00000000..584c53fe
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/SpreadsheetCoverageTest.php
@@ -0,0 +1,209 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests;
+
+use PhpOffice\PhpSpreadsheet\Exception as SSException;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Style;
+use PHPUnit\Framework\TestCase;
+
+class SpreadsheetCoverageTest extends TestCase
+{
+    public function testDocumentProperties(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $properties = $spreadsheet->getProperties();
+        $properties->setCreator('Anyone');
+        $properties->setTitle('Description');
+        $spreadsheet2 = new Spreadsheet();
+        self::assertNotEquals($properties, $spreadsheet2->getProperties());
+        $properties2 = clone $properties;
+        $spreadsheet2->setProperties($properties2);
+        self::assertEquals($properties, $spreadsheet2->getProperties());
+        $spreadsheet->disconnectWorksheets();
+        $spreadsheet2->disconnectWorksheets();
+    }
+
+    public function testDocumentSecurity(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $security = $spreadsheet->getSecurity();
+        $security->setLockRevision(true);
+        $revisionsPassword = 'revpasswd';
+        $security->setRevisionsPassword($revisionsPassword);
+        $spreadsheet2 = new Spreadsheet();
+        self::assertNotEquals($security, $spreadsheet2->getSecurity());
+        $security2 = clone $security;
+        $spreadsheet2->setSecurity($security2);
+        self::assertEquals($security, $spreadsheet2->getSecurity());
+        $spreadsheet->disconnectWorksheets();
+        $spreadsheet2->disconnectWorksheets();
+    }
+
+    public function testCellXfCollection(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->getStyle('A1')->getFont()->setName('font1');
+        $sheet->getStyle('A2')->getFont()->setName('font2');
+        $sheet->getStyle('A3')->getFont()->setName('font3');
+        $sheet->getStyle('B1')->getFont()->setName('font1');
+        $sheet->getStyle('B2')->getFont()->setName('font2');
+        $collection = $spreadsheet->getCellXfCollection();
+        self::assertCount(4, $collection);
+        $font1Style = $collection[1];
+        self::assertTrue($spreadsheet->cellXfExists($font1Style));
+        self::assertSame('font1', $spreadsheet->getCellXfCollection()[1]->getFont()->getName());
+        self::assertSame('font1', $sheet->getStyle('A1')->getFont()->getName());
+        self::assertSame('font2', $sheet->getStyle('A2')->getFont()->getName());
+        self::assertSame('font3', $sheet->getStyle('A3')->getFont()->getName());
+        self::assertSame('font1', $sheet->getStyle('B1')->getFont()->getName());
+        self::assertSame('font2', $sheet->getStyle('B2')->getFont()->getName());
+
+        $spreadsheet->removeCellXfByIndex(1);
+        self::assertFalse($spreadsheet->cellXfExists($font1Style));
+        self::assertSame('font2', $spreadsheet->getCellXfCollection()[1]->getFont()->getName());
+        self::assertSame('Calibri', $sheet->getStyle('A1')->getFont()->getName());
+        self::assertSame('font2', $sheet->getStyle('A2')->getFont()->getName());
+        self::assertSame('font3', $sheet->getStyle('A3')->getFont()->getName());
+        self::assertSame('Calibri', $sheet->getStyle('B1')->getFont()->getName());
+        self::assertSame('font2', $sheet->getStyle('B2')->getFont()->getName());
+        $spreadsheet->disconnectWorksheets();
+    }
+
+    public function testInvalidRemoveCellXfByIndex(): void
+    {
+        $this->expectException(SSException::class);
+        $this->expectExceptionMessage('CellXf index is out of bounds.');
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->getStyle('A1')->getFont()->setName('font1');
+        $sheet->getStyle('A2')->getFont()->setName('font2');
+        $sheet->getStyle('A3')->getFont()->setName('font3');
+        $sheet->getStyle('B1')->getFont()->setName('font1');
+        $sheet->getStyle('B2')->getFont()->setName('font2');
+        $spreadsheet->removeCellXfByIndex(5);
+        $spreadsheet->disconnectWorksheets();
+    }
+
+    public function testInvalidRemoveDefaultStyle(): void
+    {
+        $this->expectException(SSException::class);
+        $this->expectExceptionMessage('No default style found for this workbook');
+        // Removing default style probably should be disallowed.
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $spreadsheet->removeCellXfByIndex(0);
+        $style = $spreadsheet->getDefaultStyle();
+        $spreadsheet->disconnectWorksheets();
+    }
+
+    public function testCellStyleXF(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $collection = $spreadsheet->getCellStyleXfCollection();
+        self::assertCount(1, $collection);
+        $styleXf = $collection[0];
+        self::assertSame($styleXf, $spreadsheet->getCellStyleXfByIndex(0));
+        $hash = $styleXf->getHashCode();
+        self::assertSame($styleXf, $spreadsheet->getCellStyleXfByHashCode($hash));
+        self::assertFalse($spreadsheet->getCellStyleXfByHashCode($hash . 'x'));
+        $spreadsheet->disconnectWorksheets();
+    }
+
+    public function testInvalidRemoveCellStyleXfByIndex(): void
+    {
+        $this->expectException(SSException::class);
+        $this->expectExceptionMessage('CellStyleXf index is out of bounds.');
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $spreadsheet->removeCellStyleXfByIndex(5);
+        $spreadsheet->disconnectWorksheets();
+    }
+
+    public function testInvalidFirstSheetIndex(): void
+    {
+        $this->expectException(SSException::class);
+        $this->expectExceptionMessage('First sheet index must be a positive integer.');
+        $spreadsheet = new Spreadsheet();
+        $spreadsheet->setFirstSheetIndex(-1);
+        $spreadsheet->disconnectWorksheets();
+    }
+
+    public function testInvalidVisibility(): void
+    {
+        $this->expectException(SSException::class);
+        $this->expectExceptionMessage('Invalid visibility value.');
+        $spreadsheet = new Spreadsheet();
+        $spreadsheet->setVisibility(Spreadsheet::VISIBILITY_HIDDEN);
+        self::assertSame(Spreadsheet::VISIBILITY_HIDDEN, $spreadsheet->getVisibility());
+        $spreadsheet->setVisibility(null);
+        self::assertSame(Spreadsheet::VISIBILITY_VISIBLE, $spreadsheet->getVisibility());
+        $spreadsheet->setVisibility('badvalue');
+        $spreadsheet->disconnectWorksheets();
+    }
+
+    public function testInvalidTabRatio(): void
+    {
+        $this->expectException(SSException::class);
+        $this->expectExceptionMessage('Tab ratio must be between 0 and 1000.');
+        $spreadsheet = new Spreadsheet();
+        $spreadsheet->setTabRatio(2000);
+        $spreadsheet->disconnectWorksheets();
+    }
+
+    public function testCopy(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->getStyle('A1')->getFont()->setName('font1');
+        $sheet->getStyle('A2')->getFont()->setName('font2');
+        $sheet->getStyle('A3')->getFont()->setName('font3');
+        $sheet->getStyle('B1')->getFont()->setName('font1');
+        $sheet->getStyle('B2')->getFont()->setName('font2');
+        $sheet->getCell('A1')->setValue('this is a1');
+        $sheet->getCell('A2')->setValue('this is a2');
+        $sheet->getCell('A3')->setValue('this is a3');
+        $sheet->getCell('B1')->setValue('this is b1');
+        $sheet->getCell('B2')->setValue('this is b2');
+        $copied = $spreadsheet->copy();
+        $copysheet = $copied->getActiveSheet();
+        $copysheet->getStyle('A2')->getFont()->setName('font12');
+        $copysheet->getCell('A2')->setValue('this was a2');
+
+        self::assertSame('font1', $sheet->getStyle('A1')->getFont()->getName());
+        self::assertSame('font2', $sheet->getStyle('A2')->getFont()->getName());
+        self::assertSame('font3', $sheet->getStyle('A3')->getFont()->getName());
+        self::assertSame('font1', $sheet->getStyle('B1')->getFont()->getName());
+        self::assertSame('font2', $sheet->getStyle('B2')->getFont()->getName());
+        self::assertSame('this is a1', $sheet->getCell('A1')->getValue());
+        self::assertSame('this is a2', $sheet->getCell('A2')->getValue());
+        self::assertSame('this is a3', $sheet->getCell('A3')->getValue());
+        self::assertSame('this is b1', $sheet->getCell('B1')->getValue());
+        self::assertSame('this is b2', $sheet->getCell('B2')->getValue());
+
+        self::assertSame('font1', $copysheet->getStyle('A1')->getFont()->getName());
+        self::assertSame('font12', $copysheet->getStyle('A2')->getFont()->getName());
+        self::assertSame('font3', $copysheet->getStyle('A3')->getFont()->getName());
+        self::assertSame('font1', $copysheet->getStyle('B1')->getFont()->getName());
+        self::assertSame('font2', $copysheet->getStyle('B2')->getFont()->getName());
+        self::assertSame('this is a1', $copysheet->getCell('A1')->getValue());
+        self::assertSame('this was a2', $copysheet->getCell('A2')->getValue());
+        self::assertSame('this is a3', $copysheet->getCell('A3')->getValue());
+        self::assertSame('this is b1', $copysheet->getCell('B1')->getValue());
+        self::assertSame('this is b2', $copysheet->getCell('B2')->getValue());
+
+        $spreadsheet->disconnectWorksheets();
+        $copied->disconnectWorksheets();
+    }
+
+    public function testClone(): void
+    {
+        $this->expectException(SSException::class);
+        $this->expectExceptionMessage('Do not use clone on spreadsheet. Use spreadsheet->copy() instead.');
+        $spreadsheet = new Spreadsheet();
+        $clone = clone $spreadsheet;
+        $spreadsheet->disconnectWorksheets();
+        $clone->disconnectWorksheets();
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Style/FontTest.php b/tests/PhpSpreadsheetTests/Style/FontTest.php
index 02814afa..6cd4d950 100644
--- a/tests/PhpSpreadsheetTests/Style/FontTest.php
+++ b/tests/PhpSpreadsheetTests/Style/FontTest.php
@@ -3,6 +3,7 @@
 namespace PhpOffice\PhpSpreadsheetTests\Style;
 
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Font;
 use PHPUnit\Framework\TestCase;
 
 class FontTest extends TestCase
@@ -88,4 +89,20 @@ class FontTest extends TestCase
         self::assertEquals('Calibri', $font->getName(), 'Null string changed to default');
         $spreadsheet->disconnectWorksheets();
     }
+
+    public function testUnderlineHash(): void
+    {
+        $font1 = new Font();
+        $font2 = new Font();
+        $font2aHash = $font2->getHashCode();
+        self::assertSame($font1->getHashCode(), $font2aHash);
+        $font2->setUnderlineColor(
+            [
+                'type' => 'srgbClr',
+                'value' => 'FF0000',
+            ]
+        );
+        $font2bHash = $font2->getHashCode();
+        self::assertNotEquals($font1->getHashCode(), $font2bHash);
+    }
 }

From 88bfa9829109e4b848d8ff71f0afe4161413ae05 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Mon, 18 Jul 2022 12:26:11 +0200
Subject: [PATCH 05/69] Initial Implementation of the new Excel TEXTBEFORE()
 and TEXTAFTER() functions

---
 CHANGELOG.md                                  |   2 +-
 .../Calculation/Calculation.php               |   8 +-
 .../Calculation/TextData/Extract.php          | 156 +++++++++++++
 src/PhpSpreadsheet/Writer/Xlsx/Xlfn.php       |   2 +
 .../Functions/TextData/TextAfterTest.php      |  49 ++++
 .../Functions/TextData/TextBeforeTest.php     |  33 +++
 tests/data/Calculation/TextData/TEXTAFTER.php | 215 ++++++++++++++++++
 .../data/Calculation/TextData/TEXTBEFORE.php  | 207 +++++++++++++++++
 8 files changed, 667 insertions(+), 5 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextAfterTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextBeforeTest.php
 create mode 100644 tests/data/Calculation/TextData/TEXTAFTER.php
 create mode 100644 tests/data/Calculation/TextData/TEXTBEFORE.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f53aeda2..732badb1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Added
 
-- Nothing
+- Implementation of the `TEXTBEFORE()` and `TEXTAFTER()` Excel Functions
 
 ### Changed
 
diff --git a/src/PhpSpreadsheet/Calculation/Calculation.php b/src/PhpSpreadsheet/Calculation/Calculation.php
index 5b1c5520..b73c7eaa 100644
--- a/src/PhpSpreadsheet/Calculation/Calculation.php
+++ b/src/PhpSpreadsheet/Calculation/Calculation.php
@@ -2490,13 +2490,13 @@ class Calculation
         ],
         'TEXTAFTER' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [Functions::class, 'DUMMY'],
-            'argumentCount' => '2-4',
+            'functionCall' => [TextData\Extract::class, 'after'],
+            'argumentCount' => '2-6',
         ],
         'TEXTBEFORE' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [Functions::class, 'DUMMY'],
-            'argumentCount' => '2-4',
+            'functionCall' => [TextData\Extract::class, 'before'],
+            'argumentCount' => '2-6',
         ],
         'TEXTJOIN' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
diff --git a/src/PhpSpreadsheet/Calculation/TextData/Extract.php b/src/PhpSpreadsheet/Calculation/TextData/Extract.php
index d29f80ca..1a9e84db 100644
--- a/src/PhpSpreadsheet/Calculation/TextData/Extract.php
+++ b/src/PhpSpreadsheet/Calculation/TextData/Extract.php
@@ -4,6 +4,9 @@ namespace PhpOffice\PhpSpreadsheet\Calculation\TextData;
 
 use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalcExp;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 
 class Extract
 {
@@ -95,4 +98,157 @@ class Extract
 
         return mb_substr($value ?? '', mb_strlen($value ?? '', 'UTF-8') - $chars, $chars, 'UTF-8');
     }
+
+    /**
+     * TEXTBEFORE.
+     *
+     * @param mixed $text the text that you're searching
+     *                    Or can be an array of values
+     * @param ?string $delimiter the text that marks the point before which you want to extract
+     * @param mixed $instance The instance of the delimiter after which you want to extract the text.
+     *                            By default, this is the first instance (1).
+     *                            A negative value means start searching from the end of the text string.
+     *                        Or can be an array of values
+     * @param mixed $matchMode Determines whether the match is case-sensitive or not.
+     *                           0 - Case-sensitive
+     *                           1 - Case-insensitive
+     *                        Or can be an array of values
+     * @param mixed $matchEnd Treats the end of text as a delimiter.
+     *                          0 - Don't match the delimiter against the end of the text.
+     *                          1 - Match the delimiter against the end of the text.
+     *                        Or can be an array of values
+     * @param mixed $ifNotFound value to return if no match is found
+     *                             The default is a #N/A Error
+     *                          Or can be an array of values
+     *
+     * @return mixed|mixed[] the string extracted from text before the delimiter; or the $ifNotFound value
+     *         If an array of values is passed for any of the arguments, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function before($text, $delimiter, $instance = 1, $matchMode = 0, $matchEnd = 0, $ifNotFound = '#N/A')
+    {
+        if (is_array($text) || is_array($instance) || is_array($matchMode) || is_array($matchEnd) || is_array($ifNotFound)) {
+            return self::evaluateArrayArgumentsIgnore([self::class, __FUNCTION__], 1, $text, $delimiter, $instance, $matchMode, $matchEnd, $ifNotFound);
+        }
+
+        $text = Helpers::extractString($text ?? '');
+        $delimiter = Helpers::extractString(Functions::flattenSingleValue($delimiter ?? ''));
+        $instance = (int) $instance;
+        $matchMode = (int) $matchMode;
+        $matchEnd = (int) $matchEnd;
+
+        $split = self::validateTextBeforeAfter($text, $delimiter, $instance, $matchMode, $matchEnd, $ifNotFound);
+        if (is_array($split) === false) {
+            return $split;
+        }
+        if ($delimiter === '') {
+            return ($instance > 0) ? '' : $text;
+        }
+
+        // Adjustment for a match as the first element of the split
+        $flags = self::matchFlags($matchMode);
+        $adjust = preg_match('/^' . preg_quote($delimiter) . "\$/{$flags}", $split[0]);
+        $oddReverseAdjustment = count($split) % 2;
+
+        $split = ($instance < 0)
+            ? array_slice($split, 0, max(count($split) - (abs($instance) * 2 - 1) - $adjust - $oddReverseAdjustment, 0))
+            : array_slice($split, 0, $instance * 2 - 1 - $adjust);
+
+        return implode('', $split);
+    }
+
+    /**
+     * TEXTAFTER.
+     *
+     * @param mixed $text the text that you're searching
+     * @param ?string $delimiter the text that marks the point before which you want to extract
+     * @param mixed $instance The instance of the delimiter after which you want to extract the text.
+     *                          By default, this is the first instance (1).
+     *                          A negative value means start searching from the end of the text string.
+     *                        Or can be an array of values
+     * @param mixed $matchMode Determines whether the match is case-sensitive or not.
+     *                            0 - Case-sensitive
+     *                            1 - Case-insensitive
+     *                         Or can be an array of values
+     * @param mixed $matchEnd Treats the end of text as a delimiter.
+     *                          0 - Don't match the delimiter against the end of the text.
+     *                          1 - Match the delimiter against the end of the text.
+     *                        Or can be an array of values
+     * @param mixed $ifNotFound value to return if no match is found
+     *                             The default is a #N/A Error
+     *                          Or can be an array of values
+     *
+     * @return mixed|mixed[] the string extracted from text before the delimiter; or the $ifNotFound value
+     *         If an array of values is passed for any of the arguments, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function after($text, $delimiter, $instance = 1, $matchMode = 0, $matchEnd = 0, $ifNotFound = '#N/A')
+    {
+        if (is_array($text) || is_array($instance) || is_array($matchMode) || is_array($matchEnd) || is_array($ifNotFound)) {
+            return self::evaluateArrayArgumentsIgnore([self::class, __FUNCTION__], 1, $text, $delimiter, $instance, $matchMode, $matchEnd, $ifNotFound);
+        }
+
+        $text = Helpers::extractString($text ?? '');
+        $delimiter = Helpers::extractString(Functions::flattenSingleValue($delimiter ?? ''));
+        $instance = (int) $instance;
+        $matchMode = (int) $matchMode;
+        $matchEnd = (int) $matchEnd;
+
+        $split = self::validateTextBeforeAfter($text, $delimiter, $instance, $matchMode, $matchEnd, $ifNotFound);
+        if (is_array($split) === false) {
+            return $split;
+        }
+        if ($delimiter === '') {
+            return ($instance < 0) ? '' : $text;
+        }
+
+        // Adjustment for a match as the first element of the split
+        $flags = self::matchFlags($matchMode);
+        $adjust = preg_match('/^' . preg_quote($delimiter) . "\$/{$flags}", $split[0]);
+        $oddReverseAdjustment = count($split) % 2;
+
+        $split = ($instance < 0)
+            ? array_slice($split, count($split) - (abs($instance + 1) * 2) - $adjust - $oddReverseAdjustment)
+            : array_slice($split, $instance * 2 - $adjust);
+
+        return implode('', $split);
+    }
+
+    /**
+     * @param int $matchMode
+     * @param int $matchEnd
+     * @param mixed $ifNotFound
+     *
+     * @return string|string[]
+     */
+    private static function validateTextBeforeAfter(string $text, string $delimiter, int $instance, $matchMode, $matchEnd, $ifNotFound)
+    {
+        $flags = self::matchFlags($matchMode);
+
+        if (preg_match('/' . preg_quote($delimiter) . "/{$flags}", $text) === 0 && $matchEnd === 0) {
+            return $ifNotFound;
+        }
+
+        $split = preg_split('/(' . preg_quote($delimiter) . ")/{$flags}", $text, 0, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
+        if ($split === false) {
+            return ExcelError::NA();
+        }
+
+        if ($instance === 0 || abs($instance) > StringHelper::countCharacters($text)) {
+            return ExcelError::VALUE();
+        }
+
+        if ($matchEnd === 0 && (abs($instance) > floor(count($split) / 2))) {
+            return ExcelError::NA();
+        } elseif ($matchEnd !== 0 && (abs($instance) - 1 > ceil(count($split) / 2))) {
+            return ExcelError::NA();
+        }
+
+        return $split;
+    }
+
+    private static function matchFlags(int $matchMode): string
+    {
+        return ($matchMode === 0) ? 'mu' : 'miu';
+    }
 }
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Xlfn.php b/src/PhpSpreadsheet/Writer/Xlsx/Xlfn.php
index 6fc0c66a..b623c573 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/Xlfn.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/Xlfn.php
@@ -144,6 +144,8 @@ class Xlfn
         . '|call'
         . '|let'
         . '|register[.]id'
+        . '|textafter'
+        . '|textbefore'
         . '|valuetotext'
         . ')(?=\\s*[(])/i';
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextAfterTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextAfterTest.php
new file mode 100644
index 00000000..b3b01d24
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextAfterTest.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\TextData;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+
+class TextAfterTest extends AllSetupTeardown
+{
+    /**
+     * @dataProvider providerTEXTAFTER
+     */
+    public function testTextAfter(string $expectedResult, array $arguments): void
+    {
+        $text = $arguments[0];
+        $delimiter = $arguments[1];
+
+        $args = 'A1, A2';
+        $args .= (isset($arguments[2])) ? ", {$arguments[2]}" : ',';
+        $args .= (isset($arguments[3])) ? ", {$arguments[3]}" : ',';
+        $args .= (isset($arguments[4])) ? ", {$arguments[4]}" : ',';
+
+        $worksheet = $this->getSheet();
+        $worksheet->getCell('A1')->setValue($text);
+        $worksheet->getCell('A2')->setValue($delimiter);
+        $worksheet->getCell('B1')->setValue("=TEXTAFTER({$args})");
+
+        $result = $worksheet->getCell('B1')->getCalculatedValue();
+        self::assertEquals($expectedResult, $result);
+    }
+
+    public function providerTEXTAFTER(): array
+    {
+        return require 'tests/data/Calculation/TextData/TEXTAFTER.php';
+    }
+
+    public function testTextAfterWithArray(): void
+    {
+        $calculation = Calculation::getInstance();
+
+        $text = "Red Riding Hood's red riding hood";
+        $delimiter = 'red';
+
+        $args = "\"{$text}\", \"{$delimiter}\", 1, {0;1}";
+
+        $formula = "=TEXTAFTER({$args})";
+        $result = $calculation->_calculateFormulaValue($formula);
+        self::assertEquals([[' riding hood'], [" Riding Hood's red riding hood"]], $result);
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextBeforeTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextBeforeTest.php
new file mode 100644
index 00000000..17938b5e
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextBeforeTest.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\TextData;
+
+class TextBeforeTest extends AllSetupTeardown
+{
+    /**
+     * @dataProvider providerTEXTBEFORE
+     */
+    public function testTextBefore(string $expectedResult, array $arguments): void
+    {
+        $text = $arguments[0];
+        $delimiter = $arguments[1];
+
+        $args = 'A1, A2';
+        $args .= (isset($arguments[2])) ? ", {$arguments[2]}" : ',';
+        $args .= (isset($arguments[3])) ? ", {$arguments[3]}" : ',';
+        $args .= (isset($arguments[4])) ? ", {$arguments[4]}" : ',';
+
+        $worksheet = $this->getSheet();
+        $worksheet->getCell('A1')->setValue($text);
+        $worksheet->getCell('A2')->setValue($delimiter);
+        $worksheet->getCell('B1')->setValue("=TEXTBEFORE({$args})");
+
+        $result = $worksheet->getCell('B1')->getCalculatedValue();
+        self::assertEquals($expectedResult, $result);
+    }
+
+    public function providerTEXTBEFORE(): array
+    {
+        return require 'tests/data/Calculation/TextData/TEXTBEFORE.php';
+    }
+}
diff --git a/tests/data/Calculation/TextData/TEXTAFTER.php b/tests/data/Calculation/TextData/TEXTAFTER.php
new file mode 100644
index 00000000..c594ecdc
--- /dev/null
+++ b/tests/data/Calculation/TextData/TEXTAFTER.php
@@ -0,0 +1,215 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+return [
+    'END Case-sensitive Offset 1' => [
+        "'s red hood",
+        [
+            "Red riding hood's red hood",
+            'hood',
+        ],
+    ],
+    'END Case-sensitive Offset 2' => [
+        '',
+        [
+            "Red riding hood's red hood",
+            'hood',
+            2,
+        ],
+    ],
+    'END Case-sensitive Offset -1' => [
+        '',
+        [
+            "Red riding hood's red hood",
+            'hood',
+            -1,
+        ],
+    ],
+    'END Case-sensitive Offset -2' => [
+        "'s red hood",
+        [
+            "Red riding hood's red hood",
+            'hood',
+            -2,
+        ],
+    ],
+    'END Case-sensitive Offset 3' => [
+        ExcelError::NA(),
+        [
+            "Red riding hood's red hood",
+            'hood',
+            3,
+        ],
+    ],
+    'END Case-sensitive Offset -3' => [
+        ExcelError::NA(),
+        [
+            "Red riding hood's red hood",
+            'hood',
+            -3,
+        ],
+    ],
+    'END Case-sensitive Offset 3 with end' => [
+        '',
+        [
+            "Red riding hood's red hood",
+            'hood',
+            3,
+            0,
+            1,
+        ],
+    ],
+    'END Case-sensitive Offset -3 with end' => [
+        "Red riding hood's red hood",
+        [
+            "Red riding hood's red hood",
+            'hood',
+            -3,
+            0,
+            1,
+        ],
+    ],
+    'END Case-sensitive - No Match' => [
+        ExcelError::NA(),
+        [
+            "Red riding hood's red hood",
+            'HOOD',
+        ],
+    ],
+    'END Case-insensitive Offset 1' => [
+        "'s red hood",
+        [
+            "Red riding hood's red hood",
+            'HOOD',
+            1,
+            1,
+        ],
+    ],
+    'END Case-insensitive Offset 2' => [
+        '',
+        [
+            "Red riding hood's red hood",
+            'HOOD',
+            2,
+            1,
+        ],
+    ],
+    'END Offset 0' => [
+        ExcelError::VALUE(),
+        [
+            "Red riding hood's red hood",
+            'hood',
+            0,
+        ],
+    ],
+    'Empty match positive' => [
+        "Red riding hood's red hood",
+        [
+            "Red riding hood's red hood",
+            '',
+        ],
+    ],
+    'Empty match negative' => [
+        '',
+        [
+            "Red riding hood's red hood",
+            '',
+            -1,
+        ],
+    ],
+    'START Case-sensitive Offset 1' => [
+        ' riding hood',
+        [
+            "Red Riding Hood's red riding hood",
+            'red',
+        ],
+    ],
+    'START Case-insensitive Offset 1' => [
+        " Riding Hood's red riding hood",
+        [
+            "Red Riding Hood's red riding hood",
+            'red',
+            1,
+            1,
+        ],
+    ],
+    'START Case-sensitive Offset -2' => [
+        "Red Riding Hood's red riding hood",
+        [
+            "Red Riding Hood's red riding hood",
+            'red',
+            -2,
+            0,
+            1,
+        ],
+    ],
+    'START Case-insensitive Offset -2' => [
+        " Riding Hood's red riding hood",
+        [
+            "Red Riding Hood's red riding hood",
+            'red',
+            -2,
+            1,
+            1,
+        ],
+    ],
+    [
+        ' riding hood',
+        [
+            "Red Riding Hood's red riding hood",
+            'red',
+            1,
+            0,
+        ],
+    ],
+    [
+        " Riding Hood's red riding hood",
+        [
+            "Red Riding Hood's red riding hood",
+            'red',
+            1,
+            1,
+        ],
+    ],
+    [
+        "Red Riding Hood's red riding hood",
+        [
+            "Red Riding Hood's red riding hood",
+            'red',
+            -2,
+            0,
+            1,
+        ],
+    ],
+    [
+        " Riding Hood's red riding hood",
+        [
+            "Red Riding Hood's red riding hood",
+            'red',
+            -2,
+            1,
+            1,
+        ],
+    ],
+    [
+        ExcelError::NA(),
+        [
+            'Socrates',
+            ' ',
+            1,
+            0,
+            0,
+        ],
+    ],
+    [
+        '',
+        [
+            'Socrates',
+            ' ',
+            1,
+            0,
+            1,
+        ],
+    ],
+];
diff --git a/tests/data/Calculation/TextData/TEXTBEFORE.php b/tests/data/Calculation/TextData/TEXTBEFORE.php
new file mode 100644
index 00000000..f94d5f28
--- /dev/null
+++ b/tests/data/Calculation/TextData/TEXTBEFORE.php
@@ -0,0 +1,207 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+return [
+    'END Case-sensitive Offset 1' => [
+        'Red riding ',
+        [
+            "Red riding hood's red hood",
+            'hood',
+        ],
+    ],
+    'END Case-sensitive Offset 2' => [
+        "Red riding hood's red ",
+        [
+            "Red riding hood's red hood",
+            'hood',
+            2,
+        ],
+    ],
+    'END Case-sensitive Offset -1' => [
+        "Red riding hood's red ",
+        [
+            "Red riding hood's red hood",
+            'hood',
+            -1,
+        ],
+    ],
+    'END Case-sensitive Offset -2' => [
+        'Red riding ',
+        [
+            "Red riding hood's red hood",
+            'hood',
+            -2,
+        ],
+    ],
+    'END Case-sensitive Offset 3' => [
+        ExcelError::NA(),
+        [
+            "Red riding hood's red hood",
+            'hood',
+            3,
+        ],
+    ],
+    'END Case-sensitive Offset -3' => [
+        ExcelError::NA(),
+        [
+            "Red riding hood's red hood",
+            'hood',
+            -3,
+        ],
+    ],
+    'END Case-sensitive Offset 3 with end' => [
+        "Red riding hood's red hood",
+        [
+            "Red riding hood's red hood",
+            'hood',
+            3,
+            0,
+            1,
+        ],
+    ],
+    'END Case-sensitive Offset -3 with end' => [
+        '',
+        [
+            "Red riding hood's red hood",
+            'hood',
+            -3,
+            0,
+            1,
+        ],
+    ],
+    'END Case-sensitive - No Match' => [
+        ExcelError::NA(),
+        [
+            "Red riding hood's red hood",
+            'HOOD',
+        ],
+    ],
+    'END Case-insensitive Offset 1' => [
+        'Red riding ',
+        [
+            "Red riding hood's red hood",
+            'HOOD',
+            1,
+            1,
+        ],
+    ],
+    'END Case-insensitive Offset 2' => [
+        "Red riding hood's red ",
+        [
+            "Red riding hood's red hood",
+            'HOOD',
+            2,
+            1,
+        ],
+    ],
+    'END Offset 0' => [
+        ExcelError::VALUE(),
+        [
+            "Red riding hood's red hood",
+            'hood',
+            0,
+        ],
+    ],
+    'Empty match positive' => [
+        '',
+        [
+            "Red riding hood's red hood",
+            '',
+        ],
+    ],
+    'Empty match negative' => [
+        "Red riding hood's red hood",
+        [
+            "Red riding hood's red hood",
+            '',
+            -1,
+        ],
+    ],
+    'START Case-sensitive Offset 1' => [
+        "Red Riding Hood's ",
+        [
+            "Red Riding Hood's red riding hood",
+            'red',
+        ],
+    ],
+    'START Case-insensitive Offset 1' => [
+        '',
+        [
+            "Red Riding Hood's red riding hood",
+            'red',
+            1,
+            1,
+        ],
+    ],
+    'START Case-sensitive Offset -2' => [
+        '',
+        [
+            "Red Riding Hood's red riding hood",
+            'red',
+            -2,
+            0,
+            1,
+        ],
+    ],
+    'START Case-insensitive Offset -2' => [
+        '',
+        [
+            "Red Riding Hood's red riding hood",
+            'red',
+            -2,
+            1,
+            1,
+        ],
+    ],
+    [
+        ExcelError::NA(),
+        [
+            'ABACADAEA',
+            'A',
+            6,
+            0,
+            0,
+        ],
+    ],
+    [
+        'ABACADAEA',
+        [
+            'ABACADAEA',
+            'A',
+            6,
+            0,
+            1,
+        ],
+    ],
+    [
+        ExcelError::NA(),
+        [
+            'Socrates',
+            ' ',
+            1,
+            0,
+            0,
+        ],
+    ],
+    [
+        'Socrates',
+        [
+            'Socrates',
+            ' ',
+            1,
+            0,
+            1,
+        ],
+    ],
+    [
+        'Immanuel',
+        [
+            'Immanuel Kant',
+            ' ',
+            1,
+            0,
+            1,
+        ],
+    ],
+];

From 39df9c3bcce10f4a907ad23502c4dcf9c38a644a Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Fri, 29 Jul 2022 06:14:28 -0700
Subject: [PATCH 06/69] Fix Some Pdf Problems (#2960)

* Fix Some Pdf Problems

Fix #1747. No support for text rotation in Pdf. That issue actually has a decent workaround, but PhpSpreadsheet should handle it on its own. Mpdf requires the proprietary text-rotate css attribute; Html and Dompdf will use the CSS3 attribute transform:rotate.

Fix #1713. Some paper-size values in PhpSpreadsheet are strings, some are 2-element float arrays. Dompdf accepts strings or 4-element float arrays, where the first 2 elements are always 0. Convert the PhpSpreadsheet array accordingly before passing it to Dompdf.

Some tests had been disabled when Dompdf and Tcpdf were slow to achieve PHP8 compliance. They achieved it some time ago. Re-enable the tests.

* Remove Tcpdf From One Test

No problem with the other tests I added it in for.
---
 samples/Basic/26_Utf8.php                     | 10 ++-
 samples/Pdf/21b_Pdf.php                       | 24 +++----
 src/PhpSpreadsheet/Writer/Html.php            | 15 +++++
 src/PhpSpreadsheet/Writer/Pdf/Dompdf.php      |  3 +
 src/PhpSpreadsheet/Writer/Pdf/Mpdf.php        |  3 +
 .../Functional/StreamTest.php                 |  3 +-
 .../Writer/Dompdf/PaperSizeArrayTest.php      | 65 +++++++++++++++++++
 .../Writer/Dompdf/TextRotationTest.php        | 24 +++++++
 .../Writer/Html/TextRotationTest.php          | 24 +++++++
 .../Writer/Mpdf/TextRotationTest.php          | 24 +++++++
 10 files changed, 174 insertions(+), 21 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Writer/Dompdf/PaperSizeArrayTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Writer/Dompdf/TextRotationTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Writer/Html/TextRotationTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Writer/Mpdf/TextRotationTest.php

diff --git a/samples/Basic/26_Utf8.php b/samples/Basic/26_Utf8.php
index 52953251..52a64509 100644
--- a/samples/Basic/26_Utf8.php
+++ b/samples/Basic/26_Utf8.php
@@ -12,12 +12,10 @@ $spreadsheet = $reader->load(__DIR__ . '/../templates/26template.xlsx');
 // at this point, we could do some manipulations with the template, but we skip this step
 $helper->write($spreadsheet, __FILE__, ['Xlsx', 'Xls', 'Html']);
 
-if (\PHP_VERSION_ID < 80000) {
-    // Export to PDF (.pdf)
-    $helper->log('Write to PDF format');
-    IOFactory::registerWriter('Pdf', \PhpOffice\PhpSpreadsheet\Writer\Pdf\Dompdf::class);
-    $helper->write($spreadsheet, __FILE__, ['Pdf']);
-}
+// Export to PDF (.pdf)
+$helper->log('Write to PDF format');
+IOFactory::registerWriter('Pdf', \PhpOffice\PhpSpreadsheet\Writer\Pdf\Dompdf::class);
+$helper->write($spreadsheet, __FILE__, ['Pdf']);
 
 // Remove first two rows with field headers before exporting to CSV
 $helper->log('Removing first two heading rows for CSV export');
diff --git a/samples/Pdf/21b_Pdf.php b/samples/Pdf/21b_Pdf.php
index ad2f609b..c67ff3d2 100644
--- a/samples/Pdf/21b_Pdf.php
+++ b/samples/Pdf/21b_Pdf.php
@@ -32,13 +32,11 @@ $spreadsheet->getActiveSheet()->setShowGridLines(false);
 $helper->log('Set orientation to landscape');
 $spreadsheet->getActiveSheet()->getPageSetup()->setOrientation(PageSetup::ORIENTATION_LANDSCAPE);
 
-if (\PHP_VERSION_ID < 80000) {
-    $helper->log('Write to Dompdf');
-    $writer = new Dompdf($spreadsheet);
-    $filename = $helper->getFileName('21b_Pdf_dompdf.xlsx', 'pdf');
-    $writer->setEditHtmlCallback('replaceBody');
-    $writer->save($filename);
-}
+$helper->log('Write to Dompdf');
+$writer = new Dompdf($spreadsheet);
+$filename = $helper->getFileName('21b_Pdf_dompdf.xlsx', 'pdf');
+$writer->setEditHtmlCallback('replaceBody');
+$writer->save($filename);
 
 $helper->log('Write to Mpdf');
 $writer = new Mpdf($spreadsheet);
@@ -46,10 +44,8 @@ $filename = $helper->getFileName('21b_Pdf_mpdf.xlsx', 'pdf');
 $writer->setEditHtmlCallback('replaceBody');
 $writer->save($filename);
 
-if (\PHP_VERSION_ID < 80000) {
-    $helper->log('Write to Tcpdf');
-    $writer = new Tcpdf($spreadsheet);
-    $filename = $helper->getFileName('21b_Pdf_tcpdf.xlsx', 'pdf');
-    $writer->setEditHtmlCallback('replaceBody');
-    $writer->save($filename);
-}
+$helper->log('Write to Tcpdf');
+$writer = new Tcpdf($spreadsheet);
+$filename = $helper->getFileName('21b_Pdf_tcpdf.xlsx', 'pdf');
+$writer->setEditHtmlCallback('replaceBody');
+$writer->save($filename);
diff --git a/src/PhpSpreadsheet/Writer/Html.php b/src/PhpSpreadsheet/Writer/Html.php
index da32025a..6e51b7a8 100644
--- a/src/PhpSpreadsheet/Writer/Html.php
+++ b/src/PhpSpreadsheet/Writer/Html.php
@@ -126,6 +126,13 @@ class Html extends BaseWriter
      */
     protected $isPdf = false;
 
+    /**
+     * Is the current writer creating mPDF?
+     *
+     * @var bool
+     */
+    protected $isMPdf = false;
+
     /**
      * Generate the Navigation block.
      *
@@ -1003,6 +1010,14 @@ class Html extends BaseWriter
                 $css['padding-' . $textAlign] = (string) ((int) $alignment->getIndent() * 9) . 'px';
             }
         }
+        $rotation = $alignment->getTextRotation();
+        if ($rotation !== 0 && $rotation !== Alignment::TEXTROTATION_STACK_PHPSPREADSHEET) {
+            if ($this->isMPdf) {
+                $css['text-rotate'] = "$rotation";
+            } else {
+                $css['transform'] = "rotate({$rotation}deg)";
+            }
+        }
 
         return $css;
     }
diff --git a/src/PhpSpreadsheet/Writer/Pdf/Dompdf.php b/src/PhpSpreadsheet/Writer/Pdf/Dompdf.php
index fc96f904..bf9e28cb 100644
--- a/src/PhpSpreadsheet/Writer/Pdf/Dompdf.php
+++ b/src/PhpSpreadsheet/Writer/Pdf/Dompdf.php
@@ -35,6 +35,9 @@ class Dompdf extends Pdf
         $orientation = ($orientation === PageSetup::ORIENTATION_LANDSCAPE) ? 'L' : 'P';
         $printPaperSize = $this->getPaperSize() ?? $setup->getPaperSize();
         $paperSize = self::$paperSizes[$printPaperSize] ?? PageSetup::getPaperSizeDefault();
+        if (is_array($paperSize) && count($paperSize) === 2) {
+            $paperSize = [0.0, 0.0, $paperSize[0], $paperSize[1]];
+        }
 
         $orientation = ($orientation == 'L') ? 'landscape' : 'portrait';
 
diff --git a/src/PhpSpreadsheet/Writer/Pdf/Mpdf.php b/src/PhpSpreadsheet/Writer/Pdf/Mpdf.php
index 281e1a4f..d0ce9ed4 100644
--- a/src/PhpSpreadsheet/Writer/Pdf/Mpdf.php
+++ b/src/PhpSpreadsheet/Writer/Pdf/Mpdf.php
@@ -8,6 +8,9 @@ use PhpOffice\PhpSpreadsheet\Writer\Pdf;
 
 class Mpdf extends Pdf
 {
+    /** @var bool */
+    protected $isMPdf = true;
+
     /**
      * Gets the implementation of external PDF library that should be used.
      *
diff --git a/tests/PhpSpreadsheetTests/Functional/StreamTest.php b/tests/PhpSpreadsheetTests/Functional/StreamTest.php
index 3911aaa6..a84a2490 100644
--- a/tests/PhpSpreadsheetTests/Functional/StreamTest.php
+++ b/tests/PhpSpreadsheetTests/Functional/StreamTest.php
@@ -17,12 +17,13 @@ class StreamTest extends TestCase
             ['Csv'],
             ['Html'],
             ['Mpdf'],
+            ['Dompdf'],
         ];
 
         if (\PHP_VERSION_ID < 80000) {
             $providerFormats = array_merge(
                 $providerFormats,
-                [['Tcpdf'], ['Dompdf']]
+                [['Tcpdf']]
             );
         }
 
diff --git a/tests/PhpSpreadsheetTests/Writer/Dompdf/PaperSizeArrayTest.php b/tests/PhpSpreadsheetTests/Writer/Dompdf/PaperSizeArrayTest.php
new file mode 100644
index 00000000..815d7e3d
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Writer/Dompdf/PaperSizeArrayTest.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Writer\Dompdf;
+
+use PhpOffice\PhpSpreadsheet\Shared\File;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
+use PhpOffice\PhpSpreadsheet\Writer\Pdf\Dompdf;
+use PHPUnit\Framework\TestCase;
+
+class PaperSizeArrayTest extends TestCase
+{
+    /** @var string */
+    private $outfile = '';
+
+    protected function tearDown(): void
+    {
+        if ($this->outfile !== '') {
+            unlink($this->outfile);
+            $this->outfile = '';
+        }
+    }
+
+    public function testPaperSizeArray(): void
+    {
+        // Issue 1713 - array in PhpSpreadsheet is 2 elements,
+        //   but in Dompdf it is 4 elements, first 2 are zero.
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        // TABLOID is a 2-element array in Writer/Pdf.php $paperSizes
+        $size = PageSetup::PAPERSIZE_TABLOID;
+        $sheet->getPageSetup()->setPaperSize($size);
+        $sheet->setPrintGridlines(true);
+        $sheet->getStyle('A7')->getAlignment()->setTextRotation(90);
+        $sheet->setCellValue('A7', 'Lorem Ipsum');
+        $writer = new Dompdf($spreadsheet);
+        $this->outfile = File::temporaryFilename();
+        $writer->save($this->outfile);
+        $spreadsheet->disconnectWorksheets();
+        unset($spreadsheet);
+        $contents = file_get_contents($this->outfile);
+        self::assertNotFalse($contents);
+        self::assertStringContainsString('/MediaBox [0.000 0.000 792.000 1224.000]', $contents);
+    }
+
+    public function testPaperSizeNotArray(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        // LETTER is a string in Writer/Pdf.php $paperSizes
+        $size = PageSetup::PAPERSIZE_LETTER;
+        $sheet->getPageSetup()->setPaperSize($size);
+        $sheet->setPrintGridlines(true);
+        $sheet->getStyle('A7')->getAlignment()->setTextRotation(90);
+        $sheet->setCellValue('A7', 'Lorem Ipsum');
+        $writer = new Dompdf($spreadsheet);
+        $this->outfile = File::temporaryFilename();
+        $writer->save($this->outfile);
+        $spreadsheet->disconnectWorksheets();
+        unset($spreadsheet);
+        $contents = file_get_contents($this->outfile);
+        self::assertNotFalse($contents);
+        self::assertStringContainsString('/MediaBox [0.000 0.000 612.000 792.000]', $contents);
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Writer/Dompdf/TextRotationTest.php b/tests/PhpSpreadsheetTests/Writer/Dompdf/TextRotationTest.php
new file mode 100644
index 00000000..2aa9d5ed
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Writer/Dompdf/TextRotationTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Writer\Dompdf;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Pdf\Dompdf;
+use PHPUnit\Framework\TestCase;
+
+class TextRotationTest extends TestCase
+{
+    public function testTextRotation(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->setPrintGridlines(true);
+        $sheet->getStyle('A7')->getAlignment()->setTextRotation(90);
+        $sheet->setCellValue('A7', 'Lorem Ipsum');
+        $writer = new Dompdf($spreadsheet);
+        $html = $writer->generateHtmlAll();
+        self::assertStringContainsString(' transform:rotate(90deg);', $html);
+        $spreadsheet->disconnectWorksheets();
+        unset($spreadsheet);
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Writer/Html/TextRotationTest.php b/tests/PhpSpreadsheetTests/Writer/Html/TextRotationTest.php
new file mode 100644
index 00000000..da928457
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Writer/Html/TextRotationTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Writer\Html;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Html;
+use PHPUnit\Framework\TestCase;
+
+class TextRotationTest extends TestCase
+{
+    public function testTextRotation(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->setPrintGridlines(true);
+        $sheet->getStyle('A7')->getAlignment()->setTextRotation(90);
+        $sheet->setCellValue('A7', 'Lorem Ipsum');
+        $writer = new Html($spreadsheet);
+        $html = $writer->generateHtmlAll();
+        self::assertStringContainsString(' transform:rotate(90deg);', $html);
+        $spreadsheet->disconnectWorksheets();
+        unset($spreadsheet);
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Writer/Mpdf/TextRotationTest.php b/tests/PhpSpreadsheetTests/Writer/Mpdf/TextRotationTest.php
new file mode 100644
index 00000000..000a33b4
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Writer/Mpdf/TextRotationTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Writer\Mpdf;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Pdf\Mpdf;
+use PHPUnit\Framework\TestCase;
+
+class TextRotationTest extends TestCase
+{
+    public function testTextRotation(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->setPrintGridlines(true);
+        $sheet->getStyle('A7')->getAlignment()->setTextRotation(90);
+        $sheet->setCellValue('A7', 'Lorem Ipsum');
+        $writer = new Mpdf($spreadsheet);
+        $html = $writer->generateHtmlAll();
+        self::assertStringContainsString(' text-rotate:90;', $html);
+        $spreadsheet->disconnectWorksheets();
+        unset($spreadsheet);
+    }
+}

From 641b6d0ccb8aa3f5265a2382db19c8c81d5eb1be Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Fri, 29 Jul 2022 07:11:37 -0700
Subject: [PATCH 07/69] Improve Coverage for Shared/Font (#2961)

Shared/Font is hardly covered in unit tests (as opposed to Style/Font which is completely covered). And it presented some good opportunities for code optimization. I wrote and tested the new unit tests first, then optimized the code and confirmed that everything still works.

There is still a bit of a gap with "exact" measurements. I had tests ready, but had to withdraw them when I discovered they weren't quite portable (see https://github.com/php/php-src/issues/9073).
---
 phpstan-baseline.neon                         |  45 --
 src/PhpSpreadsheet/Shared/Font.php            | 538 +++++++-----------
 .../Reader/Xls/Rc4Test.php                    |  21 +
 .../PhpSpreadsheetTests/Shared/Font2Test.php  | 149 +++++
 .../PhpSpreadsheetTests/Shared/Font3Test.php  |  53 ++
 5 files changed, 424 insertions(+), 382 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Reader/Xls/Rc4Test.php
 create mode 100644 tests/PhpSpreadsheetTests/Shared/Font2Test.php
 create mode 100644 tests/PhpSpreadsheetTests/Shared/Font3Test.php

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 024f1fbd..49ab167e 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -2270,51 +2270,6 @@ parameters:
 			count: 1
 			path: src/PhpSpreadsheet/Shared/Escher/DggContainer/BstoreContainer/BSE.php
 
-		-
-			message: "#^Cannot access offset 0 on array\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Font.php
-
-		-
-			message: "#^Cannot access offset 2 on array\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Font.php
-
-		-
-			message: "#^Cannot access offset 4 on array\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Font.php
-
-		-
-			message: "#^Cannot access offset 6 on array\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Font.php
-
-		-
-			message: "#^Parameter \\#1 \\$size of function imagettfbbox expects float, float\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Font.php
-
-		-
-			message: "#^Parameter \\#2 \\$defaultFont of static method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Drawing\\:\\:pixelsToCellDimension\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font, PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Font.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Font\\:\\:\\$autoSizeMethods has no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Font.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Font.php
-
-		-
-			message: "#^Variable \\$cellText on left side of \\?\\? always exists and is not nullable\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/Font.php
-
 		-
 			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\EigenvalueDecomposition\\:\\:\\$cdivi has no type specified\\.$#"
 			count: 1
diff --git a/src/PhpSpreadsheet/Shared/Font.php b/src/PhpSpreadsheet/Shared/Font.php
index 1adf213e..33796b4c 100644
--- a/src/PhpSpreadsheet/Shared/Font.php
+++ b/src/PhpSpreadsheet/Shared/Font.php
@@ -13,7 +13,7 @@ class Font
     const AUTOSIZE_METHOD_APPROX = 'approx';
     const AUTOSIZE_METHOD_EXACT = 'exact';
 
-    private static $autoSizeMethods = [
+    private const AUTOSIZE_METHODS = [
         self::AUTOSIZE_METHOD_APPROX,
         self::AUTOSIZE_METHOD_EXACT,
     ];
@@ -101,6 +101,105 @@ class Font
     const VERDANA_ITALIC = 'verdanai.ttf';
     const VERDANA_BOLD_ITALIC = 'verdanaz.ttf';
 
+    const FONT_FILE_NAMES = [
+        'Arial' => [
+            'x' => self::ARIAL,
+            'xb' => self::ARIAL_BOLD,
+            'xi' => self::ARIAL_ITALIC,
+            'xbi' => self::ARIAL_BOLD_ITALIC,
+        ],
+        'Calibri' => [
+            'x' => self::CALIBRI,
+            'xb' => self::CALIBRI_BOLD,
+            'xi' => self::CALIBRI_ITALIC,
+            'xbi' => self::CALIBRI_BOLD_ITALIC,
+        ],
+        'Comic Sans MS' => [
+            'x' => self::COMIC_SANS_MS,
+            'xb' => self::COMIC_SANS_MS_BOLD,
+            'xi' => self::COMIC_SANS_MS,
+            'xbi' => self::COMIC_SANS_MS_BOLD,
+        ],
+        'Courier New' => [
+            'x' => self::COURIER_NEW,
+            'xb' => self::COURIER_NEW_BOLD,
+            'xi' => self::COURIER_NEW_ITALIC,
+            'xbi' => self::COURIER_NEW_BOLD_ITALIC,
+        ],
+        'Georgia' => [
+            'x' => self::GEORGIA,
+            'xb' => self::GEORGIA_BOLD,
+            'xi' => self::GEORGIA_ITALIC,
+            'xbi' => self::GEORGIA_BOLD_ITALIC,
+        ],
+        'Impact' => [
+            'x' => self::IMPACT,
+            'xb' => self::IMPACT,
+            'xi' => self::IMPACT,
+            'xbi' => self::IMPACT,
+        ],
+        'Liberation Sans' => [
+            'x' => self::LIBERATION_SANS,
+            'xb' => self::LIBERATION_SANS_BOLD,
+            'xi' => self::LIBERATION_SANS_ITALIC,
+            'xbi' => self::LIBERATION_SANS_BOLD_ITALIC,
+        ],
+        'Lucida Console' => [
+            'x' => self::LUCIDA_CONSOLE,
+            'xb' => self::LUCIDA_CONSOLE,
+            'xi' => self::LUCIDA_CONSOLE,
+            'xbi' => self::LUCIDA_CONSOLE,
+        ],
+        'Lucida Sans Unicode' => [
+            'x' => self::LUCIDA_SANS_UNICODE,
+            'xb' => self::LUCIDA_SANS_UNICODE,
+            'xi' => self::LUCIDA_SANS_UNICODE,
+            'xbi' => self::LUCIDA_SANS_UNICODE,
+        ],
+        'Microsoft Sans Serif' => [
+            'x' => self::MICROSOFT_SANS_SERIF,
+            'xb' => self::MICROSOFT_SANS_SERIF,
+            'xi' => self::MICROSOFT_SANS_SERIF,
+            'xbi' => self::MICROSOFT_SANS_SERIF,
+        ],
+        'Palatino Linotype' => [
+            'x' => self::PALATINO_LINOTYPE,
+            'xb' => self::PALATINO_LINOTYPE_BOLD,
+            'xi' => self::PALATINO_LINOTYPE_ITALIC,
+            'xbi' => self::PALATINO_LINOTYPE_BOLD_ITALIC,
+        ],
+        'Symbol' => [
+            'x' => self::SYMBOL,
+            'xb' => self::SYMBOL,
+            'xi' => self::SYMBOL,
+            'xbi' => self::SYMBOL,
+        ],
+        'Tahoma' => [
+            'x' => self::TAHOMA,
+            'xb' => self::TAHOMA_BOLD,
+            'xi' => self::TAHOMA,
+            'xbi' => self::TAHOMA_BOLD,
+        ],
+        'Times New Roman' => [
+            'x' => self::TIMES_NEW_ROMAN,
+            'xb' => self::TIMES_NEW_ROMAN_BOLD,
+            'xi' => self::TIMES_NEW_ROMAN_ITALIC,
+            'xbi' => self::TIMES_NEW_ROMAN_BOLD_ITALIC,
+        ],
+        'Trebuchet MS' => [
+            'x' => self::TREBUCHET_MS,
+            'xb' => self::TREBUCHET_MS_BOLD,
+            'xi' => self::TREBUCHET_MS_ITALIC,
+            'xbi' => self::TREBUCHET_MS_BOLD_ITALIC,
+        ],
+        'Verdana' => [
+            'x' => self::VERDANA,
+            'xb' => self::VERDANA_BOLD,
+            'xi' => self::VERDANA_ITALIC,
+            'xbi' => self::VERDANA_BOLD_ITALIC,
+        ],
+    ];
+
     /**
      * AutoSize method.
      *
@@ -113,54 +212,65 @@ class Font
      *
      * @var string
      */
-    private static $trueTypeFontPath;
+    private static $trueTypeFontPath = '';
 
     /**
      * How wide is a default column for a given default font and size?
      * Empirical data found by inspecting real Excel files and reading off the pixel width
      * in Microsoft Office Excel 2007.
+     * Added height in points.
+     */
+    public const DEFAULT_COLUMN_WIDTHS = [
+        'Arial' => [
+            1 => ['px' => 24, 'width' => 12.00000000, 'height' => 5.25],
+            2 => ['px' => 24, 'width' => 12.00000000, 'height' => 5.25],
+            3 => ['px' => 32, 'width' => 10.66406250, 'height' => 6.0],
+
+            4 => ['px' => 32, 'width' => 10.66406250, 'height' => 6.75],
+            5 => ['px' => 40, 'width' => 10.00000000, 'height' => 8.25],
+            6 => ['px' => 48, 'width' => 9.59765625, 'height' => 8.25],
+            7 => ['px' => 48, 'width' => 9.59765625, 'height' => 9.0],
+            8 => ['px' => 56, 'width' => 9.33203125, 'height' => 11.25],
+            9 => ['px' => 64, 'width' => 9.14062500, 'height' => 12.0],
+            10 => ['px' => 64, 'width' => 9.14062500, 'height' => 12.75],
+        ],
+        'Calibri' => [
+            1 => ['px' => 24, 'width' => 12.00000000, 'height' => 5.25],
+            2 => ['px' => 24, 'width' => 12.00000000, 'height' => 5.25],
+            3 => ['px' => 32, 'width' => 10.66406250, 'height' => 6.00],
+            4 => ['px' => 32, 'width' => 10.66406250, 'height' => 6.75],
+            5 => ['px' => 40, 'width' => 10.00000000, 'height' => 8.25],
+            6 => ['px' => 48, 'width' => 9.59765625, 'height' => 8.25],
+            7 => ['px' => 48, 'width' => 9.59765625, 'height' => 9.0],
+            8 => ['px' => 56, 'width' => 9.33203125, 'height' => 11.25],
+            9 => ['px' => 56, 'width' => 9.33203125, 'height' => 12.0],
+            10 => ['px' => 64, 'width' => 9.14062500, 'height' => 12.75],
+            11 => ['px' => 64, 'width' => 9.14062500, 'height' => 15.0],
+        ],
+        'Verdana' => [
+            1 => ['px' => 24, 'width' => 12.00000000, 'height' => 5.25],
+            2 => ['px' => 24, 'width' => 12.00000000, 'height' => 5.25],
+            3 => ['px' => 32, 'width' => 10.66406250, 'height' => 6.0],
+            4 => ['px' => 32, 'width' => 10.66406250, 'height' => 6.75],
+            5 => ['px' => 40, 'width' => 10.00000000, 'height' => 8.25],
+            6 => ['px' => 48, 'width' => 9.59765625, 'height' => 8.25],
+            7 => ['px' => 48, 'width' => 9.59765625, 'height' => 9.0],
+            8 => ['px' => 64, 'width' => 9.14062500, 'height' => 10.5],
+            9 => ['px' => 72, 'width' => 9.00000000, 'height' => 11.25],
+            10 => ['px' => 72, 'width' => 9.00000000, 'height' => 12.75],
+        ],
+    ];
+
+    /**
+     * List of column widths. Replaced by constant;
+     * previously it was public and updateable, allowing
+     * user to make inappropriate alterations.
+     *
+     * @deprecated 1.25.0 Use DEFAULT_COLUMN_WIDTHS constant instead.
      *
      * @var array
      */
-    public static $defaultColumnWidths = [
-        'Arial' => [
-            1 => ['px' => 24, 'width' => 12.00000000],
-            2 => ['px' => 24, 'width' => 12.00000000],
-            3 => ['px' => 32, 'width' => 10.66406250],
-            4 => ['px' => 32, 'width' => 10.66406250],
-            5 => ['px' => 40, 'width' => 10.00000000],
-            6 => ['px' => 48, 'width' => 9.59765625],
-            7 => ['px' => 48, 'width' => 9.59765625],
-            8 => ['px' => 56, 'width' => 9.33203125],
-            9 => ['px' => 64, 'width' => 9.14062500],
-            10 => ['px' => 64, 'width' => 9.14062500],
-        ],
-        'Calibri' => [
-            1 => ['px' => 24, 'width' => 12.00000000],
-            2 => ['px' => 24, 'width' => 12.00000000],
-            3 => ['px' => 32, 'width' => 10.66406250],
-            4 => ['px' => 32, 'width' => 10.66406250],
-            5 => ['px' => 40, 'width' => 10.00000000],
-            6 => ['px' => 48, 'width' => 9.59765625],
-            7 => ['px' => 48, 'width' => 9.59765625],
-            8 => ['px' => 56, 'width' => 9.33203125],
-            9 => ['px' => 56, 'width' => 9.33203125],
-            10 => ['px' => 64, 'width' => 9.14062500],
-            11 => ['px' => 64, 'width' => 9.14062500],
-        ],
-        'Verdana' => [
-            1 => ['px' => 24, 'width' => 12.00000000],
-            2 => ['px' => 24, 'width' => 12.00000000],
-            3 => ['px' => 32, 'width' => 10.66406250],
-            4 => ['px' => 32, 'width' => 10.66406250],
-            5 => ['px' => 40, 'width' => 10.00000000],
-            6 => ['px' => 48, 'width' => 9.59765625],
-            7 => ['px' => 48, 'width' => 9.59765625],
-            8 => ['px' => 64, 'width' => 9.14062500],
-            9 => ['px' => 72, 'width' => 9.00000000],
-            10 => ['px' => 72, 'width' => 9.00000000],
-        ],
-    ];
+    public static $defaultColumnWidths = self::DEFAULT_COLUMN_WIDTHS;
 
     /**
      * Set autoSize method.
@@ -171,7 +281,7 @@ class Font
      */
     public static function setAutoSizeMethod($method)
     {
-        if (!in_array($method, self::$autoSizeMethods)) {
+        if (!in_array($method, self::AUTOSIZE_METHODS)) {
             return false;
         }
         self::$autoSizeMethod = $method;
@@ -219,7 +329,7 @@ class Font
      * Calculate an (approximate) OpenXML column width, based on font size and text contained.
      *
      * @param FontStyle $font Font object
-     * @param RichText|string $cellText Text to calculate width
+     * @param null|RichText|string $cellText Text to calculate width
      * @param int $rotation Rotation angle
      * @param null|FontStyle $defaultFont Font object
      * @param bool $filterAdjustment Add space for Autofilter or Table dropdown
@@ -238,7 +348,8 @@ class Font
         }
 
         // Special case if there are one or more newline characters ("\n")
-        if (strpos($cellText ?? '', "\n") !== false) {
+        $cellText = $cellText ?? '';
+        if (strpos($cellText, "\n") !== false) {
             $lineTexts = explode("\n", $cellText);
             $lineWidths = [];
             foreach ($lineTexts as $lineText) {
@@ -281,7 +392,7 @@ class Font
         }
 
         // Convert from pixel width to column width
-        $columnWidth = Drawing::pixelsToCellDimension((int) $columnWidth, $defaultFont);
+        $columnWidth = Drawing::pixelsToCellDimension((int) $columnWidth, $defaultFont ?? new FontStyle());
 
         // Return
         return (int) round($columnWidth, 6);
@@ -299,7 +410,12 @@ class Font
         // font size should really be supplied in pixels in GD2,
         // but since GD2 seems to assume 72dpi, pixels and points are the same
         $fontFile = self::getTrueTypeFontFileFromFont($font);
-        $textBox = imagettfbbox($font->getSize(), $rotation, $fontFile, $text);
+        $textBox = imagettfbbox($font->getSize() ?? 10.0, $rotation, $fontFile, $text);
+        if ($textBox === false) {
+            // @codeCoverageIgnoreStart
+            throw new PhpSpreadsheetException('imagettfbbox failed');
+            // @codeCoverageIgnoreEnd
+        }
 
         // Get corners positions
         $lowerLeftCornerX = $textBox[0];
@@ -409,129 +525,48 @@ class Font
      *
      * @return string Path to TrueType font file
      */
-    public static function getTrueTypeFontFileFromFont(FontStyle $font)
+    public static function getTrueTypeFontFileFromFont(FontStyle $font, bool $checkPath = true)
     {
-        if (!file_exists(self::$trueTypeFontPath) || !is_dir(self::$trueTypeFontPath)) {
+        if ($checkPath && (!file_exists(self::$trueTypeFontPath) || !is_dir(self::$trueTypeFontPath))) {
             throw new PhpSpreadsheetException('Valid directory to TrueType Font files not specified');
         }
 
         $name = $font->getName();
+        if (!isset(self::FONT_FILE_NAMES[$name])) {
+            throw new PhpSpreadsheetException('Unknown font name "' . $name . '". Cannot map to TrueType font file');
+        }
         $bold = $font->getBold();
         $italic = $font->getItalic();
-
-        // Check if we can map font to true type font file
-        switch ($name) {
-            case 'Arial':
-                $fontFile = (
-                    $bold ? ($italic ? self::ARIAL_BOLD_ITALIC : self::ARIAL_BOLD)
-                          : ($italic ? self::ARIAL_ITALIC : self::ARIAL)
-                );
-
-                break;
-            case 'Calibri':
-                $fontFile = (
-                    $bold ? ($italic ? self::CALIBRI_BOLD_ITALIC : self::CALIBRI_BOLD)
-                          : ($italic ? self::CALIBRI_ITALIC : self::CALIBRI)
-                );
-
-                break;
-            case 'Courier New':
-                $fontFile = (
-                    $bold ? ($italic ? self::COURIER_NEW_BOLD_ITALIC : self::COURIER_NEW_BOLD)
-                          : ($italic ? self::COURIER_NEW_ITALIC : self::COURIER_NEW)
-                );
-
-                break;
-            case 'Comic Sans MS':
-                $fontFile = (
-                    $bold ? self::COMIC_SANS_MS_BOLD : self::COMIC_SANS_MS
-                );
-
-                break;
-            case 'Georgia':
-                $fontFile = (
-                    $bold ? ($italic ? self::GEORGIA_BOLD_ITALIC : self::GEORGIA_BOLD)
-                          : ($italic ? self::GEORGIA_ITALIC : self::GEORGIA)
-                );
-
-                break;
-            case 'Impact':
-                $fontFile = self::IMPACT;
-
-                break;
-            case 'Liberation Sans':
-                $fontFile = (
-                    $bold ? ($italic ? self::LIBERATION_SANS_BOLD_ITALIC : self::LIBERATION_SANS_BOLD)
-                          : ($italic ? self::LIBERATION_SANS_ITALIC : self::LIBERATION_SANS)
-                );
-
-                break;
-            case 'Lucida Console':
-                $fontFile = self::LUCIDA_CONSOLE;
-
-                break;
-            case 'Lucida Sans Unicode':
-                $fontFile = self::LUCIDA_SANS_UNICODE;
-
-                break;
-            case 'Microsoft Sans Serif':
-                $fontFile = self::MICROSOFT_SANS_SERIF;
-
-                break;
-            case 'Palatino Linotype':
-                $fontFile = (
-                    $bold ? ($italic ? self::PALATINO_LINOTYPE_BOLD_ITALIC : self::PALATINO_LINOTYPE_BOLD)
-                          : ($italic ? self::PALATINO_LINOTYPE_ITALIC : self::PALATINO_LINOTYPE)
-                );
-
-                break;
-            case 'Symbol':
-                $fontFile = self::SYMBOL;
-
-                break;
-            case 'Tahoma':
-                $fontFile = (
-                    $bold ? self::TAHOMA_BOLD : self::TAHOMA
-                );
-
-                break;
-            case 'Times New Roman':
-                $fontFile = (
-                    $bold ? ($italic ? self::TIMES_NEW_ROMAN_BOLD_ITALIC : self::TIMES_NEW_ROMAN_BOLD)
-                          : ($italic ? self::TIMES_NEW_ROMAN_ITALIC : self::TIMES_NEW_ROMAN)
-                );
-
-                break;
-            case 'Trebuchet MS':
-                $fontFile = (
-                    $bold ? ($italic ? self::TREBUCHET_MS_BOLD_ITALIC : self::TREBUCHET_MS_BOLD)
-                          : ($italic ? self::TREBUCHET_MS_ITALIC : self::TREBUCHET_MS)
-                );
-
-                break;
-            case 'Verdana':
-                $fontFile = (
-                    $bold ? ($italic ? self::VERDANA_BOLD_ITALIC : self::VERDANA_BOLD)
-                          : ($italic ? self::VERDANA_ITALIC : self::VERDANA)
-                );
-
-                break;
-            default:
-                throw new PhpSpreadsheetException('Unknown font name "' . $name . '". Cannot map to TrueType font file');
-
-                break;
+        $index = 'x';
+        if ($bold) {
+            $index .= 'b';
         }
+        if ($italic) {
+            $index .= 'i';
+        }
+        $fontFile = self::FONT_FILE_NAMES[$name][$index];
 
-        $fontFile = self::$trueTypeFontPath . $fontFile;
+        $separator = '';
+        if (mb_strlen(self::$trueTypeFontPath) > 1 && mb_substr(self::$trueTypeFontPath, -1) !== '/' && mb_substr(self::$trueTypeFontPath, -1) !== '\\') {
+            $separator = DIRECTORY_SEPARATOR;
+        }
+        $fontFile = self::$trueTypeFontPath . $separator . $fontFile;
 
         // Check if file actually exists
-        if (!file_exists($fontFile)) {
+        if ($checkPath && !file_exists($fontFile)) {
             throw new PhpSpreadsheetException('TrueType Font file not found');
         }
 
         return $fontFile;
     }
 
+    public const CHARSET_FROM_FONT_NAME = [
+        'EucrosiaUPC' => self::CHARSET_ANSI_THAI,
+        'Wingdings' => self::CHARSET_SYMBOL,
+        'Wingdings 2' => self::CHARSET_SYMBOL,
+        'Wingdings 3' => self::CHARSET_SYMBOL,
+    ];
+
     /**
      * Returns the associated charset for the font name.
      *
@@ -541,19 +576,7 @@ class Font
      */
     public static function getCharsetFromFontName($fontName)
     {
-        switch ($fontName) {
-            // Add more cases. Check FONT records in real Excel files.
-            case 'EucrosiaUPC':
-                return self::CHARSET_ANSI_THAI;
-            case 'Wingdings':
-                return self::CHARSET_SYMBOL;
-            case 'Wingdings 2':
-                return self::CHARSET_SYMBOL;
-            case 'Wingdings 3':
-                return self::CHARSET_SYMBOL;
-            default:
-                return self::CHARSET_ANSI_LATIN;
-        }
+        return self::CHARSET_FROM_FONT_NAME[$fontName] ?? self::CHARSET_ANSI_LATIN;
     }
 
     /**
@@ -567,17 +590,17 @@ class Font
      */
     public static function getDefaultColumnWidthByFont(FontStyle $font, $returnAsPixels = false)
     {
-        if (isset(self::$defaultColumnWidths[$font->getName()][$font->getSize()])) {
+        if (isset(self::DEFAULT_COLUMN_WIDTHS[$font->getName()][$font->getSize()])) {
             // Exact width can be determined
             $columnWidth = $returnAsPixels ?
-                self::$defaultColumnWidths[$font->getName()][$font->getSize()]['px']
-                    : self::$defaultColumnWidths[$font->getName()][$font->getSize()]['width'];
+                self::DEFAULT_COLUMN_WIDTHS[$font->getName()][$font->getSize()]['px']
+                    : self::DEFAULT_COLUMN_WIDTHS[$font->getName()][$font->getSize()]['width'];
         } else {
             // We don't have data for this particular font and size, use approximation by
             // extrapolating from Calibri 11
             $columnWidth = $returnAsPixels ?
-                self::$defaultColumnWidths['Calibri'][11]['px']
-                    : self::$defaultColumnWidths['Calibri'][11]['width'];
+                self::DEFAULT_COLUMN_WIDTHS['Calibri'][11]['px']
+                    : self::DEFAULT_COLUMN_WIDTHS['Calibri'][11]['width'];
             $columnWidth = $columnWidth * $font->getSize() / 11;
 
             // Round pixels to closest integer
@@ -599,173 +622,14 @@ class Font
      */
     public static function getDefaultRowHeightByFont(FontStyle $font)
     {
-        switch ($font->getName()) {
-            case 'Arial':
-                switch ($font->getSize()) {
-                    case 10:
-                        // inspection of Arial 10 workbook says 12.75pt ~17px
-                        $rowHeight = 12.75;
-
-                        break;
-                    case 9:
-                        // inspection of Arial 9 workbook says 12.00pt ~16px
-                        $rowHeight = 12;
-
-                        break;
-                    case 8:
-                        // inspection of Arial 8 workbook says 11.25pt ~15px
-                        $rowHeight = 11.25;
-
-                        break;
-                    case 7:
-                        // inspection of Arial 7 workbook says 9.00pt ~12px
-                        $rowHeight = 9;
-
-                        break;
-                    case 6:
-                    case 5:
-                        // inspection of Arial 5,6 workbook says 8.25pt ~11px
-                        $rowHeight = 8.25;
-
-                        break;
-                    case 4:
-                        // inspection of Arial 4 workbook says 6.75pt ~9px
-                        $rowHeight = 6.75;
-
-                        break;
-                    case 3:
-                        // inspection of Arial 3 workbook says 6.00pt ~8px
-                        $rowHeight = 6;
-
-                        break;
-                    case 2:
-                    case 1:
-                        // inspection of Arial 1,2 workbook says 5.25pt ~7px
-                        $rowHeight = 5.25;
-
-                        break;
-                    default:
-                        // use Arial 10 workbook as an approximation, extrapolation
-                        $rowHeight = 12.75 * $font->getSize() / 10;
-
-                        break;
-                }
-
-                break;
-            case 'Calibri':
-                switch ($font->getSize()) {
-                    case 11:
-                        // inspection of Calibri 11 workbook says 15.00pt ~20px
-                        $rowHeight = 15;
-
-                        break;
-                    case 10:
-                        // inspection of Calibri 10 workbook says 12.75pt ~17px
-                        $rowHeight = 12.75;
-
-                        break;
-                    case 9:
-                        // inspection of Calibri 9 workbook says 12.00pt ~16px
-                        $rowHeight = 12;
-
-                        break;
-                    case 8:
-                        // inspection of Calibri 8 workbook says 11.25pt ~15px
-                        $rowHeight = 11.25;
-
-                        break;
-                    case 7:
-                        // inspection of Calibri 7 workbook says 9.00pt ~12px
-                        $rowHeight = 9;
-
-                        break;
-                    case 6:
-                    case 5:
-                        // inspection of Calibri 5,6 workbook says 8.25pt ~11px
-                        $rowHeight = 8.25;
-
-                        break;
-                    case 4:
-                        // inspection of Calibri 4 workbook says 6.75pt ~9px
-                        $rowHeight = 6.75;
-
-                        break;
-                    case 3:
-                        // inspection of Calibri 3 workbook says 6.00pt ~8px
-                        $rowHeight = 6.00;
-
-                        break;
-                    case 2:
-                    case 1:
-                        // inspection of Calibri 1,2 workbook says 5.25pt ~7px
-                        $rowHeight = 5.25;
-
-                        break;
-                    default:
-                        // use Calibri 11 workbook as an approximation, extrapolation
-                        $rowHeight = 15 * $font->getSize() / 11;
-
-                        break;
-                }
-
-                break;
-            case 'Verdana':
-                switch ($font->getSize()) {
-                    case 10:
-                        // inspection of Verdana 10 workbook says 12.75pt ~17px
-                        $rowHeight = 12.75;
-
-                        break;
-                    case 9:
-                        // inspection of Verdana 9 workbook says 11.25pt ~15px
-                        $rowHeight = 11.25;
-
-                        break;
-                    case 8:
-                        // inspection of Verdana 8 workbook says 10.50pt ~14px
-                        $rowHeight = 10.50;
-
-                        break;
-                    case 7:
-                        // inspection of Verdana 7 workbook says 9.00pt ~12px
-                        $rowHeight = 9.00;
-
-                        break;
-                    case 6:
-                    case 5:
-                        // inspection of Verdana 5,6 workbook says 8.25pt ~11px
-                        $rowHeight = 8.25;
-
-                        break;
-                    case 4:
-                        // inspection of Verdana 4 workbook says 6.75pt ~9px
-                        $rowHeight = 6.75;
-
-                        break;
-                    case 3:
-                        // inspection of Verdana 3 workbook says 6.00pt ~8px
-                        $rowHeight = 6;
-
-                        break;
-                    case 2:
-                    case 1:
-                        // inspection of Verdana 1,2 workbook says 5.25pt ~7px
-                        $rowHeight = 5.25;
-
-                        break;
-                    default:
-                        // use Verdana 10 workbook as an approximation, extrapolation
-                        $rowHeight = 12.75 * $font->getSize() / 10;
-
-                        break;
-                }
-
-                break;
-            default:
-                // just use Calibri as an approximation
-                $rowHeight = 15 * $font->getSize() / 11;
-
-                break;
+        $name = $font->getName();
+        $size = $font->getSize();
+        if (isset(self::DEFAULT_COLUMN_WIDTHS[$name][$size])) {
+            $rowHeight = self::DEFAULT_COLUMN_WIDTHS[$name][$size]['height'];
+        } elseif ($name === 'Arial' || $name === 'Verdana') {
+            $rowHeight = self::DEFAULT_COLUMN_WIDTHS[$name][10]['height'] * $size / 10.0;
+        } else {
+            $rowHeight = self::DEFAULT_COLUMN_WIDTHS['Calibri'][11]['height'] * $size / 11.0;
         }
 
         return $rowHeight;
diff --git a/tests/PhpSpreadsheetTests/Reader/Xls/Rc4Test.php b/tests/PhpSpreadsheetTests/Reader/Xls/Rc4Test.php
new file mode 100644
index 00000000..c3056c08
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Reader/Xls/Rc4Test.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xls;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xls\RC4;
+use PHPUnit\Framework\TestCase;
+
+class Rc4Test extends TestCase
+{
+    public function testRc4(): void
+    {
+        // following result confirmed at:
+        // https://cryptii.com/pipes/rc4-encryption
+        $key = "\x63\x72\x79\x70\x74\x69\x69";
+        $string = 'The quick brown fox jumps over the lazy dog.';
+        $rc4 = new RC4($key);
+        $result = bin2hex($rc4->RC4($string));
+        $expectedResult = '2ac2fecdd8fbb84638e3a4820eb205cc8e29c28b9d5d6b2ef974f311964971c90e8b9ca16467ef2dc6fc3520';
+        self::assertSame($expectedResult, $result);
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Shared/Font2Test.php b/tests/PhpSpreadsheetTests/Shared/Font2Test.php
new file mode 100644
index 00000000..4bb247cf
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Shared/Font2Test.php
@@ -0,0 +1,149 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Shared;
+
+use PhpOffice\PhpSpreadsheet\Shared\Font;
+use PhpOffice\PhpSpreadsheet\Style\Font as StyleFont;
+use PHPUnit\Framework\TestCase;
+
+class Font2Test extends TestCase
+{
+    /**
+     * @dataProvider providerCharsetFromFontName
+     */
+    public function testCharsetFromFontName(string $fontName, int $expectedResult): void
+    {
+        $result = Font::getCharsetFromFontName($fontName);
+        self::assertEquals($expectedResult, $result);
+    }
+
+    public function testCharsetFromFontNameCoverage(): void
+    {
+        $covered = [];
+        $expected = Font::CHARSET_FROM_FONT_NAME;
+        foreach (array_keys($expected) as $key) {
+            $covered[$key] = 0;
+        }
+        $defaultCovered = false;
+        $tests = $this->providerCharsetFromFontName();
+        foreach ($tests as $test) {
+            $thisTest = $test[0];
+            if (array_key_exists($thisTest, $covered)) {
+                $covered[$thisTest] = 1;
+            } else {
+                $defaultCovered = true;
+            }
+        }
+        foreach ($covered as $key => $val) {
+            self::assertEquals(1, $val, "FontName $key not tested");
+        }
+        self::assertTrue($defaultCovered, 'Default key not tested');
+    }
+
+    public function providerCharsetFromFontName(): array
+    {
+        return [
+            ['EucrosiaUPC', Font::CHARSET_ANSI_THAI],
+            ['Wingdings', Font::CHARSET_SYMBOL],
+            ['Wingdings 2', Font::CHARSET_SYMBOL],
+            ['Wingdings 3', Font::CHARSET_SYMBOL],
+            ['Default', Font::CHARSET_ANSI_LATIN],
+        ];
+    }
+
+    public function testColumnWidths(): void
+    {
+        $widths = Font::DEFAULT_COLUMN_WIDTHS;
+        $fontNames = ['Arial', 'Calibri', 'Verdana'];
+        $font = new StyleFont();
+        foreach ($fontNames as $fontName) {
+            $font->setName($fontName);
+            $array = $widths[$fontName];
+            foreach ($array as $points => $array2) {
+                $font->setSize($points);
+                $px = $array2['px'];
+                $width = $array2['width'];
+                self::assertEquals($px, Font::getDefaultColumnWidthByFont($font, true), "$fontName $points px");
+                self::assertEquals($width, Font::getDefaultColumnWidthByFont($font, false), "$fontName $points ooxml-units");
+            }
+        }
+        $pxCalibri11 = $widths['Calibri'][11]['px'];
+        $widthCalibri11 = $widths['Calibri'][11]['width'];
+        $fontName = 'unknown';
+        $points = 11;
+        $font->setName($fontName);
+        $font->setSize($points);
+        self::assertEquals($pxCalibri11, Font::getDefaultColumnWidthByFont($font, true), "$fontName $points px");
+        self::assertEquals($widthCalibri11, Font::getDefaultColumnWidthByFont($font, false), "$fontName $points ooxml-units");
+        $points = 22;
+        $font->setSize($points);
+        self::assertEquals(2 * $pxCalibri11, Font::getDefaultColumnWidthByFont($font, true), "$fontName $points px");
+        self::assertEquals(2 * $widthCalibri11, Font::getDefaultColumnWidthByFont($font, false), "$fontName $points ooxml-units");
+        $fontName = 'Arial';
+        $points = 33;
+        $font->setName($fontName);
+        $font->setSize($points);
+        self::assertEquals(3 * $pxCalibri11, Font::getDefaultColumnWidthByFont($font, true), "$fontName $points px");
+        self::assertEquals(3 * $widthCalibri11, Font::getDefaultColumnWidthByFont($font, false), "$fontName $points ooxml-units");
+    }
+
+    public function testRowHeights(): void
+    {
+        $heights = Font::DEFAULT_COLUMN_WIDTHS;
+        $fontNames = ['Arial', 'Calibri', 'Verdana'];
+        $font = new StyleFont();
+        foreach ($fontNames as $fontName) {
+            $font->setName($fontName);
+            $array = $heights[$fontName];
+            foreach ($array as $points => $array2) {
+                $font->setSize($points);
+                $height = $array2['height'];
+                self::assertEquals($height, Font::getDefaultRowHeightByFont($font), "$fontName $points points");
+            }
+        }
+        $heightArial10 = $heights['Arial'][10]['height'];
+        $fontName = 'Arial';
+        $points = 20;
+        $font->setName($fontName);
+        $font->setSize($points);
+        self::assertEquals(2 * $heightArial10, Font::getDefaultRowHeightByFont($font), "$fontName $points points");
+        $heightVerdana10 = $heights['Verdana'][10]['height'];
+        $fontName = 'Verdana';
+        $points = 30;
+        $font->setName($fontName);
+        $font->setSize($points);
+        self::assertEquals(3 * $heightVerdana10, Font::getDefaultRowHeightByFont($font), "$fontName $points points");
+        $heightCalibri11 = $heights['Calibri'][11]['height'];
+        $fontName = 'Calibri';
+        $points = 22;
+        $font->setName($fontName);
+        $font->setSize($points);
+        self::assertEquals(2 * $heightCalibri11, Font::getDefaultRowHeightByFont($font), "$fontName $points points");
+        $fontName = 'unknown';
+        $points = 33;
+        $font->setName($fontName);
+        $font->setSize($points);
+        self::assertEquals(3 * $heightCalibri11, Font::getDefaultRowHeightByFont($font), "$fontName $points points");
+    }
+
+    public function testGetTrueTypeFontFileFromFont(): void
+    {
+        $fileNames = Font::FONT_FILE_NAMES;
+        $font = new StyleFont();
+        foreach ($fileNames as $fontName => $fontNameArray) {
+            $font->setName($fontName);
+            $font->setBold(false);
+            $font->setItalic(false);
+            self::assertSame($fileNames[$fontName]['x'], Font::getTrueTypeFontFileFromFont($font, false), "$fontName not bold not italic");
+            $font->setBold(true);
+            $font->setItalic(false);
+            self::assertSame($fileNames[$fontName]['xb'], Font::getTrueTypeFontFileFromFont($font, false), "$fontName bold not italic");
+            $font->setBold(false);
+            $font->setItalic(true);
+            self::assertSame($fileNames[$fontName]['xi'], Font::getTrueTypeFontFileFromFont($font, false), "$fontName not bold italic");
+            $font->setBold(true);
+            $font->setItalic(true);
+            self::assertSame($fileNames[$fontName]['xbi'], Font::getTrueTypeFontFileFromFont($font, false), "$fontName bold italic");
+        }
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Shared/Font3Test.php b/tests/PhpSpreadsheetTests/Shared/Font3Test.php
new file mode 100644
index 00000000..e91e7acf
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Shared/Font3Test.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Shared;
+
+use PhpOffice\PhpSpreadsheet\Exception as SSException;
+use PhpOffice\PhpSpreadsheet\Shared\Font;
+use PhpOffice\PhpSpreadsheet\Style\Font as StyleFont;
+use PHPUnit\Framework\TestCase;
+
+class Font3Test extends TestCase
+{
+    /** @var string */
+    private $holdDirectory;
+
+    protected function setUp(): void
+    {
+        $this->holdDirectory = Font::getTrueTypeFontPath();
+    }
+
+    protected function tearDown(): void
+    {
+        Font::setTrueTypeFontPath($this->holdDirectory);
+    }
+
+    public function testGetTrueTypeException1(): void
+    {
+        $this->expectException(SSException::class);
+        $this->expectExceptionMessage('Valid directory to TrueType Font files not specified');
+        $font = new StyleFont();
+        $font->setName('unknown');
+        Font::getTrueTypeFontFileFromFont($font);
+    }
+
+    public function testGetTrueTypeException2(): void
+    {
+        Font::setTrueTypeFontPath(__DIR__);
+        $this->expectException(SSException::class);
+        $this->expectExceptionMessage('Unknown font name');
+        $font = new StyleFont();
+        $font->setName('unknown');
+        Font::getTrueTypeFontFileFromFont($font);
+    }
+
+    public function testGetTrueTypeException3(): void
+    {
+        Font::setTrueTypeFontPath(__DIR__);
+        $this->expectException(SSException::class);
+        $this->expectExceptionMessage('TrueType Font file not found');
+        $font = new StyleFont();
+        $font->setName('Calibri');
+        Font::getTrueTypeFontFileFromFont($font);
+    }
+}

From 290d0731fe7c9508b9226c0e502a4768eee646b1 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Sat, 30 Jul 2022 10:27:31 +0200
Subject: [PATCH 08/69] Allow multiple delimiters for `TEXTBEFORE()` and
 `TEXTAFTER()` functions

---
 .../Calculation/TextData/Extract.php          | 48 ++++++++++++++-----
 .../Functions/TextData/TextAfterTest.php      | 23 ++-------
 .../Functions/TextData/TextBeforeTest.php     |  7 ++-
 tests/data/Calculation/TextData/TEXTAFTER.php | 36 ++++++++++++++
 .../data/Calculation/TextData/TEXTBEFORE.php  | 36 ++++++++++++++
 5 files changed, 119 insertions(+), 31 deletions(-)

diff --git a/src/PhpSpreadsheet/Calculation/TextData/Extract.php b/src/PhpSpreadsheet/Calculation/TextData/Extract.php
index 1a9e84db..ee7e31b7 100644
--- a/src/PhpSpreadsheet/Calculation/TextData/Extract.php
+++ b/src/PhpSpreadsheet/Calculation/TextData/Extract.php
@@ -104,7 +104,8 @@ class Extract
      *
      * @param mixed $text the text that you're searching
      *                    Or can be an array of values
-     * @param ?string $delimiter the text that marks the point before which you want to extract
+     * @param null|array|string $delimiter the text that marks the point before which you want to extract
+     *                                 Multiple delimiters can be passed as an array of string values
      * @param mixed $instance The instance of the delimiter after which you want to extract the text.
      *                            By default, this is the first instance (1).
      *                            A negative value means start searching from the end of the text string.
@@ -132,7 +133,6 @@ class Extract
         }
 
         $text = Helpers::extractString($text ?? '');
-        $delimiter = Helpers::extractString(Functions::flattenSingleValue($delimiter ?? ''));
         $instance = (int) $instance;
         $matchMode = (int) $matchMode;
         $matchEnd = (int) $matchEnd;
@@ -141,13 +141,14 @@ class Extract
         if (is_array($split) === false) {
             return $split;
         }
-        if ($delimiter === '') {
+        if (Helpers::extractString(Functions::flattenSingleValue($delimiter ?? '')) === '') {
             return ($instance > 0) ? '' : $text;
         }
 
         // Adjustment for a match as the first element of the split
         $flags = self::matchFlags($matchMode);
-        $adjust = preg_match('/^' . preg_quote($delimiter) . "\$/{$flags}", $split[0]);
+        $delimiter = self::buildDelimiter($delimiter);
+        $adjust = preg_match('/^' . $delimiter . "\$/{$flags}", $split[0]);
         $oddReverseAdjustment = count($split) % 2;
 
         $split = ($instance < 0)
@@ -161,7 +162,8 @@ class Extract
      * TEXTAFTER.
      *
      * @param mixed $text the text that you're searching
-     * @param ?string $delimiter the text that marks the point before which you want to extract
+     * @param null|array|string $delimiter the text that marks the point before which you want to extract
+     *                                 Multiple delimiters can be passed as an array of string values
      * @param mixed $instance The instance of the delimiter after which you want to extract the text.
      *                          By default, this is the first instance (1).
      *                          A negative value means start searching from the end of the text string.
@@ -189,7 +191,6 @@ class Extract
         }
 
         $text = Helpers::extractString($text ?? '');
-        $delimiter = Helpers::extractString(Functions::flattenSingleValue($delimiter ?? ''));
         $instance = (int) $instance;
         $matchMode = (int) $matchMode;
         $matchEnd = (int) $matchEnd;
@@ -198,13 +199,14 @@ class Extract
         if (is_array($split) === false) {
             return $split;
         }
-        if ($delimiter === '') {
+        if (Helpers::extractString(Functions::flattenSingleValue($delimiter ?? '')) === '') {
             return ($instance < 0) ? '' : $text;
         }
 
         // Adjustment for a match as the first element of the split
         $flags = self::matchFlags($matchMode);
-        $adjust = preg_match('/^' . preg_quote($delimiter) . "\$/{$flags}", $split[0]);
+        $delimiter = self::buildDelimiter($delimiter);
+        $adjust = preg_match('/^' . $delimiter . "\$/{$flags}", $split[0]);
         $oddReverseAdjustment = count($split) % 2;
 
         $split = ($instance < 0)
@@ -215,21 +217,23 @@ class Extract
     }
 
     /**
+     * @param null|array|string $delimiter
      * @param int $matchMode
      * @param int $matchEnd
      * @param mixed $ifNotFound
      *
      * @return string|string[]
      */
-    private static function validateTextBeforeAfter(string $text, string $delimiter, int $instance, $matchMode, $matchEnd, $ifNotFound)
+    private static function validateTextBeforeAfter(string $text, $delimiter, int $instance, $matchMode, $matchEnd, $ifNotFound)
     {
         $flags = self::matchFlags($matchMode);
+        $delimiter = self::buildDelimiter($delimiter);
 
-        if (preg_match('/' . preg_quote($delimiter) . "/{$flags}", $text) === 0 && $matchEnd === 0) {
+        if (preg_match('/' . $delimiter . "/{$flags}", $text) === 0 && $matchEnd === 0) {
             return $ifNotFound;
         }
 
-        $split = preg_split('/(' . preg_quote($delimiter) . ")/{$flags}", $text, 0, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
+        $split = preg_split('/' . $delimiter . "/{$flags}", $text, 0, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
         if ($split === false) {
             return ExcelError::NA();
         }
@@ -247,6 +251,28 @@ class Extract
         return $split;
     }
 
+    /**
+     * @param null|array|string $delimiter the text that marks the point before which you want to extract
+     *                                 Multiple delimiters can be passed as an array of string values
+     */
+    private static function buildDelimiter($delimiter): string
+    {
+        if (is_array($delimiter)) {
+            $delimiter = Functions::flattenArray($delimiter);
+            $quotedDelimiters = array_map(
+                function ($delimiter) {
+                    return preg_quote($delimiter ?? '');
+                },
+                $delimiter
+            );
+            $delimiters = implode('|', $quotedDelimiters);
+
+            return '(' . $delimiters . ')';
+        }
+
+        return '(' . preg_quote($delimiter ?? '') . ')';
+    }
+
     private static function matchFlags(int $matchMode): string
     {
         return ($matchMode === 0) ? 'mu' : 'miu';
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextAfterTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextAfterTest.php
index b3b01d24..00483260 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextAfterTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextAfterTest.php
@@ -2,8 +2,6 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\TextData;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
-
 class TextAfterTest extends AllSetupTeardown
 {
     /**
@@ -14,14 +12,17 @@ class TextAfterTest extends AllSetupTeardown
         $text = $arguments[0];
         $delimiter = $arguments[1];
 
-        $args = 'A1, A2';
+        $args = (is_array($delimiter)) ? 'A1, {A2,A3}' : 'A1, A2';
         $args .= (isset($arguments[2])) ? ", {$arguments[2]}" : ',';
         $args .= (isset($arguments[3])) ? ", {$arguments[3]}" : ',';
         $args .= (isset($arguments[4])) ? ", {$arguments[4]}" : ',';
 
         $worksheet = $this->getSheet();
         $worksheet->getCell('A1')->setValue($text);
-        $worksheet->getCell('A2')->setValue($delimiter);
+        $worksheet->getCell('A2')->setValue((is_array($delimiter)) ? $delimiter[0] : $delimiter);
+        if (is_array($delimiter)) {
+            $worksheet->getCell('A3')->setValue($delimiter[1]);
+        }
         $worksheet->getCell('B1')->setValue("=TEXTAFTER({$args})");
 
         $result = $worksheet->getCell('B1')->getCalculatedValue();
@@ -32,18 +33,4 @@ class TextAfterTest extends AllSetupTeardown
     {
         return require 'tests/data/Calculation/TextData/TEXTAFTER.php';
     }
-
-    public function testTextAfterWithArray(): void
-    {
-        $calculation = Calculation::getInstance();
-
-        $text = "Red Riding Hood's red riding hood";
-        $delimiter = 'red';
-
-        $args = "\"{$text}\", \"{$delimiter}\", 1, {0;1}";
-
-        $formula = "=TEXTAFTER({$args})";
-        $result = $calculation->_calculateFormulaValue($formula);
-        self::assertEquals([[' riding hood'], [" Riding Hood's red riding hood"]], $result);
-    }
 }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextBeforeTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextBeforeTest.php
index 17938b5e..37e46636 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextBeforeTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextBeforeTest.php
@@ -12,14 +12,17 @@ class TextBeforeTest extends AllSetupTeardown
         $text = $arguments[0];
         $delimiter = $arguments[1];
 
-        $args = 'A1, A2';
+        $args = (is_array($delimiter)) ? 'A1, {A2,A3}' : 'A1, A2';
         $args .= (isset($arguments[2])) ? ", {$arguments[2]}" : ',';
         $args .= (isset($arguments[3])) ? ", {$arguments[3]}" : ',';
         $args .= (isset($arguments[4])) ? ", {$arguments[4]}" : ',';
 
         $worksheet = $this->getSheet();
         $worksheet->getCell('A1')->setValue($text);
-        $worksheet->getCell('A2')->setValue($delimiter);
+        $worksheet->getCell('A2')->setValue((is_array($delimiter)) ? $delimiter[0] : $delimiter);
+        if (is_array($delimiter)) {
+            $worksheet->getCell('A3')->setValue($delimiter[1]);
+        }
         $worksheet->getCell('B1')->setValue("=TEXTBEFORE({$args})");
 
         $result = $worksheet->getCell('B1')->getCalculatedValue();
diff --git a/tests/data/Calculation/TextData/TEXTAFTER.php b/tests/data/Calculation/TextData/TEXTAFTER.php
index c594ecdc..ebcfecb9 100644
--- a/tests/data/Calculation/TextData/TEXTAFTER.php
+++ b/tests/data/Calculation/TextData/TEXTAFTER.php
@@ -212,4 +212,40 @@ return [
             1,
         ],
     ],
+    'Multi-delimiter Case-Insensitive Offset 1' => [
+        " riding hood's red riding hood",
+        [
+            "Little Red riding hood's red riding hood",
+            ['HOOD', 'RED'],
+            1,
+            1,
+        ],
+    ],
+    'Multi-delimiter Case-Insensitive Offset 2' => [
+        "'s red riding hood",
+        [
+            "Little Red riding hood's red riding hood",
+            ['HOOD', 'RED'],
+            2,
+            1,
+        ],
+    ],
+    'Multi-delimiter Case-Insensitive Offset 3' => [
+        ' riding hood',
+        [
+            "Little Red riding hood's red riding hood",
+            ['HOOD', 'RED'],
+            3,
+            1,
+        ],
+    ],
+    'Multi-delimiter Case-Insensitive Offset -2' => [
+        ' riding hood',
+        [
+            "Little Red riding hood's red riding hood",
+            ['HOOD', 'RED'],
+            -2,
+            1,
+        ],
+    ],
 ];
diff --git a/tests/data/Calculation/TextData/TEXTBEFORE.php b/tests/data/Calculation/TextData/TEXTBEFORE.php
index f94d5f28..1929354c 100644
--- a/tests/data/Calculation/TextData/TEXTBEFORE.php
+++ b/tests/data/Calculation/TextData/TEXTBEFORE.php
@@ -204,4 +204,40 @@ return [
             1,
         ],
     ],
+    'Multi-delimiter Case-Insensitive Offset 1' => [
+        'Little ',
+        [
+            "Little Red riding hood's red riding hood",
+            ['HOOD', 'RED'],
+            1,
+            1,
+        ],
+    ],
+    'Multi-delimiter Case-Insensitive Offset 2' => [
+        'Little Red riding ',
+        [
+            "Little Red riding hood's red riding hood",
+            ['HOOD', 'RED'],
+            2,
+            1,
+        ],
+    ],
+    'Multi-delimiter Case-Insensitive Offset 3' => [
+        "Little Red riding hood's ",
+        [
+            "Little Red riding hood's red riding hood",
+            ['HOOD', 'RED'],
+            3,
+            1,
+        ],
+    ],
+    'Multi-delimiter Case-Insensitive Offset -2' => [
+        "Little Red riding hood's ",
+        [
+            "Little Red riding hood's red riding hood",
+            ['HOOD', 'RED'],
+            -2,
+            1,
+        ],
+    ],
 ];

From db2bc3b28913d33fb762f7ca543e5b2d84b7b398 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 06:03:17 -0700
Subject: [PATCH 09/69] Bump phpstan/phpstan from 1.8.0 to 1.8.2 (#2977)

Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.8.0 to 1.8.2.
- [Release notes](https://github.com/phpstan/phpstan/releases)
- [Changelog](https://github.com/phpstan/phpstan/blob/1.8.x/CHANGELOG.md)
- [Commits](https://github.com/phpstan/phpstan/compare/1.8.0...1.8.2)

---
updated-dependencies:
- dependency-name: phpstan/phpstan
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 composer.lock | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/composer.lock b/composer.lock
index 4ac9f631..3f82754d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -763,12 +763,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/composer-installer.git",
-                "reference": "04f4e8f6716241cb9200774ff73cb99fbb81e09a"
+                "reference": "231b4e82eee01f16537c8ac3fce31c1f83320c80"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/composer-installer/zipball/04f4e8f6716241cb9200774ff73cb99fbb81e09a",
-                "reference": "04f4e8f6716241cb9200774ff73cb99fbb81e09a",
+                "url": "https://api.github.com/repos/PHPCSStandards/composer-installer/zipball/231b4e82eee01f16537c8ac3fce31c1f83320c80",
+                "reference": "231b4e82eee01f16537c8ac3fce31c1f83320c80",
                 "shasum": ""
             },
             "require": {
@@ -829,7 +829,7 @@
                 "stylecheck",
                 "tests"
             ],
-            "time": "2022-06-26T10:27:07+00:00"
+            "time": "2022-07-26T12:51:47+00:00"
         },
         {
             "name": "doctrine/annotations",
@@ -2076,16 +2076,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.8.0",
+            "version": "1.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "b7648d4ee9321665acaf112e49da9fd93df8fbd5"
+                "reference": "c53312ecc575caf07b0e90dee43883fdf90ca67c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b7648d4ee9321665acaf112e49da9fd93df8fbd5",
-                "reference": "b7648d4ee9321665acaf112e49da9fd93df8fbd5",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c53312ecc575caf07b0e90dee43883fdf90ca67c",
+                "reference": "c53312ecc575caf07b0e90dee43883fdf90ca67c",
                 "shasum": ""
             },
             "require": {
@@ -2127,7 +2127,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-06-29T08:53:31+00:00"
+            "time": "2022-07-20T09:57:31+00:00"
         },
         {
             "name": "phpstan/phpstan-phpunit",

From 07f4fbe39629ce5c5d3a1c936e4e1b7d65ce9cb5 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Fri, 29 Jul 2022 18:33:12 +0200
Subject: [PATCH 10/69] Initial implementation of the `TEXTSPLIT()` Excel
 Function

---
 CHANGELOG.md                                  |   2 +-
 .../Calculation/Calculation.php               |   5 +-
 .../Calculation/TextData/Text.php             | 130 ++++++++++++++++++
 src/PhpSpreadsheet/Writer/Xlsx/Xlfn.php       |   1 +
 .../Functions/TextData/TextSplitTest.php      |  60 ++++++++
 tests/data/Calculation/TextData/TEXTSPLIT.php | 107 ++++++++++++++
 6 files changed, 301 insertions(+), 4 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextSplitTest.php
 create mode 100644 tests/data/Calculation/TextData/TEXTSPLIT.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 206892ad..017e31ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Added
 
-- Implementation of the `TEXTBEFORE()` and `TEXTAFTER()` Excel Functions
+- Implementation of the new `TEXTBEFORE()`, `TEXTAFTER()` and `TEXTSPLIT()` Excel Functions
 
 ### Changed
 
diff --git a/src/PhpSpreadsheet/Calculation/Calculation.php b/src/PhpSpreadsheet/Calculation/Calculation.php
index b73c7eaa..13f38f66 100644
--- a/src/PhpSpreadsheet/Calculation/Calculation.php
+++ b/src/PhpSpreadsheet/Calculation/Calculation.php
@@ -7,7 +7,6 @@ use PhpOffice\PhpSpreadsheet\Calculation\Engine\CyclicReferenceStack;
 use PhpOffice\PhpSpreadsheet\Calculation\Engine\Logger;
 use PhpOffice\PhpSpreadsheet\Calculation\Information\ErrorValue;
 use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
-use PhpOffice\PhpSpreadsheet\Calculation\Information\Value;
 use PhpOffice\PhpSpreadsheet\Calculation\Token\Stack;
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
@@ -2505,8 +2504,8 @@ class Calculation
         ],
         'TEXTSPLIT' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [Functions::class, 'DUMMY'],
-            'argumentCount' => '2-5',
+            'functionCall' => [TextData\Text::class, 'split'],
+            'argumentCount' => '2-6',
         ],
         'THAIDAYOFWEEK' => [
             'category' => Category::CATEGORY_DATE_AND_TIME,
diff --git a/src/PhpSpreadsheet/Calculation/TextData/Text.php b/src/PhpSpreadsheet/Calculation/TextData/Text.php
index 490c43c2..bd533f20 100644
--- a/src/PhpSpreadsheet/Calculation/TextData/Text.php
+++ b/src/PhpSpreadsheet/Calculation/TextData/Text.php
@@ -3,6 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\TextData;
 
 use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 
 class Text
 {
@@ -77,4 +78,133 @@ class Text
 
         return null;
     }
+
+    /**
+     * TEXTSPLIT.
+     *
+     * @param mixed $text the text that you're searching
+     * @param null|array|string $columnDelimiter The text that marks the point where to spill the text across columns.
+     *                          Multiple delimiters can be passed as an array of string values
+     * @param null|array|string $rowDelimiter The text that marks the point where to spill the text down rows.
+     *                          Multiple delimiters can be passed as an array of string values
+     * @param bool $ignoreEmpty Specify FALSE to create an empty cell when two delimiters are consecutive.
+     *                              true = create empty cells
+     *                              false = skip empty cells
+     *                              Defaults to TRUE, which creates an empty cell
+     * @param bool $matchMode Determines whether the match is case-sensitive or not.
+     *                              true = case-sensitive
+     *                              false = case-insensitive
+     *                         By default, a case-sensitive match is done.
+     * @param mixed $padding The value with which to pad the result.
+     *                              The default is #N/A.
+     *
+     * @return array the array built from the text, split by the row and column delimiters
+     */
+    public static function split($text, $columnDelimiter = null, $rowDelimiter = null, bool $ignoreEmpty = false, bool $matchMode = true, $padding = '#N/A')
+    {
+        $text = Functions::flattenSingleValue($text);
+
+        $flags = self::matchFlags($matchMode);
+
+        if ($rowDelimiter !== null) {
+            $delimiter = self::buildDelimiter($rowDelimiter);
+            $rows = ($delimiter === '()')
+                ? [$text]
+                : preg_split("/{$delimiter}/{$flags}", $text);
+        } else {
+            $rows = [$text];
+        }
+
+        /** @var array $rows */
+        if ($ignoreEmpty === true) {
+            $rows = array_values(array_filter(
+                $rows,
+                function ($row) {
+                    return $row !== '';
+                }
+            ));
+        }
+
+        if ($columnDelimiter !== null) {
+            $delimiter = self::buildDelimiter($columnDelimiter);
+            array_walk(
+                $rows,
+                function (&$row) use ($delimiter, $flags, $ignoreEmpty): void {
+                    $row = ($delimiter === '()')
+                        ? [$row]
+                        : preg_split("/{$delimiter}/{$flags}", $row);
+                    /** @var array $row */
+                    if ($ignoreEmpty === true) {
+                        $row = array_values(array_filter(
+                            $row,
+                            function ($value) {
+                                return $value !== '';
+                            }
+                        ));
+                    }
+                }
+            );
+            if ($ignoreEmpty === true) {
+                $rows = array_values(array_filter(
+                    $rows,
+                    function ($row) {
+                        return $row !== [] && $row !== [''];
+                    }
+                ));
+            }
+        }
+
+        return self::applyPadding($rows, $padding);
+    }
+
+    /**
+     * @param mixed $padding
+     */
+    private static function applyPadding(array $rows, $padding): array
+    {
+        $columnCount = array_reduce(
+            $rows,
+            function (int $counter, array $row): int {
+                return max($counter, count($row));
+            },
+            0
+        );
+
+        return array_map(
+            function (array $row) use ($columnCount, $padding): array {
+                return (count($row) < $columnCount)
+                    ? array_merge($row, array_fill(0, $columnCount - count($row), $padding))
+                    : $row;
+            },
+            $rows
+        );
+    }
+
+    /**
+     * @param null|array|string $delimiter the text that marks the point before which you want to split
+     *                                 Multiple delimiters can be passed as an array of string values
+     */
+    private static function buildDelimiter($delimiter): string
+    {
+        $valueSet = Functions::flattenArray($delimiter);
+
+        if (is_array($delimiter) && count($valueSet) > 1) {
+            $quotedDelimiters = array_map(
+                function ($delimiter) {
+                    return preg_quote($delimiter ?? '');
+                },
+                $valueSet
+            );
+            $delimiters = implode('|', $quotedDelimiters);
+
+            return '(' . $delimiters . ')';
+        }
+
+        return '(' . preg_quote(Functions::flattenSingleValue($delimiter)) . ')';
+    }
+
+    private static function matchFlags(bool $matchMode): string
+    {
+        return ($matchMode === true) ? 'miu' : 'mu';
+    }
 }
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Xlfn.php b/src/PhpSpreadsheet/Writer/Xlsx/Xlfn.php
index b623c573..a1bdf96a 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/Xlfn.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/Xlfn.php
@@ -146,6 +146,7 @@ class Xlfn
         . '|register[.]id'
         . '|textafter'
         . '|textbefore'
+        . '|textsplit'
         . '|valuetotext'
         . ')(?=\\s*[(])/i';
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextSplitTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextSplitTest.php
new file mode 100644
index 00000000..e0fec8b9
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextSplitTest.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\TextData;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class TextSplitTest extends AllSetupTeardown
+{
+    private function setDelimiterArgument(array $argument, string $column): string
+    {
+        return '{' . $column . implode(',' . $column, range(1, count($argument))) . '}';
+    }
+
+    /**
+     * @param array|string $argument
+     */
+    private function setDelimiterValues(Worksheet $worksheet, string $column, $argument): void
+    {
+        if (is_array($argument)) {
+            foreach ($argument as $index => $value) {
+                ++$index;
+                $worksheet->getCell("{$column}{$index}")->setValue($value);
+            }
+        } else {
+            $worksheet->getCell("{$column}1")->setValue($argument);
+        }
+    }
+
+    /**
+     * @dataProvider providerTEXTSPLIT
+     */
+    public function testTextSplit(array $expectedResult, array $arguments): void
+    {
+        $text = $arguments[0];
+        $columnDelimiter = $arguments[1];
+        $rowDelimiter = $arguments[2];
+
+        $args = 'A1';
+        $args .= (is_array($columnDelimiter)) ? ', ' . $this->setDelimiterArgument($columnDelimiter, 'B') : ', B1';
+        $args .= (is_array($rowDelimiter)) ? ', ' . $this->setDelimiterArgument($rowDelimiter, 'C') : ', C1';
+        $args .= (isset($arguments[3])) ? ", {$arguments[3]}" : ',';
+        $args .= (isset($arguments[4])) ? ", {$arguments[4]}" : ',';
+        $args .= (isset($arguments[5])) ? ", {$arguments[5]}" : ',';
+
+        $worksheet = $this->getSheet();
+        $worksheet->getCell('A1')->setValue($text);
+        $this->setDelimiterValues($worksheet, 'B', $columnDelimiter);
+        $this->setDelimiterValues($worksheet, 'C', $rowDelimiter);
+        $worksheet->getCell('H1')->setValue("=TEXTSPLIT({$args})");
+
+        $result = Calculation::getInstance($this->getSpreadsheet())->calculateCellValue($worksheet->getCell('H1'));
+        self::assertSame($expectedResult, $result);
+    }
+
+    public function providerTEXTSPLIT(): array
+    {
+        return require 'tests/data/Calculation/TextData/TEXTSPLIT.php';
+    }
+}
diff --git a/tests/data/Calculation/TextData/TEXTSPLIT.php b/tests/data/Calculation/TextData/TEXTSPLIT.php
new file mode 100644
index 00000000..64016ca7
--- /dev/null
+++ b/tests/data/Calculation/TextData/TEXTSPLIT.php
@@ -0,0 +1,107 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+
+return [
+    [
+        [['Hello', 'World']],
+        [
+            'Hello World',
+            ' ',
+            '',
+        ],
+    ],
+    [
+        [['Hello'], ['World']],
+        [
+            'Hello World',
+            '',
+            ' ',
+        ],
+    ],
+    [
+        [['To', 'be', 'or', 'not', 'to', 'be']],
+        [
+            'To be or not to be',
+            ' ',
+            '',
+        ],
+    ],
+    [
+        [
+            ['1', '2', '3'],
+            ['4', '5', '6'],
+        ],
+        [
+            '1,2,3;4,5,6',
+            ',',
+            ';',
+        ],
+    ],
+    [
+        [
+            ['Do', ' Or do not', ' There is no try', ' ', 'Anonymous'],
+        ],
+        [
+            'Do. Or do not. There is no try. -Anonymous',
+            ['.', '-'],
+            '',
+        ],
+    ],
+    [
+        [['Do'], [' Or do not'], [' There is no try'], [' '], ['Anonymous']],
+        [
+            'Do. Or do not. There is no try. -Anonymous',
+            '',
+            ['.', '-'],
+        ],
+    ],
+    [
+        [
+            ['Do', ' Or do not', ' There is no try', ' '],
+            ['Anonymous', ExcelError::NA(), ExcelError::NA(), ExcelError::NA()],
+        ],
+        [
+            'Do. Or do not. There is no try. -Anonymous',
+            '.',
+            '-',
+        ],
+    ],
+    [
+        [
+            ['', '', '1'],
+            ['', '', ExcelError::NA()],
+            ['', '2', ''],
+            ['3', ExcelError::NA(), ExcelError::NA()],
+            ['', ExcelError::NA(), ExcelError::NA()],
+            ['', '4', ExcelError::NA()],
+        ],
+        [
+            '--1|-|-2-|3||-4',
+            '-',
+            '|',
+        ],
+    ],
+    [
+        [
+            ['1'],
+            ['2'],
+            ['3'],
+            ['4'],
+        ],
+        [
+            '--1|-|-2-|3||-4',
+            '-',
+            '|',
+            true,
+        ],
+    ],
+    [
+        [['', 'BCD', 'FGH', 'JKLMN', 'PQRST', 'VWXYZ']],
+        [
+            'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
+            ['A', 'E', 'I', 'O', 'U'],
+            '',
+        ],
+    ],
+];

From 06d2682c5bdfe38c1cfa0d75d47d95e11e030454 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Wed, 3 Aug 2022 12:43:38 +0200
Subject: [PATCH 11/69] Documentation markdown fix

---
 README.md     | 2 +-
 docs/index.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 57560702..b292715e 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ composer require phpoffice/phpspreadsheet
 ```
 
 If you are building your installation on a development machine that is on a different PHP version to the server where it will be deployed, or if your PHP CLI version is not the same as your run-time such as `php-fpm` or Apache's `mod_php`, then you might want to add the following to your `composer.json` before installing:
-```json lines
+```json
 {
     "require": {
         "phpoffice/phpspreadsheet": "^1.23"
diff --git a/docs/index.md b/docs/index.md
index ff137c26..63d71655 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -53,7 +53,7 @@ composer require phpoffice/phpspreadsheet --prefer-source
 ```
 
 If you are building your installation on a development machine that is on a different PHP version to the server where it will be deployed, or if your PHP CLI version is not the same as your run-time such as `php-fpm` or Apache's `mod_php`, then you might want to add the following to your `composer.json` before installing:
-```json lines
+```json
 {
     "require": {
         "phpoffice/phpspreadsheet": "^1.23"

From f331bca470297059dbc522183846c87a33db5dba Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Thu, 4 Aug 2022 14:38:35 +0200
Subject: [PATCH 12/69] cellExists() and getCell() methods should support UTF-8
 named cells

---
 CHANGELOG.md                                  |   1 +
 src/PhpSpreadsheet/Worksheet/Worksheet.php    |   2 +-
 .../Worksheet/WorksheetNamedRangesTest.php    |  18 ++++++++++++++++++
 tests/data/Worksheet/namedRangeTest.xlsx      | Bin 9812 -> 10267 bytes
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 017e31ed..71b131c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 ### Fixed
 
 - Fully flatten an array [Issue #2955](https://github.com/PHPOffice/PhpSpreadsheet/issues/2955) [PR #2956](https://github.com/PHPOffice/PhpSpreadsheet/pull/2956)
+- cellExists() and getCell() methods should support UTF-8 named cells [Issue #2987](https://github.com/PHPOffice/PhpSpreadsheet/issues/2987) [PR #2988](https://github.com/PHPOffice/PhpSpreadsheet/pull/2988)
 
 ## 1.24.1 - 2022-07-18
 
diff --git a/src/PhpSpreadsheet/Worksheet/Worksheet.php b/src/PhpSpreadsheet/Worksheet/Worksheet.php
index 45111f3c..e89043c8 100644
--- a/src/PhpSpreadsheet/Worksheet/Worksheet.php
+++ b/src/PhpSpreadsheet/Worksheet/Worksheet.php
@@ -1265,7 +1265,7 @@ class Worksheet implements IComparable
             }
         } elseif (
             !preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $coordinate) &&
-            preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/i', $coordinate)
+            preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/iu', $coordinate)
         ) {
             // Named range?
             $namedRange = $this->validateNamedRange($coordinate, true);
diff --git a/tests/PhpSpreadsheetTests/Worksheet/WorksheetNamedRangesTest.php b/tests/PhpSpreadsheetTests/Worksheet/WorksheetNamedRangesTest.php
index b367583b..506e753c 100644
--- a/tests/PhpSpreadsheetTests/Worksheet/WorksheetNamedRangesTest.php
+++ b/tests/PhpSpreadsheetTests/Worksheet/WorksheetNamedRangesTest.php
@@ -29,6 +29,15 @@ class WorksheetNamedRangesTest extends TestCase
         self::assertTrue($cellExists);
     }
 
+    public function testCellExistsUtf8(): void
+    {
+        $namedCell = 'Χαιρετισμός';
+
+        $worksheet = $this->spreadsheet->getActiveSheet();
+        $cellExists = $worksheet->cellExists($namedCell);
+        self::assertTrue($cellExists);
+    }
+
     public function testCellNotExists(): void
     {
         $namedCell = 'GOODBYE';
@@ -67,6 +76,15 @@ class WorksheetNamedRangesTest extends TestCase
         self::assertSame('Hello', $cell->getValue());
     }
 
+    public function testGetCellUtf8(): void
+    {
+        $namedCell = 'Χαιρετισμός';
+
+        $worksheet = $this->spreadsheet->getActiveSheet();
+        $cell = $worksheet->getCell($namedCell);
+        self::assertSame('नमस्ते', $cell->getValue());
+    }
+
     public function testGetCellNotExists(): void
     {
         $namedCell = 'GOODBYE';
diff --git a/tests/data/Worksheet/namedRangeTest.xlsx b/tests/data/Worksheet/namedRangeTest.xlsx
index a4383bb0b1b6839889a3f7725ade8214db118e8c..b0936a5a1ee4deebb09dd33fe779f5d6e278e4e1 100644
GIT binary patch
delta 3842
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
JN&x+R`X4`Q0$Tt8

delta 3355
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


From 4724c8f7e96ccfcf6d20360ead93dda81ee3b978 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Thu, 4 Aug 2022 14:05:18 +0200
Subject: [PATCH 13/69] Initial work on the ARRAYTOTEXT() Excel Function

---
 CHANGELOG.md                                  |  1 +
 .../Calculation/Calculation.php               |  4 +-
 .../Calculation/TextData/Text.php             | 44 +++++++++++++++++++
 .../Functions/TextData/ArrayToTextTest.php    | 24 ++++++++++
 .../data/Calculation/TextData/ARRAYTOTEXT.php | 26 +++++++++++
 5 files changed, 97 insertions(+), 2 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ArrayToTextTest.php
 create mode 100644 tests/data/Calculation/TextData/ARRAYTOTEXT.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 017e31ed..38c1b6b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 ### Added
 
 - Implementation of the new `TEXTBEFORE()`, `TEXTAFTER()` and `TEXTSPLIT()` Excel Functions
+- Implementation of the `ARRAYTOTEXT()` Excel Function
 
 ### Changed
 
diff --git a/src/PhpSpreadsheet/Calculation/Calculation.php b/src/PhpSpreadsheet/Calculation/Calculation.php
index 13f38f66..cf93a694 100644
--- a/src/PhpSpreadsheet/Calculation/Calculation.php
+++ b/src/PhpSpreadsheet/Calculation/Calculation.php
@@ -304,8 +304,8 @@ class Calculation
         ],
         'ARRAYTOTEXT' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [Functions::class, 'DUMMY'],
-            'argumentCount' => '?',
+            'functionCall' => [TextData\Text::class, 'fromArray'],
+            'argumentCount' => '1,2',
         ],
         'ASC' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
diff --git a/src/PhpSpreadsheet/Calculation/TextData/Text.php b/src/PhpSpreadsheet/Calculation/TextData/Text.php
index bd533f20..83810422 100644
--- a/src/PhpSpreadsheet/Calculation/TextData/Text.php
+++ b/src/PhpSpreadsheet/Calculation/TextData/Text.php
@@ -3,6 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet\Calculation\TextData;
 
 use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 
 class Text
@@ -207,4 +208,47 @@ class Text
     {
         return ($matchMode === true) ? 'miu' : 'mu';
     }
+
+    public static function fromArray(array $array, int $format = 0): string
+    {
+        $result = [];
+        foreach ($array as $row) {
+            $cells = [];
+            foreach ($row as $cellValue) {
+                $value = ($format === 1) ? self::formatValueMode1($cellValue) : self::formatValueMode0($cellValue);
+                $cells[] = $value;
+            }
+            $result[] = implode(($format === 1) ? ',' : ', ', $cells);
+        }
+
+        $result = implode(($format === 1) ? ';' : ', ', $result);
+
+        return ($format === 1) ? '{' . $result . '}' : $result;
+    }
+
+    /**
+     * @param mixed $cellValue
+     */
+    private static function formatValueMode0($cellValue): string
+    {
+        if (is_bool($cellValue)) {
+            return ($cellValue) ? Calculation::$localeBoolean['TRUE'] : Calculation::$localeBoolean['FALSE'];
+        }
+
+        return (string) $cellValue;
+    }
+
+    /**
+     * @param mixed $cellValue
+     */
+    private static function formatValueMode1($cellValue): string
+    {
+        if (is_string($cellValue) && Functions::isError($cellValue) === false) {
+            return Calculation::FORMULA_STRING_QUOTE . $cellValue . Calculation::FORMULA_STRING_QUOTE;
+        } elseif (is_bool($cellValue)) {
+            return ($cellValue) ? Calculation::$localeBoolean['TRUE'] : Calculation::$localeBoolean['FALSE'];
+        }
+
+        return (string) $cellValue;
+    }
 }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ArrayToTextTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ArrayToTextTest.php
new file mode 100644
index 00000000..81fa5a53
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ArrayToTextTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\TextData;
+
+class ArrayToTextTest extends AllSetupTeardown
+{
+    /**
+     * @dataProvider providerARRAYTOTEXT
+     */
+    public function testArrayToText(string $expectedResult, array $testData, int $mode): void
+    {
+        $worksheet = $this->getSheet();
+        $worksheet->fromArray($testData, null, 'A1', true);
+        $worksheet->getCell('H1')->setValue("=ARRAYTOTEXT(A1:C5, {$mode})");
+
+        $result = $worksheet->getCell('H1')->getCalculatedValue();
+        self::assertSame($expectedResult, $result);
+    }
+
+    public function providerARRAYTOTEXT(): array
+    {
+        return require 'tests/data/Calculation/TextData/ARRAYTOTEXT.php';
+    }
+}
diff --git a/tests/data/Calculation/TextData/ARRAYTOTEXT.php b/tests/data/Calculation/TextData/ARRAYTOTEXT.php
new file mode 100644
index 00000000..4bef2823
--- /dev/null
+++ b/tests/data/Calculation/TextData/ARRAYTOTEXT.php
@@ -0,0 +1,26 @@
+<?php
+
+return [
+    [
+        "1, 2, 3, a, b, c, TRUE, FALSE, #DIV/0!, 44774, 1, 44777, 12345.6789, -2.4, Hello\nWorld",
+        [
+            [1, 2, 3],
+            ['a', 'b', 'c'],
+            [true, false, '=12/0'],
+            ['=DATE(2022,8,1)', '1', '=A4+3'],
+            [12345.6789, '=-12/5', "Hello\nWorld"],
+        ],
+        0,
+    ],
+    [
+        "{1,2,3;\"a\",\"b\",\"c\";TRUE,FALSE,#DIV/0!;44774,1,44777;12345.6789,-2.4,\"Hello\nWorld\"}",
+        [
+            [1, 2, 3],
+            ['a', 'b', 'c'],
+            [true, false, '=12/0'],
+            ['=DATE(2022,8,1)', 1, '=A4+3'],
+            [12345.6789, '=-12/5', "Hello\nWorld"],
+        ],
+        1,
+    ],
+];

From 7f0ca404fc035603ff1607d8811b1bb408c65102 Mon Sep 17 00:00:00 2001
From: Jonathan Goode <u01jmg3@users.noreply.github.com>
Date: Sun, 7 Aug 2022 01:28:26 +0100
Subject: [PATCH 14/69] Ensure multiplication is performed on a non-array value
 (#2964)

* Ensure multiplication is performed on a non-array value

* Simplify formula
Numbers should be numbers

* Provide test coverage for SUM combined with INDEX/MATCH

* PHPStan
---
 phpstan-baseline.neon                         |  2 +-
 src/PhpSpreadsheet/Shared/JAMA/Matrix.php     |  4 +++
 .../Functions/MathTrig/SumTest.php            | 25 +++++++++++++++++++
 .../Functions/TextData/ConcatenateTest.php    |  4 +--
 4 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 49ab167e..d6e95eae 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -2377,7 +2377,7 @@ parameters:
 
 		-
 			message: "#^Result of && is always false\\.$#"
-			count: 10
+			count: 11
 			path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
 
 		-
diff --git a/src/PhpSpreadsheet/Shared/JAMA/Matrix.php b/src/PhpSpreadsheet/Shared/JAMA/Matrix.php
index ab78ef18..8aab07e3 100644
--- a/src/PhpSpreadsheet/Shared/JAMA/Matrix.php
+++ b/src/PhpSpreadsheet/Shared/JAMA/Matrix.php
@@ -3,6 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet\Shared\JAMA;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalculationException;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 
@@ -742,6 +743,9 @@ class Matrix
                         $value = trim($value, '"');
                         $validValues &= StringHelper::convertToNumberIfFraction($value);
                     }
+                    if (!is_numeric($value) && is_array($value)) {
+                        $value = Functions::flattenArray($value)[0];
+                    }
                     if ($validValues) {
                         $this->A[$i][$j] *= $value;
                     } else {
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumTest.php
index 3f80b8ec..738c203e 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumTest.php
@@ -2,6 +2,8 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\MathTrig;
 
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
 class SumTest extends AllSetupTeardown
 {
     /**
@@ -44,4 +46,27 @@ class SumTest extends AllSetupTeardown
     {
         return require 'tests/data/Calculation/MathTrig/SUMLITERALS.php';
     }
+
+    public function testSumWithIndexMatch(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet1 = $spreadsheet->getActiveSheet();
+        $sheet1->setTitle('Formula');
+        $sheet1->fromArray(
+            [
+                ['Number', 'Formula'],
+                [83, '=SUM(4 * INDEX(Lookup!B2, MATCH(A2, Lookup!A2, 0)))'],
+            ]
+        );
+        $sheet2 = $spreadsheet->createSheet();
+        $sheet2->setTitle('Lookup');
+        $sheet2->fromArray(
+            [
+                ['Lookup', 'Match'],
+                [83, 16],
+            ]
+        );
+        self::assertSame(64, $sheet1->getCell('B2')->getCalculatedValue());
+        $spreadsheet->disconnectWorksheets();
+    }
 }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ConcatenateTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ConcatenateTest.php
index 31fb94fa..53ce2435 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ConcatenateTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ConcatenateTest.php
@@ -41,7 +41,7 @@ class ConcatenateTest extends AllSetupTeardown
         $sheet1->fromArray(
             [
                 ['Number', 'Formula'],
-                ['52101293', '=CONCAT(INDEX(Lookup!$B$2, MATCH($A2, Lookup!$A$2, 0)))'],
+                [52101293, '=CONCAT(INDEX(Lookup!B2, MATCH(A2, Lookup!A2, 0)))'],
             ]
         );
         $sheet2 = $spreadsheet->createSheet();
@@ -49,7 +49,7 @@ class ConcatenateTest extends AllSetupTeardown
         $sheet2->fromArray(
             [
                 ['Lookup', 'Match'],
-                ['52101293', 'PHP'],
+                [52101293, 'PHP'],
             ]
         );
         self::assertSame('PHP', $sheet1->getCell('B2')->getCalculatedValue());

From b661d31887ae68a0f65eebf87887523c7e3e24c2 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Sat, 6 Aug 2022 17:39:18 -0700
Subject: [PATCH 15/69] Limited Support for Chart Titles as Formulas (#2971)

This is a start in addressing issue #2965 (and earlier issue #749). Chart Titles are usually entered as strings or Rich Text strings, and PhpSpreadsheet supports that. They can also be entered as formulas (typically a pointer to a cell with the title text), and, not only did PhpSpreadsheet not support that, it threw an exception when reading a spreadsheet that did so.

This change does:
- eliminate the exception
- set a static chart title when it can determine it from the Xml

This change does not:
- fully support dynamic titles (e.g. if you change the contents of the source cell, or delete or insert cells or rows or columns)
- permit the user to set the title to a formula
- allow the use of formulas when writing a chart title to a spreadsheet
- provide styling for titles when it has read them as a formula
---
 src/PhpSpreadsheet/Reader/Xlsx/Chart.php      |  20 ++++++---
 .../Chart/Issue2965Test.php                   |  42 ++++++++++++++++++
 tests/data/Reader/XLSX/issue.2965.xlsx        | Bin 0 -> 13496 bytes
 3 files changed, 56 insertions(+), 6 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Chart/Issue2965Test.php
 create mode 100644 tests/data/Reader/XLSX/issue.2965.xlsx

diff --git a/src/PhpSpreadsheet/Reader/Xlsx/Chart.php b/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
index 12ee0ade..e7314d0b 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
@@ -396,12 +396,20 @@ class Chart
         foreach ($titleDetails as $titleDetailKey => $chartDetail) {
             switch ($titleDetailKey) {
                 case 'tx':
-                    $titleDetails = $chartDetail->rich->children($this->aNamespace);
-                    foreach ($titleDetails as $titleKey => $titleDetail) {
-                        switch ($titleKey) {
-                            case 'p':
-                                $titleDetailPart = $titleDetail->children($this->aNamespace);
-                                $caption[] = $this->parseRichText($titleDetailPart);
+                    if (isset($chartDetail->rich)) {
+                        $titleDetails = $chartDetail->rich->children($this->aNamespace);
+                        foreach ($titleDetails as $titleKey => $titleDetail) {
+                            switch ($titleKey) {
+                                case 'p':
+                                    $titleDetailPart = $titleDetail->children($this->aNamespace);
+                                    $caption[] = $this->parseRichText($titleDetailPart);
+                            }
+                        }
+                    } elseif (isset($chartDetail->strRef->strCache)) {
+                        foreach ($chartDetail->strRef->strCache->pt as $pt) {
+                            if (isset($pt->v)) {
+                                $caption[] = (string) $pt->v;
+                            }
                         }
                     }
 
diff --git a/tests/PhpSpreadsheetTests/Chart/Issue2965Test.php b/tests/PhpSpreadsheetTests/Chart/Issue2965Test.php
new file mode 100644
index 00000000..8294d39b
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Chart/Issue2965Test.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Chart;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx as XlsxReader;
+use PHPUnit\Framework\TestCase;
+
+class Issue2965Test extends TestCase
+{
+    private const DIRECTORY = 'tests' . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR . 'Reader' . DIRECTORY_SEPARATOR . 'XLSX' . DIRECTORY_SEPARATOR;
+
+    public function testPreliminaries(): void
+    {
+        $file = 'zip://';
+        $file .= self::DIRECTORY . 'issue.2965.xlsx';
+        $file .= '#xl/charts/chart1.xml';
+        $data = file_get_contents($file);
+        // confirm that file contains expected namespaced xml tag
+        if ($data === false) {
+            self::fail('Unable to read file');
+        } else {
+            self::assertStringContainsString('<c:title><c:tx><c:strRef><c:f>Sheet1!$A$1</c:f><c:strCache><c:ptCount val="1"/><c:pt idx="0"><c:v>NewTitle</c:v></c:pt></c:strCache></c:strRef></c:tx>', $data);
+        }
+    }
+
+    public function testChartTitleFormula(): void
+    {
+        $reader = new XlsxReader();
+        $reader->setIncludeCharts(true);
+        $spreadsheet = $reader->load(self::DIRECTORY . 'issue.2965.xlsx');
+        $worksheet = $spreadsheet->getActiveSheet();
+        $charts = $worksheet->getChartCollection();
+        self::assertCount(1, $charts);
+        $originalChart1 = $charts[0];
+        self::assertNotNull($originalChart1);
+        $originalTitle1 = $originalChart1->getTitle();
+        self::assertNotNull($originalTitle1);
+        self::assertSame('NewTitle', $originalTitle1->getCaptionText());
+
+        $spreadsheet->disconnectWorksheets();
+    }
+}
diff --git a/tests/data/Reader/XLSX/issue.2965.xlsx b/tests/data/Reader/XLSX/issue.2965.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..7c0672d396605e6745a7bc653d7965531cb6f9c0
GIT binary patch
literal 13496
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
U1GxB8*&+f_12U-&v_Jp*KMqwz)&Kwi

literal 0
HcmV?d00001


From eb76c3c0ffc1946aa634a63161fc73ecd2b7f850 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Sat, 6 Aug 2022 17:56:30 -0700
Subject: [PATCH 16/69] Code Coverage >90% (#2973)

No source code changes, just additional tests. FormulaParser appears unused, replaced by newer code in Calculation. However, it's a public interface, so probably shouldn't be deleted without first deprecating it. I have no strong feelings about whether that should happen. However, as long as it's part of the package, we may as well have some formal unit tests for it.
---
 phpstan-baseline.neon                         |   5 -
 .../Calculation/FormulaParser.php             |   2 +-
 .../Calculation/FormulaParserTest.php         | 151 ++++++++++++++++++
 3 files changed, 152 insertions(+), 6 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/FormulaParserTest.php

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index d6e95eae..9184a5cb 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -515,11 +515,6 @@ parameters:
 			count: 1
 			path: src/PhpSpreadsheet/Calculation/FormulaParser.php
 
-		-
-			message: "#^Strict comparison using \\=\\=\\= between string and null will always evaluate to false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/FormulaParser.php
-
 		-
 			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Functions\\:\\:ifCondition\\(\\) has no return type specified\\.$#"
 			count: 1
diff --git a/src/PhpSpreadsheet/Calculation/FormulaParser.php b/src/PhpSpreadsheet/Calculation/FormulaParser.php
index ddf45b23..f71d96fc 100644
--- a/src/PhpSpreadsheet/Calculation/FormulaParser.php
+++ b/src/PhpSpreadsheet/Calculation/FormulaParser.php
@@ -61,7 +61,7 @@ class FormulaParser
     /**
      * Create a new FormulaParser.
      *
-     * @param string $formula Formula to parse
+     * @param ?string $formula Formula to parse
      */
     public function __construct($formula = '')
     {
diff --git a/tests/PhpSpreadsheetTests/Calculation/FormulaParserTest.php b/tests/PhpSpreadsheetTests/Calculation/FormulaParserTest.php
new file mode 100644
index 00000000..4682c6b2
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/FormulaParserTest.php
@@ -0,0 +1,151 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalcException;
+use PhpOffice\PhpSpreadsheet\Calculation\FormulaParser;
+use PHPUnit\Framework\TestCase;
+
+class FormulaParserTest extends TestCase
+{
+    public function testNullFormula(): void
+    {
+        $this->expectException(CalcException::class);
+        $this->expectExceptionMessage('Invalid parameter passed: formula');
+        $result = new FormulaParser(null);
+    }
+
+    public function testInvalidTokenId(): void
+    {
+        $this->expectException(CalcException::class);
+        $this->expectExceptionMessage('Token with id 1 does not exist.');
+        $result = new FormulaParser('=2');
+        $result->getToken(1);
+    }
+
+    public function testNoFormula(): void
+    {
+        $result = new FormulaParser('');
+        self::assertSame(0, $result->getTokenCount());
+    }
+
+    /**
+     * @dataProvider providerFormulaParser
+     */
+    public function testFormulaParser(string $formula, array $expectedResult): void
+    {
+        $formula = "=$formula";
+        $result = new FormulaParser($formula);
+        self::assertSame($formula, $result->getFormula());
+        self::assertSame(count($expectedResult), $result->getTokenCount());
+        $tokens = $result->getTokens();
+        $token0 = $result->getToken(0);
+        self::assertSame($tokens[0], $token0);
+        $idx = -1;
+        foreach ($expectedResult as $resultArray) {
+            ++$idx;
+            self::assertSame($resultArray[0], $tokens[$idx]->getValue());
+            self::assertSame($resultArray[1], $tokens[$idx]->getTokenType());
+            self::assertSame($resultArray[2], $tokens[$idx]->getTokenSubType());
+        }
+    }
+
+    public function providerFormulaParser(): array
+    {
+        return [
+            ['5%*(2+(-3))+A3',
+                [
+                    ['5', 'Operand', 'Number'],
+                    ['%', 'OperatorPostfix', 'Nothing'],
+                    ['*', 'OperatorInfix', 'Math'],
+                    ['', 'Subexpression', 'Start'],
+                    ['2', 'Operand', 'Number'],
+                    ['+', 'OperatorInfix', 'Math'],
+                    ['', 'Subexpression', 'Start'],
+                    ['-', 'OperatorPrefix', 'Nothing'],
+                    ['3', 'Operand', 'Number'],
+                    ['', 'Subexpression', 'Stop'],
+                    ['', 'Subexpression', 'Stop'],
+                    ['+', 'OperatorInfix', 'Math'],
+                    ['A3', 'Operand', 'Range'],
+                ],
+            ],
+            ['"hello"  & "goodbye"',
+                [
+                    ['hello', 'Operand', 'Text'],
+                    ['&', 'OperatorInfix', 'Concatenation'],
+                    ['goodbye', 'Operand', 'Text'],
+                ],
+            ],
+            ['+1.23E5',
+                [
+                    ['1.23E5', 'Operand', 'Number'],
+                ],
+            ],
+            ['#DIV/0!',
+                [
+                    ['#DIV/0!', 'Operand', 'Error'],
+                ],
+            ],
+            ['"HE""LLO"',
+                [
+                    ['HE"LLO', 'Operand', 'Text'],
+                ],
+            ],
+            ['MINVERSE({3,1;4,2})',
+                [
+                    ['MINVERSE', 'Function', 'Start'],
+                    ['ARRAY', 'Function', 'Start'],
+                    ['ARRAYROW', 'Function', 'Start'],
+                    ['3', 'Operand', 'Number'],
+                    [',', 'OperatorInfix', 'Union'],
+                    ['1', 'Operand', 'Number'],
+                    ['', 'Function', 'Stop'],
+                    [',', 'Argument', 'Nothing'],
+                    ['ARRAYROW', 'Function', 'Start'],
+                    ['4', 'Operand', 'Number'],
+                    [',', 'OperatorInfix', 'Union'],
+                    ['2', 'Operand', 'Number'],
+                    ['', 'Function', 'Stop'],
+                    ['', 'Function', 'Stop'],
+                    ['', 'Function', 'Stop'],
+                ],
+            ],
+            ['[1,1]*5',
+                [
+                    ['[1,1]', 'Operand', 'Range'],
+                    ['*', 'OperatorInfix', 'Math'],
+                    ['5', 'Operand', 'Number'],
+                ],
+            ],
+            ['IF(A1>=0,2,3)',
+                [
+                    ['IF', 'Function', 'Start'],
+                    ['A1', 'Operand', 'Range'],
+                    ['>=', 'OperatorInfix', 'Logical'],
+                    ['0', 'Operand', 'Number'],
+                    [',', 'OperatorInfix', 'Union'],
+                    ['2', 'Operand', 'Number'],
+                    [',', 'OperatorInfix', 'Union'],
+                    ['3', 'Operand', 'Number'],
+                    ['', 'Function', 'Stop'],
+                ],
+            ],
+            ["'Worksheet'!A1:A3",
+                [
+                    ['Worksheet!A1:A3', 'Operand', 'Range'],
+                ],
+            ],
+            ["'Worksh''eet'!A1:A3",
+                [
+                    ['Worksh\'eet!A1:A3', 'Operand', 'Range'],
+                ],
+            ],
+            ['true',
+                [
+                    ['true', 'Operand', 'Logical'],
+                ],
+            ],
+        ];
+    }
+}

From 8bde1ace4488462ee8647d37d749da1fbd9edecf Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Sat, 6 Aug 2022 18:06:36 -0700
Subject: [PATCH 17/69] Charts Support for Rounded Corners and Trendlines
 (#2976)

Fix #2968. Fix #2815. Solution largely based on suggestions by @bridgeplayr.
---
 .../33_Chart_create_scatter5_trendlines.php   | 273 ++++++++++++++++++
 samples/templates/32readwriteAreaChart1.xlsx  | Bin 12588 -> 13641 bytes
 .../32readwriteScatterChartTrendlines1.xlsx   | Bin 0 -> 15275 bytes
 src/PhpSpreadsheet/Chart/Chart.php            |  15 +
 src/PhpSpreadsheet/Chart/DataSeriesValues.php |  15 +
 src/PhpSpreadsheet/Chart/TrendLine.php        | 126 ++++++++
 src/PhpSpreadsheet/Reader/Xlsx/Chart.php      |  37 +++
 src/PhpSpreadsheet/Writer/Xlsx/Chart.php      |  62 +++-
 .../Chart/RoundedCornersTest.php              |  74 +++++
 .../Chart/TrendLineTest.php                   |  97 +++++++
 10 files changed, 698 insertions(+), 1 deletion(-)
 create mode 100644 samples/Chart/33_Chart_create_scatter5_trendlines.php
 create mode 100644 samples/templates/32readwriteScatterChartTrendlines1.xlsx
 create mode 100644 src/PhpSpreadsheet/Chart/TrendLine.php
 create mode 100644 tests/PhpSpreadsheetTests/Chart/RoundedCornersTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Chart/TrendLineTest.php

diff --git a/samples/Chart/33_Chart_create_scatter5_trendlines.php b/samples/Chart/33_Chart_create_scatter5_trendlines.php
new file mode 100644
index 00000000..a87f6ee1
--- /dev/null
+++ b/samples/Chart/33_Chart_create_scatter5_trendlines.php
@@ -0,0 +1,273 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Chart\Axis;
+use PhpOffice\PhpSpreadsheet\Chart\Chart;
+use PhpOffice\PhpSpreadsheet\Chart\ChartColor;
+use PhpOffice\PhpSpreadsheet\Chart\DataSeries;
+use PhpOffice\PhpSpreadsheet\Chart\DataSeriesValues;
+use PhpOffice\PhpSpreadsheet\Chart\Legend as ChartLegend;
+use PhpOffice\PhpSpreadsheet\Chart\PlotArea;
+use PhpOffice\PhpSpreadsheet\Chart\Properties;
+use PhpOffice\PhpSpreadsheet\Chart\Title;
+use PhpOffice\PhpSpreadsheet\Chart\TrendLine;
+use PhpOffice\PhpSpreadsheet\IOFactory;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../Header.php';
+
+$spreadsheet = new Spreadsheet();
+$dataSheet = $spreadsheet->getActiveSheet();
+$dataSheet->setTitle('Data');
+// changed data to simulate a trend chart - Xaxis are dates; Yaxis are 3 meausurements from each date
+$dataSheet->fromArray(
+    [
+        ['', 'metric1', 'metric2', 'metric3'],
+        ['=DATEVALUE("2021-01-01")', 12.1, 15.1, 21.1],
+        ['=DATEVALUE("2021-04-01")', 56.2, 73.2, 86.2],
+        ['=DATEVALUE("2021-07-01")', 52.2, 61.2, 69.2],
+        ['=DATEVALUE("2021-10-01")', 30.2, 22.2, 0.2],
+        ['=DATEVALUE("2022-01-01")', 40.1, 38.1, 65.1],
+        ['=DATEVALUE("2022-04-01")', 45.2, 44.2, 96.2],
+        ['=DATEVALUE("2022-07-01")', 52.2, 51.2, 55.2],
+        ['=DATEVALUE("2022-10-01")', 41.2, 72.2, 56.2],
+    ]
+);
+
+$dataSheet->getStyle('A2:A9')->getNumberFormat()->setFormatCode(Properties::FORMAT_CODE_DATE_ISO8601);
+$dataSheet->getColumnDimension('A')->setAutoSize(true);
+$dataSheet->setSelectedCells('A1');
+
+// Set the Labels for each data series we want to plot
+//     Datatype
+//     Cell reference for data
+//     Format Code
+//     Number of datapoints in series
+$dataSeriesLabels = [
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, 'Data!$B$1', null, 1),
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, 'Data!$C$1', null, 1),
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, 'Data!$D$1', null, 1),
+];
+// Set the X-Axis Labels
+// NUMBER, not STRING
+// added x-axis values for each of the 3 metrics
+// added FORMATE_CODE_NUMBER
+// Number of datapoints in series
+$xAxisTickValues = [
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_NUMBER, 'Data!$A$2:$A$9', Properties::FORMAT_CODE_DATE_ISO8601, 8),
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_NUMBER, 'Data!$A$2:$A$9', Properties::FORMAT_CODE_DATE_ISO8601, 8),
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_NUMBER, 'Data!$A$2:$A$9', Properties::FORMAT_CODE_DATE_ISO8601, 8),
+];
+// Set the Data values for each data series we want to plot
+//     Datatype
+//     Cell reference for data
+//     Format Code
+//     Number of datapoints in series
+//     Data values
+//     Data Marker
+//     Data Marker Color fill/[fill,Border]
+//     Data Marker size
+//   Color(s) added
+// added FORMAT_CODE_NUMBER
+$dataSeriesValues = [
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_NUMBER, 'Data!$B$2:$B$9', Properties::FORMAT_CODE_NUMBER, 8, null, 'diamond', null, 5),
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_NUMBER, 'Data!$C$2:$C$9', Properties::FORMAT_CODE_NUMBER, 8, null, 'square', '*accent1', 6),
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_NUMBER, 'Data!$D$2:$D$9', Properties::FORMAT_CODE_NUMBER, 8, null, null, null, 7), // let Excel choose marker shape
+];
+// series 1 - metric1
+// marker details
+$dataSeriesValues[0]
+    ->getMarkerFillColor()
+    ->setColorProperties('0070C0', null, ChartColor::EXCEL_COLOR_TYPE_ARGB);
+$dataSeriesValues[0]
+    ->getMarkerBorderColor()
+    ->setColorProperties('002060', null, ChartColor::EXCEL_COLOR_TYPE_ARGB);
+
+// line details - dashed, smooth line (Bezier) with arrows, 40% transparent
+$dataSeriesValues[0]
+    ->setSmoothLine(true)
+    ->setScatterLines(true)
+    ->setLineColorProperties('accent1', 40, ChartColor::EXCEL_COLOR_TYPE_SCHEME); // value, alpha, type
+$dataSeriesValues[0]->setLineStyleProperties(
+    2.5, // width in points
+    Properties::LINE_STYLE_COMPOUND_TRIPLE, // compound
+    Properties::LINE_STYLE_DASH_SQUARE_DOT, // dash
+    Properties::LINE_STYLE_CAP_SQUARE, // cap
+    Properties::LINE_STYLE_JOIN_MITER, // join
+    Properties::LINE_STYLE_ARROW_TYPE_OPEN, // head type
+    Properties::LINE_STYLE_ARROW_SIZE_4, // head size preset index
+    Properties::LINE_STYLE_ARROW_TYPE_ARROW, // end type
+    Properties::LINE_STYLE_ARROW_SIZE_6 // end size preset index
+);
+
+// series 2 - metric2, straight line - no special effects, connected
+$dataSeriesValues[1] // square marker border color
+    ->getMarkerBorderColor()
+    ->setColorProperties('accent6', 3, ChartColor::EXCEL_COLOR_TYPE_SCHEME);
+$dataSeriesValues[1] // square marker fill color
+    ->getMarkerFillColor()
+    ->setColorProperties('0FFF00', null, ChartColor::EXCEL_COLOR_TYPE_ARGB);
+$dataSeriesValues[1]
+    ->setScatterLines(true)
+    ->setSmoothLine(false)
+    ->setLineColorProperties('FF0000', 80, ChartColor::EXCEL_COLOR_TYPE_ARGB);
+$dataSeriesValues[1]->setLineWidth(2.0);
+
+// series 3 - metric3, markers, no line
+$dataSeriesValues[2] // triangle? fill
+    //->setPointMarker('triangle') // let Excel choose shape, which is predicted to be a triangle
+    ->getMarkerFillColor()
+    ->setColorProperties('FFFF00', null, ChartColor::EXCEL_COLOR_TYPE_ARGB);
+$dataSeriesValues[2] // triangle border
+    ->getMarkerBorderColor()
+    ->setColorProperties('accent4', null, ChartColor::EXCEL_COLOR_TYPE_SCHEME);
+$dataSeriesValues[2]->setScatterLines(false); // points not connected
+  // Added so that Xaxis shows dates instead of Excel-equivalent-year1900-numbers
+$xAxis = new Axis();
+$xAxis->setAxisNumberProperties(Properties::FORMAT_CODE_DATE_ISO8601, true);
+
+// Build the dataseries
+$series = new DataSeries(
+    DataSeries::TYPE_SCATTERCHART, // plotType
+    null, // plotGrouping (Scatter charts don't have grouping)
+    range(0, count($dataSeriesValues) - 1), // plotOrder
+    $dataSeriesLabels, // plotLabel
+    $xAxisTickValues, // plotCategory
+    $dataSeriesValues, // plotValues
+    null, // plotDirection
+    null, // smooth line
+    DataSeries::STYLE_SMOOTHMARKER // plotStyle
+);
+
+// Set the series in the plot area
+$plotArea = new PlotArea(null, [$series]);
+// Set the chart legend
+$legend = new ChartLegend(ChartLegend::POSITION_TOPRIGHT, null, false);
+
+$title = new Title('Test Scatter Chart');
+$yAxisLabel = new Title('Value ($k)');
+
+// Create the chart
+$chart = new Chart(
+    'chart1', // name
+    $title, // title
+    $legend, // legend
+    $plotArea, // plotArea
+    true, // plotVisibleOnly
+    DataSeries::EMPTY_AS_GAP, // displayBlanksAs
+    null, // xAxisLabel
+    $yAxisLabel,  // yAxisLabel
+    // added xAxis for correct date display
+    $xAxis, // xAxis
+    //  $yAxis, // yAxis
+);
+
+// Set the position of the chart in the chart sheet
+$chart->setTopLeftPosition('A1');
+$chart->setBottomRightPosition('P12');
+
+// create a 'Chart' worksheet, add $chart to it
+$spreadsheet->createSheet();
+$chartSheet = $spreadsheet->getSheet(1);
+$chartSheet->setTitle('Scatter Chart');
+
+$chartSheet = $spreadsheet->getSheetByName('Scatter Chart');
+// Add the chart to the worksheet
+$chartSheet->addChart($chart);
+
+// ------------ Demonstrate Trendlines for metric3 values in a new chart ------------
+
+$dataSeriesLabels = [
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, 'Data!$D$1', null, 1),
+];
+$xAxisTickValues = [
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_NUMBER, 'Data!$A$2:$A$9', Properties::FORMAT_CODE_DATE_ISO8601, 8),
+];
+
+$dataSeriesValues = [
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_NUMBER, 'Data!$D$2:$D$9', Properties::FORMAT_CODE_NUMBER, 4, null, 'triangle', null, 7),
+];
+
+// add 3 trendlines:
+// 1- linear, double-ended arrow, w=0.5, same color as marker fill; nodispRSqr, nodispEq
+// 2- polynomial (order=3) no-arrow trendline, w=1.25, same color as marker fill; dispRSqr, dispEq
+// 3- moving Avg (period=2) single-arrow trendline, w=1.5, same color as marker fill; no dispRSqr, no dispEq
+$trendLines = [
+    new TrendLine(TrendLine::TRENDLINE_LINEAR, null, null, false, false),
+    new TrendLine(TrendLine::TRENDLINE_POLYNOMIAL, 3, null, true, true),
+    new TrendLine(TrendLine::TRENDLINE_MOVING_AVG, null, 2, true),
+];
+$dataSeriesValues[0]->setTrendLines($trendLines);
+
+// Suppress connecting lines; instead, add different Trendline algorithms to
+// determine how well the data fits the algorithm (Rsquared="goodness of fit")
+// Display RSqr plus the eqn just because we can.
+
+$dataSeriesValues[0]->setScatterLines(false); // points not connected
+$dataSeriesValues[0]->getMarkerFillColor()
+    ->setColorProperties('FFFF00', null, ChartColor::EXCEL_COLOR_TYPE_ARGB);
+$dataSeriesValues[0]->getMarkerBorderColor()
+    ->setColorProperties('accent4', null, ChartColor::EXCEL_COLOR_TYPE_SCHEME);
+
+// add properties to the trendLines - give each a different color
+$dataSeriesValues[0]->getTrendLines()[0]->getLineColor()->setColorProperties('accent4', null, ChartColor::EXCEL_COLOR_TYPE_SCHEME);
+$dataSeriesValues[0]->getTrendLines()[0]->setLineStyleProperties(0.5, null, null, null, null, Properties::LINE_STYLE_ARROW_TYPE_STEALTH, 5, Properties::LINE_STYLE_ARROW_TYPE_OPEN, 8);
+
+$dataSeriesValues[0]->getTrendLines()[1]->getLineColor()->setColorProperties('accent3', null, ChartColor::EXCEL_COLOR_TYPE_SCHEME);
+$dataSeriesValues[0]->getTrendLines()[1]->setLineStyleProperties(1.25);
+
+$dataSeriesValues[0]->getTrendLines()[2]->getLineColor()->setColorProperties('accent2', null, ChartColor::EXCEL_COLOR_TYPE_SCHEME);
+$dataSeriesValues[0]->getTrendLines()[2]->setLineStyleProperties(1.5, null, null, null, null, null, null, Properties::LINE_STYLE_ARROW_TYPE_OPEN, 8);
+
+$xAxis = new Axis();
+$xAxis->setAxisNumberProperties(Properties::FORMAT_CODE_DATE_ISO8601); // m/d/yyyy
+
+// Build the dataseries
+$series = new DataSeries(
+    DataSeries::TYPE_SCATTERCHART, // plotType
+    null, // plotGrouping (Scatter charts don't have grouping)
+    range(0, count($dataSeriesValues) - 1), // plotOrder
+    $dataSeriesLabels, // plotLabel
+    $xAxisTickValues, // plotCategory
+    $dataSeriesValues, // plotValues
+    null, // plotDirection
+    null, // smooth line
+    DataSeries::STYLE_SMOOTHMARKER // plotStyle
+);
+
+// Set the series in the plot area
+$plotArea = new PlotArea(null, [$series]);
+// Set the chart legend
+$legend = new ChartLegend(ChartLegend::POSITION_TOPRIGHT, null, false);
+
+$title = new Title('Test Scatter Chart - trendlines for metric3 values');
+$yAxisLabel = new Title('Value ($k)');
+
+// Create the chart
+$chart = new Chart(
+    'chart2', // name
+    $title, // title
+    $legend, // legend
+    $plotArea, // plotArea
+    true, // plotVisibleOnly
+    DataSeries::EMPTY_AS_GAP, // displayBlanksAs
+    null, // xAxisLabel
+    $yAxisLabel,  // yAxisLabel
+    // added xAxis for correct date display
+    $xAxis, // xAxis
+    //  $yAxis, // yAxis
+);
+
+// Set the position of the chart in the chart sheet below the first chart
+$chart->setTopLeftPosition('A13');
+$chart->setBottomRightPosition('P25');
+
+// Add the chart to the worksheet $chartSheet
+$chartSheet->addChart($chart);
+
+// Save Excel 2007 file
+$filename = $helper->getFilename(__FILE__);
+$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
+$writer->setIncludeCharts(true);
+$callStartTime = microtime(true);
+$writer->save($filename);
+$helper->logWrite($writer, $filename, $callStartTime);
diff --git a/samples/templates/32readwriteAreaChart1.xlsx b/samples/templates/32readwriteAreaChart1.xlsx
index d44ae5340c3f7f1f252f4d891fd525427876ff71..474affbe8cf0f731f8fcc25c306d697aad59fb86 100644
GIT binary patch
delta 9985
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

delta 8835
zcmZX4Wmw%>v@P!LvT=8JcQ4vvg|hLDQ(QOhzHx^_kwS5Icc*A^Da9%7m!9{&d%p8t
zek3!=$V{>_*IHxFkrA5;Q(O%dSU5Z=1SljZC@3nZ%05PvtQuSq7_g=ZvSK$Pk<W^r
zo81`C)y1vqPXa0(lJ^tz@3!x9eV)@}=#K{RRTQm*tNPu9@ZdekVy-WhecL6_Ph|s(
z+BMldOZyQtR0q=tzuc<9v3k}IDbLGZ7%R{7@uG}j^|(y27Rh5vd~JzQ=9mZUPB?k8
zxShl0BFx)FTpU1K9)ia-FPirk4H@zlqD@<$zstRs9yqA@&@aC?n<bGTl|E5{fP1Ce
zH%m7NH)?_|8Ovf;tE%cK+25lv96Sz(p&opyl_JVb+P5O#zJ2hDwUYa)eKOc_{+ZS`
z-}8NB?)$#wy_J#oiqTV81bfbj+9mYrn#+twx1I6lmqUy$E^FYrME*|%r{_}bLz4SP
z_XM@7h*+Q<D4%z2_$Snh%z<7s>m8Tt=uZo$=fEU`27=ww{U@&tWH%>1AKK)W-?1Zm
zl&J1CDRXm~@p4nBRky7}cOM6hwIcvxw1R8hovaOC5EDZw6GQWQT@M0Yv0BD+F`l%2
z3o3UI#-SU>Ut^&!AU%u(kWE-P=<B*YSaKL}Ow!c5K2Eg3GsSk9-N!=*MWlk_HdVzo
zDjo7}+Ea>#*e|q_w>KfMLCR*UGdI7cBn;P2_dz-o08@^4eXWdAH9V$1i#DE>c^@$I
zO{uLwcta#{0HE&Ly4@$wqU0>o#mCax=xCDG<R=<aUNUt&)QjWK#fhAnqd@B!2yv;S
z#n0qDv9K<34K~pqJvK;)K8WSw52E+AO}uK3o*esrrfKhDBy({^#@zR0EK$p*R!cLb
z$CQHcFSF;cM;@uoU~}nLKB`~6HVQgZt3*yKZeEIRM7c;F9R;%IS(n{)Op0!oglwsq
z-vN6DFm*mb0@3j6v`}=Q!DD{AXSQ0xBi#uOwOk*OH+*R8SHT{YceGQnbttv8@KPVz
zYHJ#TZnyXLvEdNw=^7`Kf&z(d?yrBGrWl}I;AVZb!Zu=M;iS4UWYQ-+Ou$`)#O93N
zW5^_TrivZXEYJ#o9w?uG!v5h=cV@)Dlkq|=Bzj1H>T3E{E<aZ{_mP5Z*@;T}Gtr7*
z0ORx`9^TU-Eq72mpi7@eyuV>OSzKADa~Vgbk-jhOQh{F<xGk8X7ndWK{>TU9ZG0Fp
zF=I&A27zciY^AHE)b|X}FZO>madEu%4A<37f&acGie70BzA`iv6fO(|6A>RAqp9ZD
z%Zb*Zz5<T;OaX#*g`J^Rvm;3ZA&O7x@61N<mL<7{f+d>X1BY?|t5Y2QQ{S$OXLk{^
zbr*_wb7hkQMk;molV_h#pMQtqP=q8(8^SVm1eF{eUjTm?c)T>;s3vsZC8tu&s|@-Y
zOVd5|FPKzo>*+=Yl!<VC62St`ra=|V#wcj^G8dqc5v86=02&!}Fi5im@Y6XH1gEJt
zA3Aj!N|wttNHBt_sSh8tb((MGv<pKq9kt*Sm~zZ)44VlplbgT#+b0j6nvyt=)@BWJ
zDA3{+&H%&z$h%)fPYJ3En_CS?NgbWZ7%8(WSQOcdFdF!f)yYXKt$N7CDTi?v`;Pu<
zT0tz;CU&wUk+?lR#`JTf^q*5O^>!o0hFdSIbB{h6Dzzv(-)iJOZ8Y1_V0Vo(ZJma-
zx(vaLxX4}R_$PeQ07%e~6^7@!PI>?|_|df3J{bWDs)Y2dsozFBPdg4*YYTge|Fh;|
z_q4Y=)>n62<;Uy7T=JlFb+l(_Bt>+KTB^yaR3q(o2qy<+r0QuGO3o_zk*@3nK=-u*
z)1cc<IPF-bVcJ~t=ncawVIS~s6qRd<##CkzNEd#D%Tj}VUpIDW+^$!^!4U;A)U<of
ztKW>idq?z(Q_Klk`*?&stB{f>p$wUgd#bLiXDgnqEIghW4P-IXVoOzvr)D*ugeucz
zr9@o;iN?l6skp|~nj@-%bg^{?VJM*2BHk~Q|FER%<-O5}p`rBg;VuxDl2Myo9gVmp
zY9CZSgwBf$q*u$vM-a&cFYroFTBISnM(D4?iktcK(qblu6Q!ciuNeP$Y9C$rfwHbj
z$kkwK4>a0%nsxgfbm2O2j@QFzWpK1;sO$du0ik=I`}^XNn@>Y_F0{!8qFN=ZT;}zQ
zd?jRtHQ;!M`^2F^v$E|D=J}c~!!YMv$&9i^jV$`G_(Iw_=?_aku+KyfX~KX&>iPAg
zd(*1xIfD7c1fB1z@;7~t3j{oF67{s{m4at~WwCHo!Bw_UM=0MfnZ1OJ5n-aOywS+<
zKg#u@&;8gRpr$3m@M9A*8O($HBDUG%<bzBnpd4{Nrq{@Hek7S~Pq>0t(^-Aw>`A~z
z^{&bVzaHLeUme~<z&qhnaTG7EPX{v>eH3hLR$J_G!P~uQ8~!)H7Ad|+<oaL!xggy0
z)bD?N=ws-5dh!y&;<l!miRQ?Ax;Y++t`dKKZX2RIw+~d1yGxLlEi~LkB0EQN<q319
zW1w;F#P7q>wt~k9bVvT3i$b<pDP(EUjNu&Xp(}a82y2|T2KF!~3o-p_jr@xgxC?bF
zXhp`ZjP4|J$*kuo7#;k1-}FO2nTfC7U|Y1=P(z14%zGYG<)NFk1VPhN9smm<A)T@4
z*IjY~&dI6f;gVbYLy(HN<^j1JnW~B!cM%Ok0ztGp2+ltv?Kj$Yce^?dLN`H{Iqz^l
ztD+*(xN-;u4tPKPLO7QRkdg@4j=)Fv$Ng5VI^6T|PVS>R^SP@ekwOPoVy)eTJ@f-X
zwm+;)2eaEFd6ojZ7NaoR7cX2FW7*SlkU+ntRv6i|AgifFf;N(7%uNe(@R_rK%$3L;
z^bpIMUmDKPS_xs02(Oc@0bE3GMkLNBV}_rR8$H=-oM5i^2+FP6Wi%wOM$49XhmCvZ
z-|d<@?3emSldNuKYm7r5F;fr7M5Aw!%?JJvTz{AD`Zm38_^Cj5@6W*Eo*Yvcb0sOx
zs%_S!h{3X_I-?mZpVjVH-j1dabnBntQXP{3VI_Yo6=~1;3^X*rN6KpbU^rb0O?(XL
zY{?DdOI~oI<kuqDNF4U9cIz+|kge#|%V;h?=>x!&CA{AzKK|sqm3%UeREU`7y~$)f
z@fSC>&5H4bsv=pbrbXa~Iq94X!-)vXsKP!rUHz=3?6IER78}lVLtJ4}xMwWA7UUuS
z36e>X^u(IRwrkCOf}PN4*F?07^dj+DZ;r=O%WQD+z-SV+0VXNh!?9=750sw<na89~
zBGHhj<3pAui*+Ad4h!t|a~utkj5t<ydWPs3%~e~z1rqW<&a*f4PC8*jjL=moYpSLM
z-F}d&5cEfF$g=r;Z&sx$mjJSj(<AVtv#44d5r^srMrr{%I!{U%R5Tw0%c}wGxVI)s
zvJUu5ol;FFbkBK}612OkkqSNT_P4@1RGJm{8$PyT->(rwAv-j@raaC8J<q~AQh8h{
zPCG#6ApgK4A$xnCJ%V4nzoXJj5v+!|RHU<04RZ?h=?$Bi6kE{tD=EnjJ}|dwo<5bQ
zCwEc4j{-hPXv>{3IKkJ5FOZ*ax$Bt}@f3qkoC~Be-ZLVXZ4gcirmsNH!05JfqD#Sh
z%<p$mhCg&o2&wcH@nzHgfJRTqucj!|z^cWx7?Isz>bLp5ZlP40oDf+W)XZID8b3@0
zlre(M@^-w{Kq_!3S293AJ2ii5IRhcY!mRD$T~3sl->=)cZ04Q%+HnVKIgs(At673y
zKlZna=^dB5cj)JybjZnF^%qW*Tj@iOqZmrDs68&?ZDku)R_dvcRPk|dbw`hp^qH(<
z(K#iCTv05&mY!!kZx#s5Q%MA@L~TBX(jx$2HT_2T$rT9|MFfKeM=(}QW{WC7a|=p_
zY^xO<&2tm?xtxuu$E+{nB{i4(;}&AScDLn7L>j8iY(*Mp=Qo!jOeivtV@flCS!Xi7
zgyqGIpVJkFFMm20of>CP33FgUIC;8gz-|*@Vz#pDAEF=%B3{UZfr7$AfCLcZfpydz
zSKoL7<`NjoRo$*cDGjbMnhq2Iv&NZER{hO%EKb9ZDCy@i+0BN6e%wwW*#fX_2~SQu
zDIRa<o4nJNVgpc_UNAF^NHe1>dxX2^)7dSAPJR$41NS?vnv)88r}9QubgaElhlrL9
zwxl9t^Gm}IVI)=eqM-D$^3sqjurx@D72rmkuB@Fz`is_+6SZ$l5{te@K`;84jWXyU
zyfxEYS*O1ic4xeij6j~+a3fg@^m#ME26sZqz4sJ@V-tR?p1ZtSI{;NjvpS}8{4;(9
zjHL38w34mHR~rznD6BOh@R{<5N6Xt7YT}qOxQ{G`gOQ1Z2+C&q&Rg3JMx$K-(PGaV
z+96vZPGsv#!R=J)PGuL;)HUIvDZ7kz?`_p7?F83((-A;~?5%S*i(R}7>&crRiIKVm
zDN>H`L1^`c<$L4~nj9NV`15o?X<vV*YlR~%2!AG<Jcbk@ma>*`c%&%yiQsiP?|yx?
zMx5o|%yVV=rjN#g^y4g8(5gr$$q6eMqQD_3M7;Mjsdmz|P3*2ssUO`@EznIc-eq=6
zD^1mLaPic$6+a_-gLDI<_2Q#9j|cm5)=o2gc3p(vC|e%Y<UskT`RJ%eeotdnj5ps`
z!lhazQTS!{7`eB#W@<C{0c0PQ%T8%MA8I8=v?S}Gh5NK@kB$N6sIY<~vl(QAz)D!X
zK=U|GlA*6j>Ni2R8e?ka*9fsGPMkbDWo*_xMebJ+eCs(x_0eezRy^15bPFalY9*?#
zX+p@QdeW@a4+4L56t8e!d|Wmsc1VTX!yBo7h@Nn$O?MP%Tl2@C>^+&9k$wnwo3B($
zud(jr2c)K+MxPL>w2K_!hzj3bwJ{)qWDMWQ!CC74`uz{}LV;SZQ<{N;f?C0a<fD;;
zll4~PR{62~IHti^SIPB8N0#>pt340?=uvhnqAqkR1g4SYvS-DgHmDl@81zA9bQ1ls
zp3K-fN28lKpHuN}%=OfyrzTxC9&2FBm7{)FyEFW9bhQ25%COj6e|(a9hvqRQ?WW|S
zstYYo?xI7~nVrpKcr?*3iJL<39dV8)cyu&%*bBh}qfjv;q-$V?=`yHJFL<_Yr_EtV
zNk3^Bzb`-EDWZ=m@=jGYE!nD;n&~b>X}C+2&P%_p7(0~RV&GQApD>aaF=}WxdstV^
z#t_7-N5P|6J;YP-IAB{>y1xKMd*F>k(TobVgU->Wv-#d~c131Fg1H0tA%D~XjQ_-0
zd)Cp@X)Cf*@O^3n8O-kZoo$4i;x0oWX{cJQv3T^AvEO5_83BSCQ|zu0!<saLoA>9^
z%bWvtsR!(e)*J#g$=7@0MrL0ia6Hu;bsuOn`6t@b_+r;H39E6<Mh01j4&mY`CJoyT
zI>Z6AqL>{B>tD&MsTG7$o5s8drcEtLTyqQsw#^-dHC_*^v?$^g+smbCMO_*0?fiyg
zVb0l)QQ{{j*j|S53h>C_q2qVl?5XunN7>EyWf=7`e{6&YDwj^qH4C`rnvBe34b|TS
zWLgiSk?t>5cZbpOS5yOI(Mj!=O#3iMZv+q!ZJgPVD&jsS`0Q2K=y7;}wTOL<NDt&c
z=03QeNc4pX@w3_lm-BPpWWj%0XtEu|=dY*%YLha{PuX)j9If*0{Phwh|64~_qrtT*
zo3!{F`q?&0W`>$ty!)J)rFV#0e9P|{kT<L98;3phUlUs7m-MPo#Yi4nxsvp<dpkO`
z@MawUHP){@r@&uoTAWm81ayT2Sat=ziGpOJ0aqXL^m@$Nglib=-AoO!=Qg=#!q3Aw
zZu6`l_lu5~_rEYb3Le8LS}DM{A8&UYmD>?3&AP%}Mfs?C^`zF+&8l{&=VJnb*kwzF
z;D7YxG*ae2h@&*n2EbHBYp}qK+9Dz~(C0rvSv6DTKY#^$*r0bwkx!9IyNBF1v^9Fr
z%V!YJON(y<KRet&Ghfj5`<ay2&q?JoLGRu=5@?7;A(yhB779V{daN?`z{6X(&Ljo=
zL2IdGWTc38Rg;8={yrEM@Fz&Td@wZtMYP>W1Z8xf<_0dAV!hwSy6qBNUzwe?ax+c5
zao^G?!wSxM^Be9dVg;96Fe?O&x6R`$1?9Dt1#`4+h@;UNZd*g052L*TmrS_nW{*@l
zE!coeSrwnw@FgGSDP|2<!~cxFFRXT}ILP0I<=5BRHpS(&JeJiXlf-w(jF+JyFunM>
z+L8jrvm{1Xl7Z2Aaw;%~h~fP3duFlUnMyI_?ZHT;`LT-)#rbH7r$~%bJQ(&cqh0o$
z$}2yn3m!7ny`1O!B4?xe<zlhsRVIHt+_;}$Za(6y`zHErVQ#X_)H^;w`yOT7AdkN<
zFY8S~8pOLt{;JO%X)@`Il~F;@nCd$LoQFh~4X?|aMsZpxbXpB?jVK?DV<voG4f@Vf
zUZ4}vnM%F*fo}y1XOQ^13m2_jP?csr296q8|J7^9Z}U%*q0pGuMZyzm&toH96x=?u
zcOhS`i{@|;9nLm-lBYT0kzN%&`x4Li!Fr|l$)p>zzzZhiEo(uMIE5`0eoHDju_2EX
z0I-VV4nI~W;Q`nw^rM+!EvtU-3hEGuKn~(iJ$YInU{Gk!k5`tYV|rF~hNg6%;+g1f
zm@mXg9iBZTpnkvhs5T&?t^=YU5JYNw&X<v+QlbB_vw7J!vB!8|EhDScjOPllE5le<
z_kY?lN+h%`9B-$GKY_w6xHJV+#FkwegVhOb4Y1cz`0ynSmEU8-sx%y?M2W&)M%@<r
zOZ?WS544hefew!1oLSd(Y~e^#`7mv(&x?;g2r6J?K){-|{cvOgGnmpp&3QDG!_Ye<
zC2_Dt&tSU8U)ucSw8x)fC#y7;p#x(gD)<TiKAE%}t~yf*D4E$*=Z&j{uNklA2i6}h
zN7y5X;i+pl3<~P@X-qXy_=Wpi2aGy&)(CM%g=_B&C^QXCGGJFD6ubeTR0<^6uaI6-
zpJ8(H$GF%xW(x=R`iCssxPPuh5eT`2XClYW3hrzB;v;M<3J>e3f4dV64AXwB?I|%G
z@ct9Gi>mK%hObC3v}hTJvMd)X0>19(1=AV%x9XBT<8L=@ghLtU_X&@SXE{?+I&nqd
z`-DIde0JE_B$`R)K|2(uRQ}8+#NtTw%e~-3G_me_PB#G&4HUx=r=9GOoo#D~C=nu0
z@3J(PsPbp!NllbzVfZBx+X`C8JU*?!P$K^wDCx6Hz%jJTm!&LH|E3nh4sad8Y+dpc
zrmGnYRv9`LRH1;(xeF}NlBk57V;a!I2@%@Tp$Qr^u<|HlJd310=xWk08L&B1(QBW`
zc+GM1fz2M<T$bl(Cn6oswzGhhC-jn&mAN}{=xBiyPjMQ2XEl}U^s{%_p{XHN_#&vL
z0K`Erq$MsQ?nO%jh#d}&fSvF#3S48U^BE*Qwc3fMppTyXNScN+*^?6tTT#eMNXOyN
zZ8;E?nMUV2oGuo@xl2a1ZD|WlZMs(_p`mbcRukf@7sb(X0ey|asW+*bWKxd%BRL;M
z;*o<~+VF0w3mv#XHb|9@WzokNljMZw9pg@U(+14Okk?N&*W_0W2aixX*XDNoS#u>~
za3-RE7F4N|N=GO2TbqT@o|Gt&gfAl%nST+u3xGo7IWCPDK*>}_H=4b0dDcyNH;k*f
znz8$*bW!rTI6*^hQkjD3gL$IL``N~*mPdB_0)T&^N_$QAM_d{I)^uZ9qBeKTQXUvF
z!0(0(sqoA0@Hho~VKC(|{v<UxQxz4~Id(D6j%Yr8dkNQo-vLP1`%Sk;Vaa)IU?lL=
z2Ac`RI_tw>^sMa{t{5$f*bP%N{=`_lb)AHd7(cdvYL3N0D-8IZA67o%o*3DNQX-U4
zVW#3*1LW8<58;-+MbmaQi%1g29Z$P`nL!)v-h~a#cV{F&?gXC)cpR6ZQnJKfC`<`)
zgqnzW)04<sO;L(_(u+-5ZpNb_TDA1QD5i&5O`#duQzB1+vhR3;584MoEVfR@d5ID{
zs#8&;2K>ujZqgMV5$^;K@+|O9O~`YUgA+C$f3mIURBHw=Z_PHf8#%?+UKxmQ%;MLl
zefq5gL>MK6kpVyUm_(IW^*_loZ>T+WM?Jcf8?SYhptu~t=Y6xR*>s)kB(H@*_b5-C
z;1Ca$2N4uI<Fyq!)l*>NN^s%dYl2uJGFHBOx;_QOvYUkAu)s+%Bap0&{4CSwa#rBy
ze}yW1?wP$I@EA;EtZhm2C;24!+zl^~^847u7I2pw90``@4;W;_jjs>knl&mNrqB|r
z-oC(~cOC*fG?#EWE7!SvwI4({4WRKrK}s(sFKUaBY0iD1Mu$2L2m%r*&9lV%U3!#1
zv3(@V7$Wo?)$KjOmlxWvespe`x6cZ3UOGYbT6F4j$P+BxJ8gC*2x)u?@bn(wLOdkf
zeC7}e^8vGB|H6z)5sbBs-h7?YMbvyi|D->Q&o`Cq{i;(Dax7~`74I$x{uSaTD6;iP
z_*DYs)HXDJGwJsO3c`_s*fp?$x&f9<rH@ZG_ywttg7$}!PCZ1iGM&@KW|POt0(CAE
zC!NuuD1^iCs64ZRk#;x=*}kjYMDQ~O>Ptp12a?zw@>;08-(8xl6ru#H@v4CPD;)&`
zAW|a&^A(}n4&>&Y(>#Z#3ObyWdWs7+VE%$+`|M)M<!SdSGqn2;aYkM&*CDQaD+Uuo
zO35g}+C2_`Q#`^Y38dDl#;gL=n5BW~e3`(4qk?BB=~Odds=0>E_KP2r{>|)H*szaq
zhl#%Gv;z|pr9O>m2g!W+9PBQWMc9p+mbw?eO4_PyC$kafBpqWb?!LJ`eSP^{Lrltw
z=@1=*6vOh{;9~NzV4RylxU9!$MT+E4BLN@Svvr%@77IhR^6{8?s)|P-KV;BN>)~W~
zD-v_kWG)}AYG>@JXMMEu6)0=v9Ar@MT^n+8<O>N!2_nWFzFTX&wlUfr*hW#jDioVP
zLdMvSfd^Al3(6}jbZM=#U%Ay7L=bZB`gV0bgzqwMQSdSC@GR@wg>$+p|D>`W;Y9-1
z<E#5|J?1G)4$YHXRD)%|W=4T`#x*_+IEqM4q2v~qh-cGEdsSSHMM=a3m3+^YS9o%{
zu8|`_OK!AZ)^mOctlFaGX52f-NSEaLl4$cz*%7H`<Yy4#P0(QsCav_$Jd>t8i=Uh`
zzc%$<)kOYbN`fJaaXqiU0cNt8r-3TdVp)%Km<18`x_~q5a$8i{<(Qb-mZvBvs)PD;
zI^Ro+;)b@7-_GqB;V&70o0DHrtJ7wuhZdCjo0*56!QN1yt&s{DaiIlPm|6>5RRf`u
z+^ybyH7kfRkElpIUW{){9Mtz%iQV<_e~}&eNe-#uAOK%0;rC<NA~Bg3$0;5zbb_rG
zgxu1XY4CBd%e2^Bnr1UUM*HN44r?aU?}=5{dzEO<d4}JPbR2WlcCwGflVHZw3_g_m
zpzCOFm;ZW2uY{1^9e{j};g&L|j0oFdQ?*yl*7sz~wzkK5fSlg!Bn7MaJ|nsDjlACL
znX$nE9$*|hQlt?1Jj8uypxz3JFTJg|@%4e=UeJ@H{%QlWKlE0Bb{TnX_;3*4(pSq0
z8HMbVspPyeIdg6Uv^gi%U+Z2cj>n&Q6`er<7<w#hcI>8H*x7hX^o&=j_H5jEG~BZg
z7fdwAgF)Ca@Qd=x{tl0r`zkHP7RV({rVd19#>_S*{`*&;S3>a~XUNY6EDyarQOD4&
z+`O+tc4-39e`J_+1+$3#{2OmD|5iodsq^V%JRv_BdBJVUuu^zpkXVu#X{`vj#FLP_
zC`?}}y(QwrWTsg~{z6LTq(S!3(Bc%hXx|`;0{^hQO^JRN%i3mSvl_j!mNCEa7MHW}
zT;SI*lF8{^k65FMbHf3Qg=*EVNc*G3YPqg=^<mr&&Y{92&4K;qu$LISL8nG0oDMZe
z2xg_0+~BK8gFA&m&+<_CdHqjGo;qb|DF*p1zxol|x?+FM$zsdZU*-h)mP}7Ra#BX4
zeam4S9Snx1;Gpn18DaP$cHY)rMUT$kJ3<#_gQv1xv;76j(^xB{Kd+@`>T6CF`F81$
zHjDHw=twUq_WrZD*==&a*npqLl7P*Ltu?3Bj1t(EY~QKLI0ca@#g%C#WZ_8|l%;H;
zoV{imEW>Y5RQ^g+BX-F9zVPy{J6fq+?TMNucQ*3dv{*%ZtB)RuwJGc4@79;S<w6Bt
zwF!|<OB@LnQBn6hLl}w8Xx~Wf?8{C*B0l1rO&F?;^8z&DyDBu_w_4QeD=gIi)sP`C
z2#Cmm-fEx!idmoPCRnJU!I~<4oOq!d@UJo>K3PThzob`tlEs9uvKc!=cO6)4=MrSw
zo_*$A7cd5fe!84`Om)zH0%Qq4z?psffFD5*CzmhF!qUJpJ!Xl&Q7|n0owmvl9$q+5
zF8a>{Ght@rLN^4&N2D7VE2^YV?;3bB2@0#h_pxqPYnSnIUd;>>0l)H!RI~`5lWis^
z82${{NfL?kF{x0X7N#jCN_^;>ho*!NBO%e4G|kj_+Ho@>d9;$zpr8Eunc>7kcqpf~
zn5cioul|SiaVz`pTCBcbC3p7EcYqJEEI&4sp_pBm(mA`0Y)AP7!mURzO+Je<-7-|P
zxY>eF?BPFqp-ci^zsvX-AW2Y4$%|u<_JUcemY@49Lr0S}a3H*2%^_OuJZ7#h>+u~2
zXFKSj`=U=^Q<8{FbTxf`GvW-aE@+Ekzk9mTf2IX^Z-vVi7)T~FGuRuCOpcy-_?dh8
zH!QD`2r_L>0!E>uV@Tw17gK3fera9l&Trd;fsza(0R#2*vl}fU!+13-j$B``%BgXY
zQ*>kOse-NOy?wUmeUreD!L8fU;bfFsuv@NOnuYiK(I1t>^{cUvnxkE_Y{ZU=6JJe-
z%vgtyw&UDahrlk0QU{<B<+B-^rTT{{E!QJ-t*fs0M)&O(2y_LMyCE?NI5^U(5lB>2
zlse(Ig(p`$1+;h}*$LQM($W#g*i^J|A%~IrNdF%;eq5Rn8J>#4JR~^*%T!tx3Asl?
z11xdy3I#dmB!SL?pmIr4UcYH}s&5g8`nLUdnTLIgwa*rIE*y|^E__G_7YWP*0%Vzs
z74WaD3I&Dv?*(s`I5H%giwZKtO#;(^0@>lFe-jC@(Ef#Vph8}F_#lZqBrvULkV+mt
z!2hcq{)=5ehgfmb0sbw`LP4Sbd-l!B!h@7@Qvm)gh(SRS{Rdz|2%+L;2K<{zz7=@?
z1F!->UMUD5*SuJO|78bnrM3ThnWKhOl950pc(4F}ry=lL7kqkaEUf={YNUlw@!>&k
zc`*S0jGAwtpKm{YF#HE(%K%a56$1QkM}G5y{T~1$6J(p0M)seOeDg5;_67cXn=+Pv
k)KxQ}otca^5ajSzTGdd2e@m19BC(*v-kyG$_3z&Q0CV^?r~m)}

diff --git a/samples/templates/32readwriteScatterChartTrendlines1.xlsx b/samples/templates/32readwriteScatterChartTrendlines1.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..f48366fe0a3705bfaa1c91671a26c72b054b72e1
GIT binary patch
literal 15275
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
S56XuEumcXdl5_m=?*9RVK&c7<

literal 0
HcmV?d00001

diff --git a/src/PhpSpreadsheet/Chart/Chart.php b/src/PhpSpreadsheet/Chart/Chart.php
index e850f502..556b0eff 100644
--- a/src/PhpSpreadsheet/Chart/Chart.php
+++ b/src/PhpSpreadsheet/Chart/Chart.php
@@ -147,6 +147,9 @@ class Chart
     /** @var bool */
     private $noFill = false;
 
+    /** @var bool */
+    private $roundedCorners = false;
+
     /**
      * Create a new Chart.
      * majorGridlines and minorGridlines are deprecated, moved to Axis.
@@ -762,4 +765,16 @@ class Chart
 
         return $this;
     }
+
+    public function getRoundedCorners(): bool
+    {
+        return $this->roundedCorners;
+    }
+
+    public function setRoundedCorners(bool $roundedCorners): self
+    {
+        $this->roundedCorners = $roundedCorners;
+
+        return $this;
+    }
 }
diff --git a/src/PhpSpreadsheet/Chart/DataSeriesValues.php b/src/PhpSpreadsheet/Chart/DataSeriesValues.php
index cb5fa742..7d29e9c4 100644
--- a/src/PhpSpreadsheet/Chart/DataSeriesValues.php
+++ b/src/PhpSpreadsheet/Chart/DataSeriesValues.php
@@ -88,6 +88,9 @@ class DataSeriesValues extends Properties
     /** @var ?Layout */
     private $labelLayout;
 
+    /** @var TrendLine[] */
+    private $trendLines = [];
+
     /**
      * Create a new DataSeriesValues object.
      *
@@ -577,4 +580,16 @@ class DataSeriesValues extends Properties
 
         return $this;
     }
+
+    public function setTrendLines(array $trendLines): self
+    {
+        $this->trendLines = $trendLines;
+
+        return $this;
+    }
+
+    public function getTrendLines(): array
+    {
+        return $this->trendLines;
+    }
 }
diff --git a/src/PhpSpreadsheet/Chart/TrendLine.php b/src/PhpSpreadsheet/Chart/TrendLine.php
new file mode 100644
index 00000000..e177f819
--- /dev/null
+++ b/src/PhpSpreadsheet/Chart/TrendLine.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Chart;
+
+class TrendLine extends Properties
+{
+    const TRENDLINE_EXPONENTIAL = 'exp';
+    const TRENDLINE_LINEAR = 'linear';
+    const TRENDLINE_LOGARITHMIC = 'log';
+    const TRENDLINE_POLYNOMIAL = 'poly'; // + 'order'
+    const TRENDLINE_POWER = 'power';
+    const TRENDLINE_MOVING_AVG = 'movingAvg'; // + 'period'
+    const TRENDLINE_TYPES = [
+        self::TRENDLINE_EXPONENTIAL,
+        self::TRENDLINE_LINEAR,
+        self::TRENDLINE_LOGARITHMIC,
+        self::TRENDLINE_POLYNOMIAL,
+        self::TRENDLINE_POWER,
+        self::TRENDLINE_MOVING_AVG,
+    ];
+
+    /** @var string */
+    private $trendLineType = 'linear'; // TRENDLINE_LINEAR
+
+    /** @var int */
+    private $order = 2;
+
+    /** @var int */
+    private $period = 3;
+
+    /** @var bool */
+    private $dispRSqr = false;
+
+    /** @var bool */
+    private $dispEq = false;
+
+    /**
+     * Create a new TrendLine object.
+     */
+    public function __construct(string $trendLineType = '', ?int $order = null, ?int $period = null, bool $dispRSqr = false, bool $dispEq = false)
+    {
+        parent::__construct();
+        $this->setTrendLineProperties($trendLineType, $order, $period, $dispRSqr, $dispEq);
+    }
+
+    public function getTrendLineType(): string
+    {
+        return $this->trendLineType;
+    }
+
+    public function setTrendLineType(string $trendLineType): self
+    {
+        $this->trendLineType = $trendLineType;
+
+        return $this;
+    }
+
+    public function getOrder(): int
+    {
+        return $this->order;
+    }
+
+    public function setOrder(int $order): self
+    {
+        $this->order = $order;
+
+        return $this;
+    }
+
+    public function getPeriod(): int
+    {
+        return $this->period;
+    }
+
+    public function setPeriod(int $period): self
+    {
+        $this->period = $period;
+
+        return $this;
+    }
+
+    public function getDispRSqr(): bool
+    {
+        return $this->dispRSqr;
+    }
+
+    public function setDispRSqr(bool $dispRSqr): self
+    {
+        $this->dispRSqr = $dispRSqr;
+
+        return $this;
+    }
+
+    public function getDispEq(): bool
+    {
+        return $this->dispEq;
+    }
+
+    public function setDispEq(bool $dispEq): self
+    {
+        $this->dispEq = $dispEq;
+
+        return $this;
+    }
+
+    public function setTrendLineProperties(?string $trendLineType = null, ?int $order = 0, ?int $period = 0, ?bool $dispRSqr = false, ?bool $dispEq = false): self
+    {
+        if (!empty($trendLineType)) {
+            $this->setTrendLineType($trendLineType);
+        }
+        if ($order !== null) {
+            $this->setOrder($order);
+        }
+        if ($period !== null) {
+            $this->setPeriod($period);
+        }
+        if ($dispRSqr !== null) {
+            $this->setDispRSqr($dispRSqr);
+        }
+        if ($dispEq !== null) {
+            $this->setDispEq($dispEq);
+        }
+
+        return $this;
+    }
+}
diff --git a/src/PhpSpreadsheet/Reader/Xlsx/Chart.php b/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
index e7314d0b..dab2b410 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
@@ -13,6 +13,7 @@ use PhpOffice\PhpSpreadsheet\Chart\Legend;
 use PhpOffice\PhpSpreadsheet\Chart\PlotArea;
 use PhpOffice\PhpSpreadsheet\Chart\Properties;
 use PhpOffice\PhpSpreadsheet\Chart\Title;
+use PhpOffice\PhpSpreadsheet\Chart\TrendLine;
 use PhpOffice\PhpSpreadsheet\RichText\RichText;
 use PhpOffice\PhpSpreadsheet\Style\Font;
 use SimpleXMLElement;
@@ -76,6 +77,7 @@ class Chart
         $chartNoFill = false;
         $gradientArray = [];
         $gradientLin = null;
+        $roundedCorners = false;
         foreach ($chartElementsC as $chartElementKey => $chartElement) {
             switch ($chartElementKey) {
                 case 'spPr':
@@ -84,6 +86,11 @@ class Chart
                         $chartNoFill = true;
                     }
 
+                    break;
+                case 'roundedCorners':
+                    /** @var bool */
+                    $roundedCorners = self::getAttribute($chartElementsC->roundedCorners, 'val', 'boolean');
+
                     break;
                 case 'chart':
                     foreach ($chartElement as $chartDetailsKey => $chartDetails) {
@@ -370,6 +377,7 @@ class Chart
         if ($chartNoFill) {
             $chart->setNoFill(true);
         }
+        $chart->setRoundedCorners($roundedCorners);
         if (is_bool($autoTitleDeleted)) {
             $chart->setAutoTitleDeleted($autoTitleDeleted);
         }
@@ -466,6 +474,7 @@ class Chart
                     $markerBorderColor = null;
                     $lineStyle = null;
                     $labelLayout = null;
+                    $trendLines = [];
                     foreach ($seriesDetails as $seriesKey => $seriesDetail) {
                         switch ($seriesKey) {
                             case 'idx':
@@ -513,6 +522,23 @@ class Chart
                                     }
                                 }
 
+                                break;
+                            case 'trendline':
+                                $trendLine = new TrendLine();
+                                $this->readLineStyle($seriesDetail, $trendLine);
+                                /** @var ?string */
+                                $trendLineType = self::getAttribute($seriesDetail->trendlineType, 'val', 'string');
+                                /** @var ?bool */
+                                $dispRSqr = self::getAttribute($seriesDetail->dispRSqr, 'val', 'boolean');
+                                /** @var ?bool */
+                                $dispEq = self::getAttribute($seriesDetail->dispEq, 'val', 'boolean');
+                                /** @var ?int */
+                                $order = self::getAttribute($seriesDetail->order, 'val', 'integer');
+                                /** @var ?int */
+                                $period = self::getAttribute($seriesDetail->period, 'val', 'integer');
+                                $trendLine->setTrendLineProperties($trendLineType, $order, $period, $dispRSqr, $dispEq);
+                                $trendLines[] = $trendLine;
+
                                 break;
                             case 'marker':
                                 $marker = self::getAttribute($seriesDetail->symbol, 'val', 'string');
@@ -651,6 +677,17 @@ class Chart
                             $seriesValues[$seriesIndex]->setSmoothLine(true);
                         }
                     }
+                    if (!empty($trendLines)) {
+                        if (isset($seriesLabel[$seriesIndex])) {
+                            $seriesLabel[$seriesIndex]->setTrendLines($trendLines);
+                        }
+                        if (isset($seriesCategory[$seriesIndex])) {
+                            $seriesCategory[$seriesIndex]->setTrendLines($trendLines);
+                        }
+                        if (isset($seriesValues[$seriesIndex])) {
+                            $seriesValues[$seriesIndex]->setTrendLines($trendLines);
+                        }
+                    }
             }
         }
         /** @phpstan-ignore-next-line */
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Chart.php b/src/PhpSpreadsheet/Writer/Xlsx/Chart.php
index 278b64e7..ad746a0a 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/Chart.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/Chart.php
@@ -11,6 +11,7 @@ use PhpOffice\PhpSpreadsheet\Chart\Legend;
 use PhpOffice\PhpSpreadsheet\Chart\PlotArea;
 use PhpOffice\PhpSpreadsheet\Chart\Properties;
 use PhpOffice\PhpSpreadsheet\Chart\Title;
+use PhpOffice\PhpSpreadsheet\Chart\TrendLine;
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
 use PhpOffice\PhpSpreadsheet\Writer\Exception as WriterException;
 
@@ -58,7 +59,7 @@ class Chart extends WriterPart
         $objWriter->writeAttribute('val', 'en-GB');
         $objWriter->endElement();
         $objWriter->startElement('c:roundedCorners');
-        $objWriter->writeAttribute('val', '0');
+        $objWriter->writeAttribute('val', $chart->getRoundedCorners() ? '1' : '0');
         $objWriter->endElement();
 
         $this->writeAlternateContent($objWriter);
@@ -1123,6 +1124,65 @@ class Chart extends WriterPart
                 $objWriter->writeAttribute('val', '0');
                 $objWriter->endElement();
             }
+            // Trendlines
+            if ($plotSeriesValues !== false) {
+                foreach ($plotSeriesValues->getTrendLines() as $trendLine) {
+                    $trendLineType = $trendLine->getTrendLineType();
+                    $order = $trendLine->getOrder();
+                    $period = $trendLine->getPeriod();
+                    $dispRSqr = $trendLine->getDispRSqr();
+                    $dispEq = $trendLine->getDispEq();
+                    $trendLineColor = $trendLine->getLineColor(); // ChartColor
+                    $trendLineWidth = $trendLine->getLineStyleProperty('width');
+
+                    $objWriter->startElement('c:trendline'); // N.B. lowercase 'ell'
+                    $objWriter->startElement('c:spPr');
+
+                    if (!$trendLineColor->isUsable()) {
+                        // use dataSeriesValues line color as a backup if $trendLineColor is null
+                        $dsvLineColor = $plotSeriesValues->getLineColor();
+                        if ($dsvLineColor->isUsable()) {
+                            $trendLine
+                                ->getLineColor()
+                                ->setColorProperties($dsvLineColor->getValue(), $dsvLineColor->getAlpha(), $dsvLineColor->getType());
+                        }
+                    } // otherwise, hope Excel does the right thing
+
+                    $this->writeLineStyles($objWriter, $trendLine, false); // suppress noFill
+
+                    $objWriter->endElement(); // spPr
+
+                    $objWriter->startElement('c:trendlineType'); // N.B lowercase 'ell'
+                    $objWriter->writeAttribute('val', $trendLineType);
+                    $objWriter->endElement(); // trendlineType
+                    if ($trendLineType == TrendLine::TRENDLINE_POLYNOMIAL) {
+                        $objWriter->startElement('c:order');
+                        $objWriter->writeAttribute('val', $order);
+                        $objWriter->endElement(); // order
+                    }
+                    if ($trendLineType == TrendLine::TRENDLINE_MOVING_AVG) {
+                        $objWriter->startElement('c:period');
+                        $objWriter->writeAttribute('val', $period);
+                        $objWriter->endElement(); // period
+                    }
+                    $objWriter->startElement('c:dispRSqr');
+                    $objWriter->writeAttribute('val', $dispRSqr ? '1' : '0');
+                    $objWriter->endElement();
+                    $objWriter->startElement('c:dispEq');
+                    $objWriter->writeAttribute('val', $dispEq ? '1' : '0');
+                    $objWriter->endElement();
+                    if ($groupType === DataSeries::TYPE_SCATTERCHART || $groupType === DataSeries::TYPE_LINECHART) {
+                        $objWriter->startElement('c:trendlineLbl');
+                        $objWriter->startElement('c:numFmt');
+                        $objWriter->writeAttribute('formatCode', 'General');
+                        $objWriter->writeAttribute('sourceLinked', '0');
+                        $objWriter->endElement();  // numFmt
+                        $objWriter->endElement();  // trendlineLbl
+                    }
+
+                    $objWriter->endElement(); // trendline
+                }
+            }
 
             //    Category Labels
             $plotSeriesCategory = $plotGroup->getPlotCategoryByIndex($plotSeriesIdx);
diff --git a/tests/PhpSpreadsheetTests/Chart/RoundedCornersTest.php b/tests/PhpSpreadsheetTests/Chart/RoundedCornersTest.php
new file mode 100644
index 00000000..93bbaa23
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Chart/RoundedCornersTest.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Chart;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx as XlsxReader;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx as XlsxWriter;
+use PhpOffice\PhpSpreadsheetTests\Functional\AbstractFunctional;
+
+class RoundedCornersTest extends AbstractFunctional
+{
+    private const DIRECTORY = 'samples' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR;
+
+    public function readCharts(XlsxReader $reader): void
+    {
+        $reader->setIncludeCharts(true);
+    }
+
+    public function writeCharts(XlsxWriter $writer): void
+    {
+        $writer->setIncludeCharts(true);
+    }
+
+    public function testRounded(): void
+    {
+        $file = self::DIRECTORY . '32readwriteAreaChart1.xlsx';
+        $reader = new XlsxReader();
+        $reader->setIncludeCharts(true);
+        $spreadsheet = $reader->load($file);
+        $sheet = $spreadsheet->getActiveSheet();
+        self::assertSame(1, $sheet->getChartCount());
+        /** @var callable */
+        $callableReader = [$this, 'readCharts'];
+        /** @var callable */
+        $callableWriter = [$this, 'writeCharts'];
+        $reloadedSpreadsheet = $this->writeAndReload($spreadsheet, 'Xlsx', $callableReader, $callableWriter);
+        $spreadsheet->disconnectWorksheets();
+
+        $sheet = $reloadedSpreadsheet->getActiveSheet();
+        self::assertSame('Data', $sheet->getTitle());
+        $charts = $sheet->getChartCollection();
+        self::assertCount(1, $charts);
+        $chart = $charts[0];
+        self::assertNotNull($chart);
+        self::assertTrue($chart->getRoundedCorners());
+
+        $reloadedSpreadsheet->disconnectWorksheets();
+    }
+
+    public function testNotRounded(): void
+    {
+        $file = self::DIRECTORY . '32readwriteAreaChart2.xlsx';
+        $reader = new XlsxReader();
+        $reader->setIncludeCharts(true);
+        $spreadsheet = $reader->load($file);
+        $sheet = $spreadsheet->getActiveSheet();
+        self::assertSame(1, $sheet->getChartCount());
+        /** @var callable */
+        $callableReader = [$this, 'readCharts'];
+        /** @var callable */
+        $callableWriter = [$this, 'writeCharts'];
+        $reloadedSpreadsheet = $this->writeAndReload($spreadsheet, 'Xlsx', $callableReader, $callableWriter);
+        $spreadsheet->disconnectWorksheets();
+
+        $sheet = $reloadedSpreadsheet->getActiveSheet();
+        self::assertSame('Data', $sheet->getTitle());
+        $charts = $sheet->getChartCollection();
+        self::assertCount(1, $charts);
+        $chart = $charts[0];
+        self::assertNotNull($chart);
+        self::assertFalse($chart->getRoundedCorners());
+
+        $reloadedSpreadsheet->disconnectWorksheets();
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Chart/TrendLineTest.php b/tests/PhpSpreadsheetTests/Chart/TrendLineTest.php
new file mode 100644
index 00000000..c8550d83
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Chart/TrendLineTest.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Chart;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx as XlsxReader;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx as XlsxWriter;
+use PhpOffice\PhpSpreadsheetTests\Functional\AbstractFunctional;
+
+class TrendLineTest extends AbstractFunctional
+{
+    private const DIRECTORY = 'samples' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR;
+
+    public function readCharts(XlsxReader $reader): void
+    {
+        $reader->setIncludeCharts(true);
+    }
+
+    public function writeCharts(XlsxWriter $writer): void
+    {
+        $writer->setIncludeCharts(true);
+    }
+
+    public function testTrendLine(): void
+    {
+        $file = self::DIRECTORY . '32readwriteScatterChartTrendlines1.xlsx';
+        $reader = new XlsxReader();
+        $reader->setIncludeCharts(true);
+        $spreadsheet = $reader->load($file);
+        $sheet = $spreadsheet->getSheet(1);
+        self::assertSame(2, $sheet->getChartCount());
+        /** @var callable */
+        $callableReader = [$this, 'readCharts'];
+        /** @var callable */
+        $callableWriter = [$this, 'writeCharts'];
+        $reloadedSpreadsheet = $this->writeAndReload($spreadsheet, 'Xlsx', $callableReader, $callableWriter);
+        $spreadsheet->disconnectWorksheets();
+
+        $sheet = $reloadedSpreadsheet->getSheet(1);
+        self::assertSame('Scatter Chart', $sheet->getTitle());
+        $charts = $sheet->getChartCollection();
+        self::assertCount(2, $charts);
+
+        $chart = $charts[0];
+        self::assertNotNull($chart);
+        $plotArea = $chart->getPlotArea();
+        self::assertNotNull($plotArea);
+        $plotSeriesArray = $plotArea->getPlotGroup();
+        self::assertCount(1, $plotSeriesArray);
+        $plotSeries = $plotSeriesArray[0];
+        $valuesArray = $plotSeries->getPlotValues();
+        self::assertCount(3, $valuesArray);
+        self::assertEmpty($valuesArray[0]->getTrendLines());
+        self::assertEmpty($valuesArray[1]->getTrendLines());
+        self::assertEmpty($valuesArray[2]->getTrendLines());
+
+        $chart = $charts[1];
+        self::assertNotNull($chart);
+        $plotArea = $chart->getPlotArea();
+        self::assertNotNull($plotArea);
+        $plotSeriesArray = $plotArea->getPlotGroup();
+        self::assertCount(1, $plotSeriesArray);
+        $plotSeries = $plotSeriesArray[0];
+        $valuesArray = $plotSeries->getPlotValues();
+        self::assertCount(1, $valuesArray);
+        $trendLines = $valuesArray[0]->getTrendLines();
+        self::assertCount(3, $trendLines);
+
+        $trendLine = $trendLines[0];
+        self::assertSame('linear', $trendLine->getTrendLineType());
+        self::assertFalse($trendLine->getDispRSqr());
+        self::assertFalse($trendLine->getDispEq());
+        $lineColor = $trendLine->getLineColor();
+        self::assertSame('accent4', $lineColor->getValue());
+        self::assertSame('stealth', $trendLine->getLineStyleProperty(['arrow', 'head', 'type']));
+        self::assertEquals(0.5, $trendLine->getLineStyleProperty('width'));
+
+        $trendLine = $trendLines[1];
+        self::assertSame('poly', $trendLine->getTrendLineType());
+        self::assertTrue($trendLine->getDispRSqr());
+        self::assertTrue($trendLine->getDispEq());
+        $lineColor = $trendLine->getLineColor();
+        self::assertSame('accent3', $lineColor->getValue());
+        self::assertNull($trendLine->getLineStyleProperty(['arrow', 'head', 'type']));
+        self::assertEquals(1.25, $trendLine->getLineStyleProperty('width'));
+
+        $trendLine = $trendLines[2];
+        self::assertSame('movingAvg', $trendLine->getTrendLineType());
+        self::assertTrue($trendLine->getDispRSqr());
+        self::assertFalse($trendLine->getDispEq());
+        $lineColor = $trendLine->getLineColor();
+        self::assertSame('accent2', $lineColor->getValue());
+        self::assertNull($trendLine->getLineStyleProperty(['arrow', 'head', 'type']));
+        self::assertEquals(1.5, $trendLine->getLineStyleProperty('width'));
+
+        $reloadedSpreadsheet->disconnectWorksheets();
+    }
+}

From b65ff9f20db047b10051911a4378a576c2133d13 Mon Sep 17 00:00:00 2001
From: Mikhail Oleynik <m.oleynik@gmail.com>
Date: Sun, 7 Aug 2022 14:50:38 +0300
Subject: [PATCH 18/69] MtJpGraph support added (#2979)

https://github.com/PHPOffice/PhpSpreadsheet/pull/2979

Co-authored-by: Mikhail Oleynik <mishutka@mito-team.com>
---
 CHANGELOG.md                                  |   2 +
 README.md                                     |  12 +-
 phpstan.neon.dist                             |   2 +
 src/PhpSpreadsheet/Chart/Renderer/JpGraph.php | 862 +-----------------
 .../Chart/Renderer/JpGraphRendererBase.php    | 861 +++++++++++++++++
 .../Chart/Renderer/MtJpGraphRenderer.php      |  38 +
 .../Chart/Renderer/PHP Charting Libraries.txt |   7 +-
 7 files changed, 924 insertions(+), 860 deletions(-)
 create mode 100644 src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php
 create mode 100644 src/PhpSpreadsheet/Chart/Renderer/MtJpGraphRenderer.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99a39a2c..00167722 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 - Implementation of the new `TEXTBEFORE()`, `TEXTAFTER()` and `TEXTSPLIT()` Excel Functions
 - Implementation of the `ARRAYTOTEXT()` Excel Function
+- Support for [mitoteam/jpgraph](https://packagist.org/packages/mitoteam/jpgraph) implementation of
+  JpGraph library to render charts added.
 
 ### Changed
 
diff --git a/README.md b/README.md
index b292715e..dd712bff 100644
--- a/README.md
+++ b/README.md
@@ -71,16 +71,18 @@ or the appropriate PDF Writer wrapper for the library that you have chosen to in
 
 #### Chart Export
 
-For Chart export, we support, which you will also need to install yourself
- - jpgraph/jpgraph
+For Chart export, we support following packages, which you will also need to install yourself using `composer require`
+ - [jpgraph/jpgraph](https://packagist.org/packages/jpgraph/jpgraph) (this package was abandoned at version 4.0. 
+   You can manually download the latest version that supports PHP 8 and above from [jpgraph.net](https://jpgraph.net/))
+ - [mitoteam/jpgraph](https://packagist.org/packages/mitoteam/jpgraph) (fork with php 8.1 support)
 
 and then configure PhpSpreadsheet using:
 ```php
-Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\JpGraph::class);
+Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\JpGraph::class); // to use jpgraph/jpgraph
+//or
+Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\MtJpGraphRenderer::class); // to use mitoteam/jpgraph
 ```
 
-You can `composer/require` the github version of jpgraph, but this was abandoned at version 4.0; or manually download the latest version that supports PHP 8 and above from [jpgraph.net](https://jpgraph.net/)
-
 ## Documentation
 
 Read more about it, including install instructions, in the [official documentation](https://phpspreadsheet.readthedocs.io). Or check out the [API documentation](https://phpoffice.github.io/PhpSpreadsheet).
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 61672b28..92767872 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -11,6 +11,8 @@ parameters:
         - tests/
     excludePaths:
         - src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
+        - src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php
+        - src/PhpSpreadsheet/Chart/Renderer/MtJpGraphRenderer.php
     parallel:
         processTimeout: 300.0
     checkMissingIterableValueType: false
diff --git a/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php b/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
index b276707d..0b0164b4 100644
--- a/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
+++ b/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
@@ -2,68 +2,20 @@
 
 namespace PhpOffice\PhpSpreadsheet\Chart\Renderer;
 
-use AccBarPlot;
-use AccLinePlot;
-use BarPlot;
-use ContourPlot;
-use Graph;
-use GroupBarPlot;
-use LinePlot;
-use PhpOffice\PhpSpreadsheet\Chart\Chart;
-use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
-use PieGraph;
-use PiePlot;
-use PiePlot3D;
-use PiePlotC;
-use RadarGraph;
-use RadarPlot;
-use ScatterPlot;
-use Spline;
-use StockPlot;
-
 /**
- * Jpgraph is not maintained in Composer, and the version there
- * is extremely out of date. For that reason, all unit test
- * requiring Jpgraph are skipped. So, do not measure
- * code coverage for this class till that is fixed.
+ * Jpgraph is not oficially maintained in Composer, so the version there
+ * could be out of date. For that reason, all unit test requiring Jpgraph
+ * are skipped. So, do not measure code coverage for this class till that
+ * is fixed.
+ *
+ * This implementation uses abandoned package
+ * https://packagist.org/packages/jpgraph/jpgraph
  *
  * @codeCoverageIgnore
  */
-class JpGraph implements IRenderer
+class JpGraph extends JpGraphRendererBase
 {
-    private static $width = 640;
-
-    private static $height = 480;
-
-    private static $colourSet = [
-        'mediumpurple1', 'palegreen3', 'gold1', 'cadetblue1',
-        'darkmagenta', 'coral', 'dodgerblue3', 'eggplant',
-        'mediumblue', 'magenta', 'sandybrown', 'cyan',
-        'firebrick1', 'forestgreen', 'deeppink4', 'darkolivegreen',
-        'goldenrod2',
-    ];
-
-    private static $markSet;
-
-    private $chart;
-
-    private $graph;
-
-    private static $plotColour = 0;
-
-    private static $plotMark = 0;
-
-    /**
-     * Create a new jpgraph.
-     */
-    public function __construct(Chart $chart)
-    {
-        self::init();
-        $this->graph = null;
-        $this->chart = $chart;
-    }
-
-    private static function init(): void
+    protected static function init(): void
     {
         static $loaded = false;
         if ($loaded) {
@@ -81,802 +33,6 @@ class JpGraph implements IRenderer
         \JpGraph\JpGraph::module('scatter');
         \JpGraph\JpGraph::module('stock');
 
-        self::$markSet = [
-            'diamond' => MARK_DIAMOND,
-            'square' => MARK_SQUARE,
-            'triangle' => MARK_UTRIANGLE,
-            'x' => MARK_X,
-            'star' => MARK_STAR,
-            'dot' => MARK_FILLEDCIRCLE,
-            'dash' => MARK_DTRIANGLE,
-            'circle' => MARK_CIRCLE,
-            'plus' => MARK_CROSS,
-        ];
-
         $loaded = true;
     }
-
-    private function formatPointMarker($seriesPlot, $markerID)
-    {
-        $plotMarkKeys = array_keys(self::$markSet);
-        if ($markerID === null) {
-            //    Use default plot marker (next marker in the series)
-            self::$plotMark %= count(self::$markSet);
-            $seriesPlot->mark->SetType(self::$markSet[$plotMarkKeys[self::$plotMark++]]);
-        } elseif ($markerID !== 'none') {
-            //    Use specified plot marker (if it exists)
-            if (isset(self::$markSet[$markerID])) {
-                $seriesPlot->mark->SetType(self::$markSet[$markerID]);
-            } else {
-                //    If the specified plot marker doesn't exist, use default plot marker (next marker in the series)
-                self::$plotMark %= count(self::$markSet);
-                $seriesPlot->mark->SetType(self::$markSet[$plotMarkKeys[self::$plotMark++]]);
-            }
-        } else {
-            //    Hide plot marker
-            $seriesPlot->mark->Hide();
-        }
-        $seriesPlot->mark->SetColor(self::$colourSet[self::$plotColour]);
-        $seriesPlot->mark->SetFillColor(self::$colourSet[self::$plotColour]);
-        $seriesPlot->SetColor(self::$colourSet[self::$plotColour++]);
-
-        return $seriesPlot;
-    }
-
-    private function formatDataSetLabels($groupID, $datasetLabels, $labelCount, $rotation = '')
-    {
-        $datasetLabelFormatCode = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getFormatCode();
-        if ($datasetLabelFormatCode !== null) {
-            //    Retrieve any label formatting code
-            $datasetLabelFormatCode = stripslashes($datasetLabelFormatCode);
-        }
-
-        $testCurrentIndex = 0;
-        foreach ($datasetLabels as $i => $datasetLabel) {
-            if (is_array($datasetLabel)) {
-                if ($rotation == 'bar') {
-                    $datasetLabels[$i] = implode(' ', $datasetLabel);
-                } else {
-                    $datasetLabel = array_reverse($datasetLabel);
-                    $datasetLabels[$i] = implode("\n", $datasetLabel);
-                }
-            } else {
-                //    Format labels according to any formatting code
-                if ($datasetLabelFormatCode !== null) {
-                    $datasetLabels[$i] = NumberFormat::toFormattedString($datasetLabel, $datasetLabelFormatCode);
-                }
-            }
-            ++$testCurrentIndex;
-        }
-
-        return $datasetLabels;
-    }
-
-    private function percentageSumCalculation($groupID, $seriesCount)
-    {
-        $sumValues = [];
-        //    Adjust our values to a percentage value across all series in the group
-        for ($i = 0; $i < $seriesCount; ++$i) {
-            if ($i == 0) {
-                $sumValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
-            } else {
-                $nextValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
-                foreach ($nextValues as $k => $value) {
-                    if (isset($sumValues[$k])) {
-                        $sumValues[$k] += $value;
-                    } else {
-                        $sumValues[$k] = $value;
-                    }
-                }
-            }
-        }
-
-        return $sumValues;
-    }
-
-    private function percentageAdjustValues($dataValues, $sumValues)
-    {
-        foreach ($dataValues as $k => $dataValue) {
-            $dataValues[$k] = $dataValue / $sumValues[$k] * 100;
-        }
-
-        return $dataValues;
-    }
-
-    private function getCaption($captionElement)
-    {
-        //    Read any caption
-        $caption = ($captionElement !== null) ? $captionElement->getCaption() : null;
-        //    Test if we have a title caption to display
-        if ($caption !== null) {
-            //    If we do, it could be a plain string or an array
-            if (is_array($caption)) {
-                //    Implode an array to a plain string
-                $caption = implode('', $caption);
-            }
-        }
-
-        return $caption;
-    }
-
-    private function renderTitle(): void
-    {
-        $title = $this->getCaption($this->chart->getTitle());
-        if ($title !== null) {
-            $this->graph->title->Set($title);
-        }
-    }
-
-    private function renderLegend(): void
-    {
-        $legend = $this->chart->getLegend();
-        if ($legend !== null) {
-            $legendPosition = $legend->getPosition();
-            switch ($legendPosition) {
-                case 'r':
-                    $this->graph->legend->SetPos(0.01, 0.5, 'right', 'center'); //    right
-                    $this->graph->legend->SetColumns(1);
-
-                    break;
-                case 'l':
-                    $this->graph->legend->SetPos(0.01, 0.5, 'left', 'center'); //    left
-                    $this->graph->legend->SetColumns(1);
-
-                    break;
-                case 't':
-                    $this->graph->legend->SetPos(0.5, 0.01, 'center', 'top'); //    top
-
-                    break;
-                case 'b':
-                    $this->graph->legend->SetPos(0.5, 0.99, 'center', 'bottom'); //    bottom
-
-                    break;
-                default:
-                    $this->graph->legend->SetPos(0.01, 0.01, 'right', 'top'); //    top-right
-                    $this->graph->legend->SetColumns(1);
-
-                    break;
-            }
-        } else {
-            $this->graph->legend->Hide();
-        }
-    }
-
-    private function renderCartesianPlotArea($type = 'textlin'): void
-    {
-        $this->graph = new Graph(self::$width, self::$height);
-        $this->graph->SetScale($type);
-
-        $this->renderTitle();
-
-        //    Rotate for bar rather than column chart
-        $rotation = $this->chart->getPlotArea()->getPlotGroupByIndex(0)->getPlotDirection();
-        $reverse = $rotation == 'bar';
-
-        $xAxisLabel = $this->chart->getXAxisLabel();
-        if ($xAxisLabel !== null) {
-            $title = $this->getCaption($xAxisLabel);
-            if ($title !== null) {
-                $this->graph->xaxis->SetTitle($title, 'center');
-                $this->graph->xaxis->title->SetMargin(35);
-                if ($reverse) {
-                    $this->graph->xaxis->title->SetAngle(90);
-                    $this->graph->xaxis->title->SetMargin(90);
-                }
-            }
-        }
-
-        $yAxisLabel = $this->chart->getYAxisLabel();
-        if ($yAxisLabel !== null) {
-            $title = $this->getCaption($yAxisLabel);
-            if ($title !== null) {
-                $this->graph->yaxis->SetTitle($title, 'center');
-                if ($reverse) {
-                    $this->graph->yaxis->title->SetAngle(0);
-                    $this->graph->yaxis->title->SetMargin(-55);
-                }
-            }
-        }
-    }
-
-    private function renderPiePlotArea(): void
-    {
-        $this->graph = new PieGraph(self::$width, self::$height);
-
-        $this->renderTitle();
-    }
-
-    private function renderRadarPlotArea(): void
-    {
-        $this->graph = new RadarGraph(self::$width, self::$height);
-        $this->graph->SetScale('lin');
-
-        $this->renderTitle();
-    }
-
-    private function renderPlotLine($groupID, $filled = false, $combination = false, $dimensions = '2d'): void
-    {
-        $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
-
-        $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount();
-        if ($labelCount > 0) {
-            $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
-            $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels, $labelCount);
-            $this->graph->xaxis->SetTickLabels($datasetLabels);
-        }
-
-        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-        $seriesPlots = [];
-        if ($grouping == 'percentStacked') {
-            $sumValues = $this->percentageSumCalculation($groupID, $seriesCount);
-        } else {
-            $sumValues = [];
-        }
-
-        //    Loop through each data series in turn
-        for ($i = 0; $i < $seriesCount; ++$i) {
-            $dataValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
-            $marker = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
-
-            if ($grouping == 'percentStacked') {
-                $dataValues = $this->percentageAdjustValues($dataValues, $sumValues);
-            }
-
-            //    Fill in any missing values in the $dataValues array
-            $testCurrentIndex = 0;
-            foreach ($dataValues as $k => $dataValue) {
-                while ($k != $testCurrentIndex) {
-                    $dataValues[$testCurrentIndex] = null;
-                    ++$testCurrentIndex;
-                }
-                ++$testCurrentIndex;
-            }
-
-            $seriesPlot = new LinePlot($dataValues);
-            if ($combination) {
-                $seriesPlot->SetBarCenter();
-            }
-
-            if ($filled) {
-                $seriesPlot->SetFilled(true);
-                $seriesPlot->SetColor('black');
-                $seriesPlot->SetFillColor(self::$colourSet[self::$plotColour++]);
-            } else {
-                //    Set the appropriate plot marker
-                $this->formatPointMarker($seriesPlot, $marker);
-            }
-            $dataLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($i)->getDataValue();
-            $seriesPlot->SetLegend($dataLabel);
-
-            $seriesPlots[] = $seriesPlot;
-        }
-
-        if ($grouping == 'standard') {
-            $groupPlot = $seriesPlots;
-        } else {
-            $groupPlot = new AccLinePlot($seriesPlots);
-        }
-        $this->graph->Add($groupPlot);
-    }
-
-    private function renderPlotBar($groupID, $dimensions = '2d'): void
-    {
-        $rotation = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotDirection();
-        //    Rotate for bar rather than column chart
-        if (($groupID == 0) && ($rotation == 'bar')) {
-            $this->graph->Set90AndMargin();
-        }
-        $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
-
-        $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount();
-        if ($labelCount > 0) {
-            $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
-            $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels, $labelCount, $rotation);
-            //    Rotate for bar rather than column chart
-            if ($rotation == 'bar') {
-                $datasetLabels = array_reverse($datasetLabels);
-                $this->graph->yaxis->SetPos('max');
-                $this->graph->yaxis->SetLabelAlign('center', 'top');
-                $this->graph->yaxis->SetLabelSide(SIDE_RIGHT);
-            }
-            $this->graph->xaxis->SetTickLabels($datasetLabels);
-        }
-
-        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-        $seriesPlots = [];
-        if ($grouping == 'percentStacked') {
-            $sumValues = $this->percentageSumCalculation($groupID, $seriesCount);
-        } else {
-            $sumValues = [];
-        }
-
-        //    Loop through each data series in turn
-        for ($j = 0; $j < $seriesCount; ++$j) {
-            $dataValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($j)->getDataValues();
-            if ($grouping == 'percentStacked') {
-                $dataValues = $this->percentageAdjustValues($dataValues, $sumValues);
-            }
-
-            //    Fill in any missing values in the $dataValues array
-            $testCurrentIndex = 0;
-            foreach ($dataValues as $k => $dataValue) {
-                while ($k != $testCurrentIndex) {
-                    $dataValues[$testCurrentIndex] = null;
-                    ++$testCurrentIndex;
-                }
-                ++$testCurrentIndex;
-            }
-
-            //    Reverse the $dataValues order for bar rather than column chart
-            if ($rotation == 'bar') {
-                $dataValues = array_reverse($dataValues);
-            }
-            $seriesPlot = new BarPlot($dataValues);
-            $seriesPlot->SetColor('black');
-            $seriesPlot->SetFillColor(self::$colourSet[self::$plotColour++]);
-            if ($dimensions == '3d') {
-                $seriesPlot->SetShadow();
-            }
-            if (!$this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($j)) {
-                $dataLabel = '';
-            } else {
-                $dataLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($j)->getDataValue();
-            }
-            $seriesPlot->SetLegend($dataLabel);
-
-            $seriesPlots[] = $seriesPlot;
-        }
-        //    Reverse the plot order for bar rather than column chart
-        if (($rotation == 'bar') && ($grouping != 'percentStacked')) {
-            $seriesPlots = array_reverse($seriesPlots);
-        }
-
-        if ($grouping == 'clustered') {
-            $groupPlot = new GroupBarPlot($seriesPlots);
-        } elseif ($grouping == 'standard') {
-            $groupPlot = new GroupBarPlot($seriesPlots);
-        } else {
-            $groupPlot = new AccBarPlot($seriesPlots);
-            if ($dimensions == '3d') {
-                $groupPlot->SetShadow();
-            }
-        }
-
-        $this->graph->Add($groupPlot);
-    }
-
-    private function renderPlotScatter($groupID, $bubble): void
-    {
-        $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
-        $scatterStyle = $bubbleSize = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
-
-        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-        $seriesPlots = [];
-
-        //    Loop through each data series in turn
-        for ($i = 0; $i < $seriesCount; ++$i) {
-            $dataValuesY = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
-            $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
-
-            foreach ($dataValuesY as $k => $dataValueY) {
-                $dataValuesY[$k] = $k;
-            }
-
-            $seriesPlot = new ScatterPlot($dataValuesX, $dataValuesY);
-            if ($scatterStyle == 'lineMarker') {
-                $seriesPlot->SetLinkPoints();
-                $seriesPlot->link->SetColor(self::$colourSet[self::$plotColour]);
-            } elseif ($scatterStyle == 'smoothMarker') {
-                $spline = new Spline($dataValuesY, $dataValuesX);
-                [$splineDataY, $splineDataX] = $spline->Get(count($dataValuesX) * self::$width / 20);
-                $lplot = new LinePlot($splineDataX, $splineDataY);
-                $lplot->SetColor(self::$colourSet[self::$plotColour]);
-
-                $this->graph->Add($lplot);
-            }
-
-            if ($bubble) {
-                $this->formatPointMarker($seriesPlot, 'dot');
-                $seriesPlot->mark->SetColor('black');
-                $seriesPlot->mark->SetSize($bubbleSize);
-            } else {
-                $marker = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
-                $this->formatPointMarker($seriesPlot, $marker);
-            }
-            $dataLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($i)->getDataValue();
-            $seriesPlot->SetLegend($dataLabel);
-
-            $this->graph->Add($seriesPlot);
-        }
-    }
-
-    private function renderPlotRadar($groupID): void
-    {
-        $radarStyle = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
-
-        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-        $seriesPlots = [];
-
-        //    Loop through each data series in turn
-        for ($i = 0; $i < $seriesCount; ++$i) {
-            $dataValuesY = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
-            $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
-            $marker = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
-
-            $dataValues = [];
-            foreach ($dataValuesY as $k => $dataValueY) {
-                $dataValues[$k] = implode(' ', array_reverse($dataValueY));
-            }
-            $tmp = array_shift($dataValues);
-            $dataValues[] = $tmp;
-            $tmp = array_shift($dataValuesX);
-            $dataValuesX[] = $tmp;
-
-            $this->graph->SetTitles(array_reverse($dataValues));
-
-            $seriesPlot = new RadarPlot(array_reverse($dataValuesX));
-
-            $dataLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($i)->getDataValue();
-            $seriesPlot->SetColor(self::$colourSet[self::$plotColour++]);
-            if ($radarStyle == 'filled') {
-                $seriesPlot->SetFillColor(self::$colourSet[self::$plotColour]);
-            }
-            $this->formatPointMarker($seriesPlot, $marker);
-            $seriesPlot->SetLegend($dataLabel);
-
-            $this->graph->Add($seriesPlot);
-        }
-    }
-
-    private function renderPlotContour($groupID): void
-    {
-        $contourStyle = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
-
-        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-        $seriesPlots = [];
-
-        $dataValues = [];
-        //    Loop through each data series in turn
-        for ($i = 0; $i < $seriesCount; ++$i) {
-            $dataValuesY = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
-            $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
-
-            $dataValues[$i] = $dataValuesX;
-        }
-        $seriesPlot = new ContourPlot($dataValues);
-
-        $this->graph->Add($seriesPlot);
-    }
-
-    private function renderPlotStock($groupID): void
-    {
-        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-        $plotOrder = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotOrder();
-
-        $dataValues = [];
-        //    Loop through each data series in turn and build the plot arrays
-        foreach ($plotOrder as $i => $v) {
-            $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($v)->getDataValues();
-            foreach ($dataValuesX as $j => $dataValueX) {
-                $dataValues[$plotOrder[$i]][$j] = $dataValueX;
-            }
-        }
-        if (empty($dataValues)) {
-            return;
-        }
-
-        $dataValuesPlot = [];
-        // Flatten the plot arrays to a single dimensional array to work with jpgraph
-        $jMax = count($dataValues[0]);
-        for ($j = 0; $j < $jMax; ++$j) {
-            for ($i = 0; $i < $seriesCount; ++$i) {
-                $dataValuesPlot[] = $dataValues[$i][$j];
-            }
-        }
-
-        // Set the x-axis labels
-        $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount();
-        if ($labelCount > 0) {
-            $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
-            $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels, $labelCount);
-            $this->graph->xaxis->SetTickLabels($datasetLabels);
-        }
-
-        $seriesPlot = new StockPlot($dataValuesPlot);
-        $seriesPlot->SetWidth(20);
-
-        $this->graph->Add($seriesPlot);
-    }
-
-    private function renderAreaChart($groupCount, $dimensions = '2d'): void
-    {
-        $this->renderCartesianPlotArea();
-
-        for ($i = 0; $i < $groupCount; ++$i) {
-            $this->renderPlotLine($i, true, false, $dimensions);
-        }
-    }
-
-    private function renderLineChart($groupCount, $dimensions = '2d'): void
-    {
-        $this->renderCartesianPlotArea();
-
-        for ($i = 0; $i < $groupCount; ++$i) {
-            $this->renderPlotLine($i, false, false, $dimensions);
-        }
-    }
-
-    private function renderBarChart($groupCount, $dimensions = '2d'): void
-    {
-        $this->renderCartesianPlotArea();
-
-        for ($i = 0; $i < $groupCount; ++$i) {
-            $this->renderPlotBar($i, $dimensions);
-        }
-    }
-
-    private function renderScatterChart($groupCount): void
-    {
-        $this->renderCartesianPlotArea('linlin');
-
-        for ($i = 0; $i < $groupCount; ++$i) {
-            $this->renderPlotScatter($i, false);
-        }
-    }
-
-    private function renderBubbleChart($groupCount): void
-    {
-        $this->renderCartesianPlotArea('linlin');
-
-        for ($i = 0; $i < $groupCount; ++$i) {
-            $this->renderPlotScatter($i, true);
-        }
-    }
-
-    private function renderPieChart($groupCount, $dimensions = '2d', $doughnut = false, $multiplePlots = false): void
-    {
-        $this->renderPiePlotArea();
-
-        $iLimit = ($multiplePlots) ? $groupCount : 1;
-        for ($groupID = 0; $groupID < $iLimit; ++$groupID) {
-            $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
-            $exploded = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
-            $datasetLabels = [];
-            if ($groupID == 0) {
-                $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount();
-                if ($labelCount > 0) {
-                    $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
-                    $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels, $labelCount);
-                }
-            }
-
-            $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-            $seriesPlots = [];
-            //    For pie charts, we only display the first series: doughnut charts generally display all series
-            $jLimit = ($multiplePlots) ? $seriesCount : 1;
-            //    Loop through each data series in turn
-            for ($j = 0; $j < $jLimit; ++$j) {
-                $dataValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($j)->getDataValues();
-
-                //    Fill in any missing values in the $dataValues array
-                $testCurrentIndex = 0;
-                foreach ($dataValues as $k => $dataValue) {
-                    while ($k != $testCurrentIndex) {
-                        $dataValues[$testCurrentIndex] = null;
-                        ++$testCurrentIndex;
-                    }
-                    ++$testCurrentIndex;
-                }
-
-                if ($dimensions == '3d') {
-                    $seriesPlot = new PiePlot3D($dataValues);
-                } else {
-                    if ($doughnut) {
-                        $seriesPlot = new PiePlotC($dataValues);
-                    } else {
-                        $seriesPlot = new PiePlot($dataValues);
-                    }
-                }
-
-                if ($multiplePlots) {
-                    $seriesPlot->SetSize(($jLimit - $j) / ($jLimit * 4));
-                }
-
-                if ($doughnut) {
-                    $seriesPlot->SetMidColor('white');
-                }
-
-                $seriesPlot->SetColor(self::$colourSet[self::$plotColour++]);
-                if (count($datasetLabels) > 0) {
-                    $seriesPlot->SetLabels(array_fill(0, count($datasetLabels), ''));
-                }
-                if ($dimensions != '3d') {
-                    $seriesPlot->SetGuideLines(false);
-                }
-                if ($j == 0) {
-                    if ($exploded) {
-                        $seriesPlot->ExplodeAll();
-                    }
-                    $seriesPlot->SetLegends($datasetLabels);
-                }
-
-                $this->graph->Add($seriesPlot);
-            }
-        }
-    }
-
-    private function renderRadarChart($groupCount): void
-    {
-        $this->renderRadarPlotArea();
-
-        for ($groupID = 0; $groupID < $groupCount; ++$groupID) {
-            $this->renderPlotRadar($groupID);
-        }
-    }
-
-    private function renderStockChart($groupCount): void
-    {
-        $this->renderCartesianPlotArea('intint');
-
-        for ($groupID = 0; $groupID < $groupCount; ++$groupID) {
-            $this->renderPlotStock($groupID);
-        }
-    }
-
-    private function renderContourChart($groupCount, $dimensions): void
-    {
-        $this->renderCartesianPlotArea('intint');
-
-        for ($i = 0; $i < $groupCount; ++$i) {
-            $this->renderPlotContour($i);
-        }
-    }
-
-    private function renderCombinationChart($groupCount, $dimensions, $outputDestination)
-    {
-        $this->renderCartesianPlotArea();
-
-        for ($i = 0; $i < $groupCount; ++$i) {
-            $dimensions = null;
-            $chartType = $this->chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotType();
-            switch ($chartType) {
-                case 'area3DChart':
-                    $dimensions = '3d';
-                // no break
-                case 'areaChart':
-                    $this->renderPlotLine($i, true, true, $dimensions);
-
-                    break;
-                case 'bar3DChart':
-                    $dimensions = '3d';
-                // no break
-                case 'barChart':
-                    $this->renderPlotBar($i, $dimensions);
-
-                    break;
-                case 'line3DChart':
-                    $dimensions = '3d';
-                // no break
-                case 'lineChart':
-                    $this->renderPlotLine($i, false, true, $dimensions);
-
-                    break;
-                case 'scatterChart':
-                    $this->renderPlotScatter($i, false);
-
-                    break;
-                case 'bubbleChart':
-                    $this->renderPlotScatter($i, true);
-
-                    break;
-                default:
-                    $this->graph = null;
-
-                    return false;
-            }
-        }
-
-        $this->renderLegend();
-
-        $this->graph->Stroke($outputDestination);
-
-        return true;
-    }
-
-    public function render($outputDestination)
-    {
-        self::$plotColour = 0;
-
-        $groupCount = $this->chart->getPlotArea()->getPlotGroupCount();
-
-        $dimensions = null;
-        if ($groupCount == 1) {
-            $chartType = $this->chart->getPlotArea()->getPlotGroupByIndex(0)->getPlotType();
-        } else {
-            $chartTypes = [];
-            for ($i = 0; $i < $groupCount; ++$i) {
-                $chartTypes[] = $this->chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotType();
-            }
-            $chartTypes = array_unique($chartTypes);
-            if (count($chartTypes) == 1) {
-                $chartType = array_pop($chartTypes);
-            } elseif (count($chartTypes) == 0) {
-                echo 'Chart is not yet implemented<br />';
-
-                return false;
-            } else {
-                return $this->renderCombinationChart($groupCount, $dimensions, $outputDestination);
-            }
-        }
-
-        switch ($chartType) {
-            case 'area3DChart':
-                $dimensions = '3d';
-            // no break
-            case 'areaChart':
-                $this->renderAreaChart($groupCount, $dimensions);
-
-                break;
-            case 'bar3DChart':
-                $dimensions = '3d';
-            // no break
-            case 'barChart':
-                $this->renderBarChart($groupCount, $dimensions);
-
-                break;
-            case 'line3DChart':
-                $dimensions = '3d';
-            // no break
-            case 'lineChart':
-                $this->renderLineChart($groupCount, $dimensions);
-
-                break;
-            case 'pie3DChart':
-                $dimensions = '3d';
-            // no break
-            case 'pieChart':
-                $this->renderPieChart($groupCount, $dimensions, false, false);
-
-                break;
-            case 'doughnut3DChart':
-                $dimensions = '3d';
-            // no break
-            case 'doughnutChart':
-                $this->renderPieChart($groupCount, $dimensions, true, true);
-
-                break;
-            case 'scatterChart':
-                $this->renderScatterChart($groupCount);
-
-                break;
-            case 'bubbleChart':
-                $this->renderBubbleChart($groupCount);
-
-                break;
-            case 'radarChart':
-                $this->renderRadarChart($groupCount);
-
-                break;
-            case 'surface3DChart':
-                $dimensions = '3d';
-            // no break
-            case 'surfaceChart':
-                $this->renderContourChart($groupCount, $dimensions);
-
-                break;
-            case 'stockChart':
-                $this->renderStockChart($groupCount);
-
-                break;
-            default:
-                echo $chartType . ' is not yet implemented<br />';
-
-                return false;
-        }
-        $this->renderLegend();
-
-        $this->graph->Stroke($outputDestination);
-
-        return true;
-    }
 }
diff --git a/src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php b/src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php
new file mode 100644
index 00000000..4d5526b8
--- /dev/null
+++ b/src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php
@@ -0,0 +1,861 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Chart\Renderer;
+
+use AccBarPlot;
+use AccLinePlot;
+use BarPlot;
+use ContourPlot;
+use Graph;
+use GroupBarPlot;
+use LinePlot;
+use PhpOffice\PhpSpreadsheet\Chart\Chart;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+use PieGraph;
+use PiePlot;
+use PiePlot3D;
+use PiePlotC;
+use RadarGraph;
+use RadarPlot;
+use ScatterPlot;
+use Spline;
+use StockPlot;
+
+/**
+ * Base class for different Jpgraph implementations as charts renderer.
+ */
+abstract class JpGraphRendererBase implements IRenderer
+{
+    private static $width = 640;
+
+    private static $height = 480;
+
+    private static $colourSet = [
+        'mediumpurple1', 'palegreen3', 'gold1', 'cadetblue1',
+        'darkmagenta', 'coral', 'dodgerblue3', 'eggplant',
+        'mediumblue', 'magenta', 'sandybrown', 'cyan',
+        'firebrick1', 'forestgreen', 'deeppink4', 'darkolivegreen',
+        'goldenrod2',
+    ];
+
+    private static $markSet;
+
+    private $chart;
+
+    private $graph;
+
+    private static $plotColour = 0;
+
+    private static $plotMark = 0;
+
+    /**
+     * Create a new jpgraph.
+     */
+    public function __construct(Chart $chart)
+    {
+        static::init();
+        $this->graph = null;
+        $this->chart = $chart;
+
+        self::$markSet = [
+            'diamond' => MARK_DIAMOND,
+            'square' => MARK_SQUARE,
+            'triangle' => MARK_UTRIANGLE,
+            'x' => MARK_X,
+            'star' => MARK_STAR,
+            'dot' => MARK_FILLEDCIRCLE,
+            'dash' => MARK_DTRIANGLE,
+            'circle' => MARK_CIRCLE,
+            'plus' => MARK_CROSS,
+        ];
+    }
+
+    /**
+     * This method should be overriden in descendants to do real JpGraph library initialization.
+     */
+    abstract protected static function init(): void;
+
+    private function formatPointMarker($seriesPlot, $markerID)
+    {
+        $plotMarkKeys = array_keys(self::$markSet);
+        if ($markerID === null) {
+            //    Use default plot marker (next marker in the series)
+            self::$plotMark %= count(self::$markSet);
+            $seriesPlot->mark->SetType(self::$markSet[$plotMarkKeys[self::$plotMark++]]);
+        } elseif ($markerID !== 'none') {
+            //    Use specified plot marker (if it exists)
+            if (isset(self::$markSet[$markerID])) {
+                $seriesPlot->mark->SetType(self::$markSet[$markerID]);
+            } else {
+                //    If the specified plot marker doesn't exist, use default plot marker (next marker in the series)
+                self::$plotMark %= count(self::$markSet);
+                $seriesPlot->mark->SetType(self::$markSet[$plotMarkKeys[self::$plotMark++]]);
+            }
+        } else {
+            //    Hide plot marker
+            $seriesPlot->mark->Hide();
+        }
+        $seriesPlot->mark->SetColor(self::$colourSet[self::$plotColour]);
+        $seriesPlot->mark->SetFillColor(self::$colourSet[self::$plotColour]);
+        $seriesPlot->SetColor(self::$colourSet[self::$plotColour++]);
+
+        return $seriesPlot;
+    }
+
+    private function formatDataSetLabels($groupID, $datasetLabels, $labelCount, $rotation = '')
+    {
+        $datasetLabelFormatCode = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getFormatCode();
+        if ($datasetLabelFormatCode !== null) {
+            //    Retrieve any label formatting code
+            $datasetLabelFormatCode = stripslashes($datasetLabelFormatCode);
+        }
+
+        $testCurrentIndex = 0;
+        foreach ($datasetLabels as $i => $datasetLabel) {
+            if (is_array($datasetLabel)) {
+                if ($rotation == 'bar') {
+                    $datasetLabels[$i] = implode(' ', $datasetLabel);
+                } else {
+                    $datasetLabel = array_reverse($datasetLabel);
+                    $datasetLabels[$i] = implode("\n", $datasetLabel);
+                }
+            } else {
+                //    Format labels according to any formatting code
+                if ($datasetLabelFormatCode !== null) {
+                    $datasetLabels[$i] = NumberFormat::toFormattedString($datasetLabel, $datasetLabelFormatCode);
+                }
+            }
+            ++$testCurrentIndex;
+        }
+
+        return $datasetLabels;
+    }
+
+    private function percentageSumCalculation($groupID, $seriesCount)
+    {
+        $sumValues = [];
+        //    Adjust our values to a percentage value across all series in the group
+        for ($i = 0; $i < $seriesCount; ++$i) {
+            if ($i == 0) {
+                $sumValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
+            } else {
+                $nextValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
+                foreach ($nextValues as $k => $value) {
+                    if (isset($sumValues[$k])) {
+                        $sumValues[$k] += $value;
+                    } else {
+                        $sumValues[$k] = $value;
+                    }
+                }
+            }
+        }
+
+        return $sumValues;
+    }
+
+    private function percentageAdjustValues($dataValues, $sumValues)
+    {
+        foreach ($dataValues as $k => $dataValue) {
+            $dataValues[$k] = $dataValue / $sumValues[$k] * 100;
+        }
+
+        return $dataValues;
+    }
+
+    private function getCaption($captionElement)
+    {
+        //    Read any caption
+        $caption = ($captionElement !== null) ? $captionElement->getCaption() : null;
+        //    Test if we have a title caption to display
+        if ($caption !== null) {
+            //    If we do, it could be a plain string or an array
+            if (is_array($caption)) {
+                //    Implode an array to a plain string
+                $caption = implode('', $caption);
+            }
+        }
+
+        return $caption;
+    }
+
+    private function renderTitle(): void
+    {
+        $title = $this->getCaption($this->chart->getTitle());
+        if ($title !== null) {
+            $this->graph->title->Set($title);
+        }
+    }
+
+    private function renderLegend(): void
+    {
+        $legend = $this->chart->getLegend();
+        if ($legend !== null) {
+            $legendPosition = $legend->getPosition();
+            switch ($legendPosition) {
+                case 'r':
+                    $this->graph->legend->SetPos(0.01, 0.5, 'right', 'center'); //    right
+                    $this->graph->legend->SetColumns(1);
+
+                    break;
+                case 'l':
+                    $this->graph->legend->SetPos(0.01, 0.5, 'left', 'center'); //    left
+                    $this->graph->legend->SetColumns(1);
+
+                    break;
+                case 't':
+                    $this->graph->legend->SetPos(0.5, 0.01, 'center', 'top'); //    top
+
+                    break;
+                case 'b':
+                    $this->graph->legend->SetPos(0.5, 0.99, 'center', 'bottom'); //    bottom
+
+                    break;
+                default:
+                    $this->graph->legend->SetPos(0.01, 0.01, 'right', 'top'); //    top-right
+                    $this->graph->legend->SetColumns(1);
+
+                    break;
+            }
+        } else {
+            $this->graph->legend->Hide();
+        }
+    }
+
+    private function renderCartesianPlotArea($type = 'textlin'): void
+    {
+        $this->graph = new Graph(self::$width, self::$height);
+        $this->graph->SetScale($type);
+
+        $this->renderTitle();
+
+        //    Rotate for bar rather than column chart
+        $rotation = $this->chart->getPlotArea()->getPlotGroupByIndex(0)->getPlotDirection();
+        $reverse = $rotation == 'bar';
+
+        $xAxisLabel = $this->chart->getXAxisLabel();
+        if ($xAxisLabel !== null) {
+            $title = $this->getCaption($xAxisLabel);
+            if ($title !== null) {
+                $this->graph->xaxis->SetTitle($title, 'center');
+                $this->graph->xaxis->title->SetMargin(35);
+                if ($reverse) {
+                    $this->graph->xaxis->title->SetAngle(90);
+                    $this->graph->xaxis->title->SetMargin(90);
+                }
+            }
+        }
+
+        $yAxisLabel = $this->chart->getYAxisLabel();
+        if ($yAxisLabel !== null) {
+            $title = $this->getCaption($yAxisLabel);
+            if ($title !== null) {
+                $this->graph->yaxis->SetTitle($title, 'center');
+                if ($reverse) {
+                    $this->graph->yaxis->title->SetAngle(0);
+                    $this->graph->yaxis->title->SetMargin(-55);
+                }
+            }
+        }
+    }
+
+    private function renderPiePlotArea(): void
+    {
+        $this->graph = new PieGraph(self::$width, self::$height);
+
+        $this->renderTitle();
+    }
+
+    private function renderRadarPlotArea(): void
+    {
+        $this->graph = new RadarGraph(self::$width, self::$height);
+        $this->graph->SetScale('lin');
+
+        $this->renderTitle();
+    }
+
+    private function renderPlotLine($groupID, $filled = false, $combination = false, $dimensions = '2d'): void
+    {
+        $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
+
+        $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount();
+        if ($labelCount > 0) {
+            $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
+            $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels, $labelCount);
+            $this->graph->xaxis->SetTickLabels($datasetLabels);
+        }
+
+        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+        $seriesPlots = [];
+        if ($grouping == 'percentStacked') {
+            $sumValues = $this->percentageSumCalculation($groupID, $seriesCount);
+        } else {
+            $sumValues = [];
+        }
+
+        //    Loop through each data series in turn
+        for ($i = 0; $i < $seriesCount; ++$i) {
+            $dataValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
+            $marker = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
+
+            if ($grouping == 'percentStacked') {
+                $dataValues = $this->percentageAdjustValues($dataValues, $sumValues);
+            }
+
+            //    Fill in any missing values in the $dataValues array
+            $testCurrentIndex = 0;
+            foreach ($dataValues as $k => $dataValue) {
+                while ($k != $testCurrentIndex) {
+                    $dataValues[$testCurrentIndex] = null;
+                    ++$testCurrentIndex;
+                }
+                ++$testCurrentIndex;
+            }
+
+            $seriesPlot = new LinePlot($dataValues);
+            if ($combination) {
+                $seriesPlot->SetBarCenter();
+            }
+
+            if ($filled) {
+                $seriesPlot->SetFilled(true);
+                $seriesPlot->SetColor('black');
+                $seriesPlot->SetFillColor(self::$colourSet[self::$plotColour++]);
+            } else {
+                //    Set the appropriate plot marker
+                $this->formatPointMarker($seriesPlot, $marker);
+            }
+            $dataLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($i)->getDataValue();
+            $seriesPlot->SetLegend($dataLabel);
+
+            $seriesPlots[] = $seriesPlot;
+        }
+
+        if ($grouping == 'standard') {
+            $groupPlot = $seriesPlots;
+        } else {
+            $groupPlot = new AccLinePlot($seriesPlots);
+        }
+        $this->graph->Add($groupPlot);
+    }
+
+    private function renderPlotBar($groupID, $dimensions = '2d'): void
+    {
+        $rotation = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotDirection();
+        //    Rotate for bar rather than column chart
+        if (($groupID == 0) && ($rotation == 'bar')) {
+            $this->graph->Set90AndMargin();
+        }
+        $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
+
+        $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount();
+        if ($labelCount > 0) {
+            $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
+            $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels, $labelCount, $rotation);
+            //    Rotate for bar rather than column chart
+            if ($rotation == 'bar') {
+                $datasetLabels = array_reverse($datasetLabels);
+                $this->graph->yaxis->SetPos('max');
+                $this->graph->yaxis->SetLabelAlign('center', 'top');
+                $this->graph->yaxis->SetLabelSide(SIDE_RIGHT);
+            }
+            $this->graph->xaxis->SetTickLabels($datasetLabels);
+        }
+
+        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+        $seriesPlots = [];
+        if ($grouping == 'percentStacked') {
+            $sumValues = $this->percentageSumCalculation($groupID, $seriesCount);
+        } else {
+            $sumValues = [];
+        }
+
+        //    Loop through each data series in turn
+        for ($j = 0; $j < $seriesCount; ++$j) {
+            $dataValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($j)->getDataValues();
+            if ($grouping == 'percentStacked') {
+                $dataValues = $this->percentageAdjustValues($dataValues, $sumValues);
+            }
+
+            //    Fill in any missing values in the $dataValues array
+            $testCurrentIndex = 0;
+            foreach ($dataValues as $k => $dataValue) {
+                while ($k != $testCurrentIndex) {
+                    $dataValues[$testCurrentIndex] = null;
+                    ++$testCurrentIndex;
+                }
+                ++$testCurrentIndex;
+            }
+
+            //    Reverse the $dataValues order for bar rather than column chart
+            if ($rotation == 'bar') {
+                $dataValues = array_reverse($dataValues);
+            }
+            $seriesPlot = new BarPlot($dataValues);
+            $seriesPlot->SetColor('black');
+            $seriesPlot->SetFillColor(self::$colourSet[self::$plotColour++]);
+            if ($dimensions == '3d') {
+                $seriesPlot->SetShadow();
+            }
+            if (!$this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($j)) {
+                $dataLabel = '';
+            } else {
+                $dataLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($j)->getDataValue();
+            }
+            $seriesPlot->SetLegend($dataLabel);
+
+            $seriesPlots[] = $seriesPlot;
+        }
+        //    Reverse the plot order for bar rather than column chart
+        if (($rotation == 'bar') && ($grouping != 'percentStacked')) {
+            $seriesPlots = array_reverse($seriesPlots);
+        }
+
+        if ($grouping == 'clustered') {
+            $groupPlot = new GroupBarPlot($seriesPlots);
+        } elseif ($grouping == 'standard') {
+            $groupPlot = new GroupBarPlot($seriesPlots);
+        } else {
+            $groupPlot = new AccBarPlot($seriesPlots);
+            if ($dimensions == '3d') {
+                $groupPlot->SetShadow();
+            }
+        }
+
+        $this->graph->Add($groupPlot);
+    }
+
+    private function renderPlotScatter($groupID, $bubble): void
+    {
+        $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
+        $scatterStyle = $bubbleSize = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
+
+        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+        $seriesPlots = [];
+
+        //    Loop through each data series in turn
+        for ($i = 0; $i < $seriesCount; ++$i) {
+            $dataValuesY = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
+            $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
+
+            foreach ($dataValuesY as $k => $dataValueY) {
+                $dataValuesY[$k] = $k;
+            }
+
+            $seriesPlot = new ScatterPlot($dataValuesX, $dataValuesY);
+            if ($scatterStyle == 'lineMarker') {
+                $seriesPlot->SetLinkPoints();
+                $seriesPlot->link->SetColor(self::$colourSet[self::$plotColour]);
+            } elseif ($scatterStyle == 'smoothMarker') {
+                $spline = new Spline($dataValuesY, $dataValuesX);
+                [$splineDataY, $splineDataX] = $spline->Get(count($dataValuesX) * self::$width / 20);
+                $lplot = new LinePlot($splineDataX, $splineDataY);
+                $lplot->SetColor(self::$colourSet[self::$plotColour]);
+
+                $this->graph->Add($lplot);
+            }
+
+            if ($bubble) {
+                $this->formatPointMarker($seriesPlot, 'dot');
+                $seriesPlot->mark->SetColor('black');
+                $seriesPlot->mark->SetSize($bubbleSize);
+            } else {
+                $marker = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
+                $this->formatPointMarker($seriesPlot, $marker);
+            }
+            $dataLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($i)->getDataValue();
+            $seriesPlot->SetLegend($dataLabel);
+
+            $this->graph->Add($seriesPlot);
+        }
+    }
+
+    private function renderPlotRadar($groupID): void
+    {
+        $radarStyle = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
+
+        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+        $seriesPlots = [];
+
+        //    Loop through each data series in turn
+        for ($i = 0; $i < $seriesCount; ++$i) {
+            $dataValuesY = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
+            $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
+            $marker = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
+
+            $dataValues = [];
+            foreach ($dataValuesY as $k => $dataValueY) {
+                $dataValues[$k] = implode(' ', array_reverse($dataValueY));
+            }
+            $tmp = array_shift($dataValues);
+            $dataValues[] = $tmp;
+            $tmp = array_shift($dataValuesX);
+            $dataValuesX[] = $tmp;
+
+            $this->graph->SetTitles(array_reverse($dataValues));
+
+            $seriesPlot = new RadarPlot(array_reverse($dataValuesX));
+
+            $dataLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($i)->getDataValue();
+            $seriesPlot->SetColor(self::$colourSet[self::$plotColour++]);
+            if ($radarStyle == 'filled') {
+                $seriesPlot->SetFillColor(self::$colourSet[self::$plotColour]);
+            }
+            $this->formatPointMarker($seriesPlot, $marker);
+            $seriesPlot->SetLegend($dataLabel);
+
+            $this->graph->Add($seriesPlot);
+        }
+    }
+
+    private function renderPlotContour($groupID): void
+    {
+        $contourStyle = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
+
+        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+        $seriesPlots = [];
+
+        $dataValues = [];
+        //    Loop through each data series in turn
+        for ($i = 0; $i < $seriesCount; ++$i) {
+            $dataValuesY = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
+            $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
+
+            $dataValues[$i] = $dataValuesX;
+        }
+        $seriesPlot = new ContourPlot($dataValues);
+
+        $this->graph->Add($seriesPlot);
+    }
+
+    private function renderPlotStock($groupID): void
+    {
+        $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+        $plotOrder = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotOrder();
+
+        $dataValues = [];
+        //    Loop through each data series in turn and build the plot arrays
+        foreach ($plotOrder as $i => $v) {
+            $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($v)->getDataValues();
+            foreach ($dataValuesX as $j => $dataValueX) {
+                $dataValues[$plotOrder[$i]][$j] = $dataValueX;
+            }
+        }
+        if (empty($dataValues)) {
+            return;
+        }
+
+        $dataValuesPlot = [];
+        // Flatten the plot arrays to a single dimensional array to work with jpgraph
+        $jMax = count($dataValues[0]);
+        for ($j = 0; $j < $jMax; ++$j) {
+            for ($i = 0; $i < $seriesCount; ++$i) {
+                $dataValuesPlot[] = $dataValues[$i][$j];
+            }
+        }
+
+        // Set the x-axis labels
+        $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount();
+        if ($labelCount > 0) {
+            $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
+            $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels, $labelCount);
+            $this->graph->xaxis->SetTickLabels($datasetLabels);
+        }
+
+        $seriesPlot = new StockPlot($dataValuesPlot);
+        $seriesPlot->SetWidth(20);
+
+        $this->graph->Add($seriesPlot);
+    }
+
+    private function renderAreaChart($groupCount, $dimensions = '2d'): void
+    {
+        $this->renderCartesianPlotArea();
+
+        for ($i = 0; $i < $groupCount; ++$i) {
+            $this->renderPlotLine($i, true, false, $dimensions);
+        }
+    }
+
+    private function renderLineChart($groupCount, $dimensions = '2d'): void
+    {
+        $this->renderCartesianPlotArea();
+
+        for ($i = 0; $i < $groupCount; ++$i) {
+            $this->renderPlotLine($i, false, false, $dimensions);
+        }
+    }
+
+    private function renderBarChart($groupCount, $dimensions = '2d'): void
+    {
+        $this->renderCartesianPlotArea();
+
+        for ($i = 0; $i < $groupCount; ++$i) {
+            $this->renderPlotBar($i, $dimensions);
+        }
+    }
+
+    private function renderScatterChart($groupCount): void
+    {
+        $this->renderCartesianPlotArea('linlin');
+
+        for ($i = 0; $i < $groupCount; ++$i) {
+            $this->renderPlotScatter($i, false);
+        }
+    }
+
+    private function renderBubbleChart($groupCount): void
+    {
+        $this->renderCartesianPlotArea('linlin');
+
+        for ($i = 0; $i < $groupCount; ++$i) {
+            $this->renderPlotScatter($i, true);
+        }
+    }
+
+    private function renderPieChart($groupCount, $dimensions = '2d', $doughnut = false, $multiplePlots = false): void
+    {
+        $this->renderPiePlotArea();
+
+        $iLimit = ($multiplePlots) ? $groupCount : 1;
+        for ($groupID = 0; $groupID < $iLimit; ++$groupID) {
+            $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
+            $exploded = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
+            $datasetLabels = [];
+            if ($groupID == 0) {
+                $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount();
+                if ($labelCount > 0) {
+                    $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
+                    $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels, $labelCount);
+                }
+            }
+
+            $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
+            $seriesPlots = [];
+            //    For pie charts, we only display the first series: doughnut charts generally display all series
+            $jLimit = ($multiplePlots) ? $seriesCount : 1;
+            //    Loop through each data series in turn
+            for ($j = 0; $j < $jLimit; ++$j) {
+                $dataValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($j)->getDataValues();
+
+                //    Fill in any missing values in the $dataValues array
+                $testCurrentIndex = 0;
+                foreach ($dataValues as $k => $dataValue) {
+                    while ($k != $testCurrentIndex) {
+                        $dataValues[$testCurrentIndex] = null;
+                        ++$testCurrentIndex;
+                    }
+                    ++$testCurrentIndex;
+                }
+
+                if ($dimensions == '3d') {
+                    $seriesPlot = new PiePlot3D($dataValues);
+                } else {
+                    if ($doughnut) {
+                        $seriesPlot = new PiePlotC($dataValues);
+                    } else {
+                        $seriesPlot = new PiePlot($dataValues);
+                    }
+                }
+
+                if ($multiplePlots) {
+                    $seriesPlot->SetSize(($jLimit - $j) / ($jLimit * 4));
+                }
+
+                if ($doughnut) {
+                    $seriesPlot->SetMidColor('white');
+                }
+
+                $seriesPlot->SetColor(self::$colourSet[self::$plotColour++]);
+                if (count($datasetLabels) > 0) {
+                    $seriesPlot->SetLabels(array_fill(0, count($datasetLabels), ''));
+                }
+                if ($dimensions != '3d') {
+                    $seriesPlot->SetGuideLines(false);
+                }
+                if ($j == 0) {
+                    if ($exploded) {
+                        $seriesPlot->ExplodeAll();
+                    }
+                    $seriesPlot->SetLegends($datasetLabels);
+                }
+
+                $this->graph->Add($seriesPlot);
+            }
+        }
+    }
+
+    private function renderRadarChart($groupCount): void
+    {
+        $this->renderRadarPlotArea();
+
+        for ($groupID = 0; $groupID < $groupCount; ++$groupID) {
+            $this->renderPlotRadar($groupID);
+        }
+    }
+
+    private function renderStockChart($groupCount): void
+    {
+        $this->renderCartesianPlotArea('intint');
+
+        for ($groupID = 0; $groupID < $groupCount; ++$groupID) {
+            $this->renderPlotStock($groupID);
+        }
+    }
+
+    private function renderContourChart($groupCount, $dimensions): void
+    {
+        $this->renderCartesianPlotArea('intint');
+
+        for ($i = 0; $i < $groupCount; ++$i) {
+            $this->renderPlotContour($i);
+        }
+    }
+
+    private function renderCombinationChart($groupCount, $dimensions, $outputDestination)
+    {
+        $this->renderCartesianPlotArea();
+
+        for ($i = 0; $i < $groupCount; ++$i) {
+            $dimensions = null;
+            $chartType = $this->chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotType();
+            switch ($chartType) {
+                case 'area3DChart':
+                    $dimensions = '3d';
+                // no break
+                case 'areaChart':
+                    $this->renderPlotLine($i, true, true, $dimensions);
+
+                    break;
+                case 'bar3DChart':
+                    $dimensions = '3d';
+                // no break
+                case 'barChart':
+                    $this->renderPlotBar($i, $dimensions);
+
+                    break;
+                case 'line3DChart':
+                    $dimensions = '3d';
+                // no break
+                case 'lineChart':
+                    $this->renderPlotLine($i, false, true, $dimensions);
+
+                    break;
+                case 'scatterChart':
+                    $this->renderPlotScatter($i, false);
+
+                    break;
+                case 'bubbleChart':
+                    $this->renderPlotScatter($i, true);
+
+                    break;
+                default:
+                    $this->graph = null;
+
+                    return false;
+            }
+        }
+
+        $this->renderLegend();
+
+        $this->graph->Stroke($outputDestination);
+
+        return true;
+    }
+
+    public function render($outputDestination)
+    {
+        self::$plotColour = 0;
+
+        $groupCount = $this->chart->getPlotArea()->getPlotGroupCount();
+
+        $dimensions = null;
+        if ($groupCount == 1) {
+            $chartType = $this->chart->getPlotArea()->getPlotGroupByIndex(0)->getPlotType();
+        } else {
+            $chartTypes = [];
+            for ($i = 0; $i < $groupCount; ++$i) {
+                $chartTypes[] = $this->chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotType();
+            }
+            $chartTypes = array_unique($chartTypes);
+            if (count($chartTypes) == 1) {
+                $chartType = array_pop($chartTypes);
+            } elseif (count($chartTypes) == 0) {
+                echo 'Chart is not yet implemented<br />';
+
+                return false;
+            } else {
+                return $this->renderCombinationChart($groupCount, $dimensions, $outputDestination);
+            }
+        }
+
+        switch ($chartType) {
+            case 'area3DChart':
+                $dimensions = '3d';
+            // no break
+            case 'areaChart':
+                $this->renderAreaChart($groupCount, $dimensions);
+
+                break;
+            case 'bar3DChart':
+                $dimensions = '3d';
+            // no break
+            case 'barChart':
+                $this->renderBarChart($groupCount, $dimensions);
+
+                break;
+            case 'line3DChart':
+                $dimensions = '3d';
+            // no break
+            case 'lineChart':
+                $this->renderLineChart($groupCount, $dimensions);
+
+                break;
+            case 'pie3DChart':
+                $dimensions = '3d';
+            // no break
+            case 'pieChart':
+                $this->renderPieChart($groupCount, $dimensions, false, false);
+
+                break;
+            case 'doughnut3DChart':
+                $dimensions = '3d';
+            // no break
+            case 'doughnutChart':
+                $this->renderPieChart($groupCount, $dimensions, true, true);
+
+                break;
+            case 'scatterChart':
+                $this->renderScatterChart($groupCount);
+
+                break;
+            case 'bubbleChart':
+                $this->renderBubbleChart($groupCount);
+
+                break;
+            case 'radarChart':
+                $this->renderRadarChart($groupCount);
+
+                break;
+            case 'surface3DChart':
+                $dimensions = '3d';
+            // no break
+            case 'surfaceChart':
+                $this->renderContourChart($groupCount, $dimensions);
+
+                break;
+            case 'stockChart':
+                $this->renderStockChart($groupCount);
+
+                break;
+            default:
+                echo $chartType . ' is not yet implemented<br />';
+
+                return false;
+        }
+        $this->renderLegend();
+
+        $this->graph->Stroke($outputDestination);
+
+        return true;
+    }
+}
diff --git a/src/PhpSpreadsheet/Chart/Renderer/MtJpGraphRenderer.php b/src/PhpSpreadsheet/Chart/Renderer/MtJpGraphRenderer.php
new file mode 100644
index 00000000..3fef3b6e
--- /dev/null
+++ b/src/PhpSpreadsheet/Chart/Renderer/MtJpGraphRenderer.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Chart\Renderer;
+
+/**
+ * Jpgraph is not oficially maintained in Composer.
+ *
+ * This renderer implementation uses package
+ * https://packagist.org/packages/mitoteam/jpgraph
+ *
+ * This package is up to date for August 2022 and has PHP 8.1 support.
+ *
+ * @codeCoverageIgnore
+ */
+class MtJpGraphRenderer extends JpGraphRendererBase
+{
+    protected static function init(): void
+    {
+        static $loaded = false;
+        if ($loaded) {
+            return;
+        }
+
+        \mitoteam\jpgraph\MtJpGraph::load([
+            'bar',
+            'contour',
+            'line',
+            'pie',
+            'pie3d',
+            'radar',
+            'regstat',
+            'scatter',
+            'stock',
+        ]);
+
+        $loaded = true;
+    }
+}
diff --git a/src/PhpSpreadsheet/Chart/Renderer/PHP Charting Libraries.txt b/src/PhpSpreadsheet/Chart/Renderer/PHP Charting Libraries.txt
index 4abab7a2..bc940600 100644
--- a/src/PhpSpreadsheet/Chart/Renderer/PHP Charting Libraries.txt	
+++ b/src/PhpSpreadsheet/Chart/Renderer/PHP Charting Libraries.txt	
@@ -5,7 +5,10 @@ GraPHPite
 	http://graphpite.sourceforge.net/
 
 JpGraph
-	http://www.aditus.nu/jpgraph/
+	https://jpgraph.net/
+	Used composer packages:
+        https://packagist.org/packages/jpgraph/jpgraph (\PhpOffice\PhpSpreadsheet\Chart\Renderer\JpGraph)
+        https://packagist.org/packages/mitoteam/jpgraph (\PhpOffice\PhpSpreadsheet\Chart\Renderer\MtJpGraphRenderer)
 
 LibChart
 	https://naku.dohcrew.com/libchart/pages/introduction/
@@ -17,4 +20,4 @@ TeeChart
 	https://www.steema.com/
 
 PHPGraphLib
-    http://www.ebrueggeman.com/phpgraphlib
\ No newline at end of file
+    http://www.ebrueggeman.com/phpgraphlib

From 71b2c5ae896b077209251e9972df4ae53350bf7e Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Sun, 7 Aug 2022 13:59:26 +0200
Subject: [PATCH 19/69] Expand [PR
 #2964](https://github.com/PHPOffice/PhpSpreadsheet/pull/2964) to cover all
 arithmetic operators, not just multiplication, and both left and right side
 values

---
 phpstan-baseline.neon                         | 10 ---
 src/PhpSpreadsheet/Shared/JAMA/Matrix.php     | 69 +++++++------------
 .../Functions/MathTrig/SumTest.php            | 16 ++++-
 .../MathTrig/SUMWITHINDEXMATCH.php            | 34 +++++++++
 4 files changed, 73 insertions(+), 56 deletions(-)
 create mode 100644 tests/data/Calculation/MathTrig/SUMWITHINDEXMATCH.php

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 9184a5cb..596e1e10 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -2285,11 +2285,6 @@ parameters:
 			count: 1
 			path: src/PhpSpreadsheet/Shared/JAMA/LUDecomposition.php
 
-		-
-			message: "#^Call to function is_string\\(\\) with float\\|int will always evaluate to false\\.$#"
-			count: 5
-			path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
-
 		-
 			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\JAMA\\\\Matrix\\:\\:__construct\\(\\) has parameter \\$args with no type specified\\.$#"
 			count: 1
@@ -2370,11 +2365,6 @@ parameters:
 			count: 2
 			path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
 
-		-
-			message: "#^Result of && is always false\\.$#"
-			count: 11
-			path: src/PhpSpreadsheet/Shared/JAMA/Matrix.php
-
 		-
 			message: "#^Unreachable statement \\- code above always terminates\\.$#"
 			count: 19
diff --git a/src/PhpSpreadsheet/Shared/JAMA/Matrix.php b/src/PhpSpreadsheet/Shared/JAMA/Matrix.php
index 8aab07e3..58ab8813 100644
--- a/src/PhpSpreadsheet/Shared/JAMA/Matrix.php
+++ b/src/PhpSpreadsheet/Shared/JAMA/Matrix.php
@@ -533,14 +533,8 @@ class Matrix
                 for ($j = 0; $j < $this->n; ++$j) {
                     $validValues = true;
                     $value = $M->get($i, $j);
-                    if ((is_string($this->A[$i][$j])) && (strlen($this->A[$i][$j]) > 0) && (!is_numeric($this->A[$i][$j]))) {
-                        $this->A[$i][$j] = trim($this->A[$i][$j], '"');
-                        $validValues &= StringHelper::convertToNumberIfFraction($this->A[$i][$j]);
-                    }
-                    if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
-                        $value = trim($value, '"');
-                        $validValues &= StringHelper::convertToNumberIfFraction($value);
-                    }
+                    [$this->A[$i][$j], $validValues] = $this->validateExtractedValue($this->A[$i][$j], $validValues);
+                    [$value, $validValues] = $this->validateExtractedValue($value, $validValues);
                     if ($validValues) {
                         $this->A[$i][$j] += $value;
                     } else {
@@ -633,14 +627,8 @@ class Matrix
                 for ($j = 0; $j < $this->n; ++$j) {
                     $validValues = true;
                     $value = $M->get($i, $j);
-                    if ((is_string($this->A[$i][$j])) && (strlen($this->A[$i][$j]) > 0) && (!is_numeric($this->A[$i][$j]))) {
-                        $this->A[$i][$j] = trim($this->A[$i][$j], '"');
-                        $validValues &= StringHelper::convertToNumberIfFraction($this->A[$i][$j]);
-                    }
-                    if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
-                        $value = trim($value, '"');
-                        $validValues &= StringHelper::convertToNumberIfFraction($value);
-                    }
+                    [$this->A[$i][$j], $validValues] = $this->validateExtractedValue($this->A[$i][$j], $validValues);
+                    [$value, $validValues] = $this->validateExtractedValue($value, $validValues);
                     if ($validValues) {
                         $this->A[$i][$j] -= $value;
                     } else {
@@ -735,17 +723,8 @@ class Matrix
                 for ($j = 0; $j < $this->n; ++$j) {
                     $validValues = true;
                     $value = $M->get($i, $j);
-                    if ((is_string($this->A[$i][$j])) && (strlen($this->A[$i][$j]) > 0) && (!is_numeric($this->A[$i][$j]))) {
-                        $this->A[$i][$j] = trim($this->A[$i][$j], '"');
-                        $validValues &= StringHelper::convertToNumberIfFraction($this->A[$i][$j]);
-                    }
-                    if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
-                        $value = trim($value, '"');
-                        $validValues &= StringHelper::convertToNumberIfFraction($value);
-                    }
-                    if (!is_numeric($value) && is_array($value)) {
-                        $value = Functions::flattenArray($value)[0];
-                    }
+                    [$this->A[$i][$j], $validValues] = $this->validateExtractedValue($this->A[$i][$j], $validValues);
+                    [$value, $validValues] = $this->validateExtractedValue($value, $validValues);
                     if ($validValues) {
                         $this->A[$i][$j] *= $value;
                     } else {
@@ -796,14 +775,8 @@ class Matrix
                 for ($j = 0; $j < $this->n; ++$j) {
                     $validValues = true;
                     $value = $M->get($i, $j);
-                    if ((is_string($this->A[$i][$j])) && (strlen($this->A[$i][$j]) > 0) && (!is_numeric($this->A[$i][$j]))) {
-                        $this->A[$i][$j] = trim($this->A[$i][$j], '"');
-                        $validValues &= StringHelper::convertToNumberIfFraction($this->A[$i][$j]);
-                    }
-                    if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
-                        $value = trim($value, '"');
-                        $validValues &= StringHelper::convertToNumberIfFraction($value);
-                    }
+                    [$this->A[$i][$j], $validValues] = $this->validateExtractedValue($this->A[$i][$j], $validValues);
+                    [$value, $validValues] = $this->validateExtractedValue($value, $validValues);
                     if ($validValues) {
                         if ($value == 0) {
                             //    Trap for Divide by Zero error
@@ -1083,14 +1056,8 @@ class Matrix
                 for ($j = 0; $j < $this->n; ++$j) {
                     $validValues = true;
                     $value = $M->get($i, $j);
-                    if ((is_string($this->A[$i][$j])) && (strlen($this->A[$i][$j]) > 0) && (!is_numeric($this->A[$i][$j]))) {
-                        $this->A[$i][$j] = trim($this->A[$i][$j], '"');
-                        $validValues &= StringHelper::convertToNumberIfFraction($this->A[$i][$j]);
-                    }
-                    if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
-                        $value = trim($value, '"');
-                        $validValues &= StringHelper::convertToNumberIfFraction($value);
-                    }
+                    [$this->A[$i][$j], $validValues] = $this->validateExtractedValue($this->A[$i][$j], $validValues);
+                    [$value, $validValues] = $this->validateExtractedValue($value, $validValues);
                     if ($validValues) {
                         $this->A[$i][$j] = $this->A[$i][$j] ** $value;
                     } else {
@@ -1191,4 +1158,20 @@ class Matrix
 
         return $L->det();
     }
+
+    /**
+     * @param mixed $value
+     */
+    private function validateExtractedValue($value, bool $validValues): array
+    {
+        if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
+            $value = trim($value, '"');
+            $validValues &= StringHelper::convertToNumberIfFraction($value);
+        }
+        if (!is_numeric($value) && is_array($value)) {
+            $value = Functions::flattenArray($value)[0];
+        }
+
+        return [$value, $validValues];
+    }
 }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumTest.php
index 738c203e..780b9623 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/SumTest.php
@@ -47,7 +47,12 @@ class SumTest extends AllSetupTeardown
         return require 'tests/data/Calculation/MathTrig/SUMLITERALS.php';
     }
 
-    public function testSumWithIndexMatch(): void
+    /**
+     * @dataProvider providerSUMWITHINDEXMATCH
+     *
+     * @param mixed $expectedResult
+     */
+    public function testSumWithIndexMatch($expectedResult, string $formula): void
     {
         $spreadsheet = new Spreadsheet();
         $sheet1 = $spreadsheet->getActiveSheet();
@@ -55,7 +60,7 @@ class SumTest extends AllSetupTeardown
         $sheet1->fromArray(
             [
                 ['Number', 'Formula'],
-                [83, '=SUM(4 * INDEX(Lookup!B2, MATCH(A2, Lookup!A2, 0)))'],
+                [83, $formula],
             ]
         );
         $sheet2 = $spreadsheet->createSheet();
@@ -66,7 +71,12 @@ class SumTest extends AllSetupTeardown
                 [83, 16],
             ]
         );
-        self::assertSame(64, $sheet1->getCell('B2')->getCalculatedValue());
+        self::assertSame($expectedResult, $sheet1->getCell('B2')->getCalculatedValue());
         $spreadsheet->disconnectWorksheets();
     }
+
+    public function providerSUMWITHINDEXMATCH(): array
+    {
+        return require 'tests/data/Calculation/MathTrig/SUMWITHINDEXMATCH.php';
+    }
 }
diff --git a/tests/data/Calculation/MathTrig/SUMWITHINDEXMATCH.php b/tests/data/Calculation/MathTrig/SUMWITHINDEXMATCH.php
new file mode 100644
index 00000000..b62cfd30
--- /dev/null
+++ b/tests/data/Calculation/MathTrig/SUMWITHINDEXMATCH.php
@@ -0,0 +1,34 @@
+<?php
+
+return [
+    [
+        64, '=SUM(4 * INDEX(Lookup!B2, MATCH(A2, Lookup!A2, 0)))',
+    ],
+    [
+        64, '=SUM(INDEX(Lookup!B2, MATCH(A2, Lookup!A2, 0)) * 4)',
+    ],
+    [
+        20, '=SUM(4 + INDEX(Lookup!B2, MATCH(A2, Lookup!A2, 0)))',
+    ],
+    [
+        20, '=SUM(INDEX(Lookup!B2, MATCH(A2, Lookup!A2, 0)) + 4)',
+    ],
+    [
+        -12, '=SUM(4 - INDEX(Lookup!B2, MATCH(A2, Lookup!A2, 0)))',
+    ],
+    [
+        12, '=SUM(INDEX(Lookup!B2, MATCH(A2, Lookup!A2, 0)) - 4)',
+    ],
+    [
+        0.25, '=SUM(4 / INDEX(Lookup!B2, MATCH(A2, Lookup!A2, 0)))',
+    ],
+    [
+        4, '=SUM(INDEX(Lookup!B2, MATCH(A2, Lookup!A2, 0)) / 4)',
+    ],
+    [
+        4294967296, '=SUM(4 ^ INDEX(Lookup!B2, MATCH(A2, Lookup!A2, 0)))',
+    ],
+    [
+        65536, '=SUM(INDEX(Lookup!B2, MATCH(A2, Lookup!A2, 0)) ^ 4)',
+    ],
+];

From ca1650df9e24a20a51216a061d8fdde5baedb005 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Sun, 7 Aug 2022 18:45:36 +0200
Subject: [PATCH 20/69] Additional for [PR
 #2964](https://github.com/PHPOffice/PhpSpreadsheet/pull/2964); validate value
 after extracting from flattened array

---
 src/PhpSpreadsheet/Shared/JAMA/Matrix.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/PhpSpreadsheet/Shared/JAMA/Matrix.php b/src/PhpSpreadsheet/Shared/JAMA/Matrix.php
index 58ab8813..0bbd94a7 100644
--- a/src/PhpSpreadsheet/Shared/JAMA/Matrix.php
+++ b/src/PhpSpreadsheet/Shared/JAMA/Matrix.php
@@ -1164,13 +1164,13 @@ class Matrix
      */
     private function validateExtractedValue($value, bool $validValues): array
     {
+        if (!is_numeric($value) && is_array($value)) {
+            $value = Functions::flattenArray($value)[0];
+        }
         if ((is_string($value)) && (strlen($value) > 0) && (!is_numeric($value))) {
             $value = trim($value, '"');
             $validValues &= StringHelper::convertToNumberIfFraction($value);
         }
-        if (!is_numeric($value) && is_array($value)) {
-            $value = Functions::flattenArray($value)[0];
-        }
 
         return [$value, $validValues];
     }

From b783fecb7fd02c2f86854de1cbff7afac7bdf939 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Fri, 12 Aug 2022 14:03:13 +0200
Subject: [PATCH 21/69] More return type declarations, and some additional
 argument typehinting

---
 src/PhpSpreadsheet/Cell/Cell.php              | 92 +++++++------------
 src/PhpSpreadsheet/Collection/Cells.php       | 16 +---
 .../Collection/CellsFactory.php               |  3 +-
 src/PhpSpreadsheet/Worksheet/Worksheet.php    | 44 +++------
 4 files changed, 52 insertions(+), 103 deletions(-)

diff --git a/src/PhpSpreadsheet/Cell/Cell.php b/src/PhpSpreadsheet/Cell/Cell.php
index 2005694d..bc02fbf0 100644
--- a/src/PhpSpreadsheet/Cell/Cell.php
+++ b/src/PhpSpreadsheet/Cell/Cell.php
@@ -50,14 +50,14 @@ class Cell
     private $dataType;
 
     /**
-     * Collection of cells.
+     * The collection of cells that this cell belongs to (i.e. The Cell Collection for the parent Worksheet).
      *
      * @var Cells
      */
     private $parent;
 
     /**
-     * Index to cellXf.
+     * Index to the cellXf reference for the styling of this cell.
      *
      * @var int
      */
@@ -95,9 +95,8 @@ class Cell
      * Create a new Cell.
      *
      * @param mixed $value
-     * @param string $dataType
      */
-    public function __construct($value, $dataType, Worksheet $worksheet)
+    public function __construct($value, ?string $dataType, Worksheet $worksheet)
     {
         // Initialise cell value
         $this->value = $value;
@@ -111,7 +110,7 @@ class Cell
                 $dataType = DataType::TYPE_STRING;
             }
             $this->dataType = $dataType;
-        } elseif (!self::getValueBinder()->bindValue($this, $value)) {
+        } elseif (self::getValueBinder()->bindValue($this, $value) === false) {
             throw new Exception('Value could not be bound to cell.');
         }
     }
@@ -167,10 +166,8 @@ class Cell
 
     /**
      * Get cell value with formatting.
-     *
-     * @return string
      */
-    public function getFormattedValue()
+    public function getFormattedValue(): string
     {
         return (string) NumberFormat::toFormattedString(
             $this->getCalculatedValue(),
@@ -188,7 +185,7 @@ class Cell
      *
      * @return $this
      */
-    public function setValue($value)
+    public function setValue($value): self
     {
         if (!self::getValueBinder()->bindValue($this, $value)) {
             throw new Exception('Value could not be bound to cell.');
@@ -205,7 +202,7 @@ class Cell
      *        Note that PhpSpreadsheet does not validate that the value and datatype are consistent, in using this
      *             method, then it is your responsibility as an end-user developer to validate that the value and
      *             the datatype match.
-     *       If you do mismatch value and datatpe, then the value you enter may be changed to match the datatype
+     *       If you do mismatch value and datatype, then the value you enter may be changed to match the datatype
      *          that you specify.
      *
      * @return Cell
@@ -271,7 +268,7 @@ class Cell
      *
      * @return mixed
      */
-    public function getCalculatedValue($resetLog = true)
+    public function getCalculatedValue(bool $resetLog = true)
     {
         if ($this->dataType === DataType::TYPE_FORMULA) {
             try {
@@ -319,7 +316,7 @@ class Cell
      *
      * @return Cell
      */
-    public function setCalculatedValue($originalValue)
+    public function setCalculatedValue($originalValue): self
     {
         if ($originalValue !== null) {
             $this->calculatedValue = (is_numeric($originalValue)) ? (float) $originalValue : $originalValue;
@@ -345,10 +342,8 @@ class Cell
 
     /**
      * Get cell data type.
-     *
-     * @return string
      */
-    public function getDataType()
+    public function getDataType(): string
     {
         return $this->dataType;
     }
@@ -360,7 +355,7 @@ class Cell
      *
      * @return Cell
      */
-    public function setDataType($dataType)
+    public function setDataType($dataType): self
     {
         if ($dataType == DataType::TYPE_STRING2) {
             $dataType = DataType::TYPE_STRING;
@@ -392,10 +387,8 @@ class Cell
 
     /**
      * Get Data validation rules.
-     *
-     * @return DataValidation
      */
-    public function getDataValidation()
+    public function getDataValidation(): DataValidation
     {
         if (!isset($this->parent)) {
             throw new Exception('Cannot get data validation for cell that is not bound to a worksheet');
@@ -420,10 +413,8 @@ class Cell
 
     /**
      * Does this cell contain valid value?
-     *
-     * @return bool
      */
-    public function hasValidValue()
+    public function hasValidValue(): bool
     {
         $validator = new DataValidator();
 
@@ -432,10 +423,8 @@ class Cell
 
     /**
      * Does this cell contain a Hyperlink?
-     *
-     * @return bool
      */
-    public function hasHyperlink()
+    public function hasHyperlink(): bool
     {
         if (!isset($this->parent)) {
             throw new Exception('Cannot check for hyperlink when cell is not bound to a worksheet');
@@ -446,10 +435,8 @@ class Cell
 
     /**
      * Get Hyperlink.
-     *
-     * @return Hyperlink
      */
-    public function getHyperlink()
+    public function getHyperlink(): Hyperlink
     {
         if (!isset($this->parent)) {
             throw new Exception('Cannot get hyperlink for cell that is not bound to a worksheet');
@@ -463,7 +450,7 @@ class Cell
      *
      * @return Cell
      */
-    public function setHyperlink(?Hyperlink $hyperlink = null)
+    public function setHyperlink(?Hyperlink $hyperlink = null): self
     {
         if (!isset($this->parent)) {
             throw new Exception('Cannot set hyperlink for cell that is not bound to a worksheet');
@@ -486,10 +473,8 @@ class Cell
 
     /**
      * Get parent worksheet.
-     *
-     * @return Worksheet
      */
-    public function getWorksheet()
+    public function getWorksheet(): Worksheet
     {
         try {
             $worksheet = $this->parent->getParent();
@@ -506,27 +491,22 @@ class Cell
 
     /**
      * Is this cell in a merge range.
-     *
-     * @return bool
      */
-    public function isInMergeRange()
+    public function isInMergeRange(): bool
     {
         return (bool) $this->getMergeRange();
     }
 
     /**
      * Is this cell the master (top left cell) in a merge range (that holds the actual data value).
-     *
-     * @return bool
      */
-    public function isMergeRangeValueCell()
+    public function isMergeRangeValueCell(): bool
     {
         if ($mergeRange = $this->getMergeRange()) {
             $mergeRange = Coordinate::splitRange($mergeRange);
             [$startCell] = $mergeRange[0];
-            if ($this->getCoordinate() === $startCell) {
-                return true;
-            }
+
+            return $this->getCoordinate() === $startCell;
         }
 
         return false;
@@ -579,7 +559,7 @@ class Cell
      *
      * @return Cell
      */
-    public function rebindParent(Worksheet $parent)
+    public function rebindParent(Worksheet $parent): self
     {
         $this->parent = $parent->getCellCollection();
 
@@ -590,10 +570,8 @@ class Cell
      *    Is cell in a specific range?
      *
      * @param string $range Cell range (e.g. A1:A1)
-     *
-     * @return bool
      */
-    public function isInRange($range)
+    public function isInRange(string $range): bool
     {
         [$rangeStart, $rangeEnd] = Coordinate::rangeBoundaries($range);
 
@@ -614,7 +592,7 @@ class Cell
      *
      * @return int Result of comparison (always -1 or 1, never zero!)
      */
-    public static function compareCells(self $a, self $b)
+    public static function compareCells(self $a, self $b): int
     {
         if ($a->getRow() < $b->getRow()) {
             return -1;
@@ -629,10 +607,8 @@ class Cell
 
     /**
      * Get value binder to use.
-     *
-     * @return IValueBinder
      */
-    public static function getValueBinder()
+    public static function getValueBinder(): IValueBinder
     {
         if (self::$valueBinder === null) {
             self::$valueBinder = new DefaultValueBinder();
@@ -655,21 +631,19 @@ class Cell
     public function __clone()
     {
         $vars = get_object_vars($this);
-        foreach ($vars as $key => $value) {
-            if ((is_object($value)) && ($key != 'parent')) {
-                $this->$key = clone $value;
+        foreach ($vars as $propertyName => $propertyValue) {
+            if ((is_object($propertyValue)) && ($propertyName !== 'parent')) {
+                $this->$propertyName = clone $propertyValue;
             } else {
-                $this->$key = $value;
+                $this->$propertyName = $propertyValue;
             }
         }
     }
 
     /**
      * Get index to cellXf.
-     *
-     * @return int
      */
-    public function getXfIndex()
+    public function getXfIndex(): int
     {
         return $this->xfIndex;
     }
@@ -677,11 +651,9 @@ class Cell
     /**
      * Set index to cellXf.
      *
-     * @param int $indexValue
-     *
      * @return Cell
      */
-    public function setXfIndex($indexValue)
+    public function setXfIndex(int $indexValue): self
     {
         $this->xfIndex = $indexValue;
 
@@ -695,7 +667,7 @@ class Cell
      *
      * @return $this
      */
-    public function setFormulaAttributes($attributes)
+    public function setFormulaAttributes($attributes): self
     {
         $this->formulaAttributes = $attributes;
 
diff --git a/src/PhpSpreadsheet/Collection/Cells.php b/src/PhpSpreadsheet/Collection/Cells.php
index 20fccf48..03ad1cd4 100644
--- a/src/PhpSpreadsheet/Collection/Cells.php
+++ b/src/PhpSpreadsheet/Collection/Cells.php
@@ -91,10 +91,8 @@ class Cells
      * Whether the collection holds a cell for the given coordinate.
      *
      * @param string $cellCoordinate Coordinate of the cell to check
-     *
-     * @return bool
      */
-    public function has($cellCoordinate)
+    public function has($cellCoordinate): bool
     {
         return ($cellCoordinate === $this->currentCoordinate) || isset($this->index[$cellCoordinate]);
     }
@@ -103,10 +101,8 @@ class Cells
      * Add or update a cell in the collection.
      *
      * @param Cell $cell Cell to update
-     *
-     * @return Cell
      */
-    public function update(Cell $cell)
+    public function update(Cell $cell): Cell
     {
         return $this->add($cell->getCoordinate(), $cell);
     }
@@ -165,10 +161,8 @@ class Cells
 
     /**
      * Return the column coordinate of the currently active cell object.
-     *
-     * @return string
      */
-    public function getCurrentColumn()
+    public function getCurrentColumn(): string
     {
         sscanf($this->currentCoordinate ?? '', '%[A-Z]%d', $column, $row);
 
@@ -177,10 +171,8 @@ class Cells
 
     /**
      * Return the row coordinate of the currently active cell object.
-     *
-     * @return int
      */
-    public function getCurrentRow()
+    public function getCurrentRow(): int
     {
         sscanf($this->currentCoordinate ?? '', '%[A-Z]%d', $column, $row);
 
diff --git a/src/PhpSpreadsheet/Collection/CellsFactory.php b/src/PhpSpreadsheet/Collection/CellsFactory.php
index 26f18dfc..b3833bd8 100644
--- a/src/PhpSpreadsheet/Collection/CellsFactory.php
+++ b/src/PhpSpreadsheet/Collection/CellsFactory.php
@@ -12,9 +12,8 @@ abstract class CellsFactory
      *
      * @param Worksheet $worksheet Enable cell caching for this worksheet
      *
-     * @return Cells
      * */
-    public static function getInstance(Worksheet $worksheet)
+    public static function getInstance(Worksheet $worksheet): Cells
     {
         return new Cells($worksheet, Settings::getCache());
     }
diff --git a/src/PhpSpreadsheet/Worksheet/Worksheet.php b/src/PhpSpreadsheet/Worksheet/Worksheet.php
index e89043c8..13cd4f61 100644
--- a/src/PhpSpreadsheet/Worksheet/Worksheet.php
+++ b/src/PhpSpreadsheet/Worksheet/Worksheet.php
@@ -1336,7 +1336,7 @@ class Worksheet implements IComparable
      *
      * @return Cell Cell that was created
      */
-    public function createNewCell($coordinate)
+    public function createNewCell($coordinate): Cell
     {
         [$column, $row, $columnString] = Coordinate::indexesFromString($coordinate);
         $cell = new Cell(null, DataType::TYPE_NULL, $this);
@@ -2459,10 +2459,8 @@ class Worksheet implements IComparable
 
     /**
      * Show gridlines?
-     *
-     * @return bool
      */
-    public function getShowGridlines()
+    public function getShowGridlines(): bool
     {
         return $this->showGridlines;
     }
@@ -2474,7 +2472,7 @@ class Worksheet implements IComparable
      *
      * @return $this
      */
-    public function setShowGridlines($showGridLines)
+    public function setShowGridlines(bool $showGridLines): self
     {
         $this->showGridlines = $showGridLines;
 
@@ -2483,10 +2481,8 @@ class Worksheet implements IComparable
 
     /**
      * Print gridlines?
-     *
-     * @return bool
      */
-    public function getPrintGridlines()
+    public function getPrintGridlines(): bool
     {
         return $this->printGridlines;
     }
@@ -2498,7 +2494,7 @@ class Worksheet implements IComparable
      *
      * @return $this
      */
-    public function setPrintGridlines($printGridLines)
+    public function setPrintGridlines(bool $printGridLines): self
     {
         $this->printGridlines = $printGridLines;
 
@@ -2507,10 +2503,8 @@ class Worksheet implements IComparable
 
     /**
      * Show row and column headers?
-     *
-     * @return bool
      */
-    public function getShowRowColHeaders()
+    public function getShowRowColHeaders(): bool
     {
         return $this->showRowColHeaders;
     }
@@ -2522,7 +2516,7 @@ class Worksheet implements IComparable
      *
      * @return $this
      */
-    public function setShowRowColHeaders($showRowColHeaders)
+    public function setShowRowColHeaders(bool $showRowColHeaders): self
     {
         $this->showRowColHeaders = $showRowColHeaders;
 
@@ -2531,10 +2525,8 @@ class Worksheet implements IComparable
 
     /**
      * Show summary below? (Row/Column outlining).
-     *
-     * @return bool
      */
-    public function getShowSummaryBelow()
+    public function getShowSummaryBelow(): bool
     {
         return $this->showSummaryBelow;
     }
@@ -2546,7 +2538,7 @@ class Worksheet implements IComparable
      *
      * @return $this
      */
-    public function setShowSummaryBelow($showSummaryBelow)
+    public function setShowSummaryBelow(bool $showSummaryBelow): self
     {
         $this->showSummaryBelow = $showSummaryBelow;
 
@@ -2555,10 +2547,8 @@ class Worksheet implements IComparable
 
     /**
      * Show summary right? (Row/Column outlining).
-     *
-     * @return bool
      */
-    public function getShowSummaryRight()
+    public function getShowSummaryRight(): bool
     {
         return $this->showSummaryRight;
     }
@@ -2570,7 +2560,7 @@ class Worksheet implements IComparable
      *
      * @return $this
      */
-    public function setShowSummaryRight($showSummaryRight)
+    public function setShowSummaryRight(bool $showSummaryRight): self
     {
         $this->showSummaryRight = $showSummaryRight;
 
@@ -2594,7 +2584,7 @@ class Worksheet implements IComparable
      *
      * @return $this
      */
-    public function setComments(array $comments)
+    public function setComments(array $comments): self
     {
         $this->comments = $comments;
 
@@ -2609,7 +2599,7 @@ class Worksheet implements IComparable
      *
      * @return $this
      */
-    public function removeComment($cellCoordinate)
+    public function removeComment($cellCoordinate): self
     {
         $cellAddress = Functions::trimSheetFromCellReference(Validations::validateCellAddress($cellCoordinate));
 
@@ -2633,10 +2623,8 @@ class Worksheet implements IComparable
      *
      * @param array<int>|CellAddress|string $cellCoordinate Coordinate of the cell as a string, eg: 'C5';
      *               or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
-     *
-     * @return Comment
      */
-    public function getComment($cellCoordinate)
+    public function getComment($cellCoordinate): Comment
     {
         $cellAddress = Functions::trimSheetFromCellReference(Validations::validateCellAddress($cellCoordinate));
 
@@ -2669,10 +2657,8 @@ class Worksheet implements IComparable
      *
      * @param int $columnIndex Numeric column coordinate of the cell
      * @param int $row Numeric row coordinate of the cell
-     *
-     * @return Comment
      */
-    public function getCommentByColumnAndRow($columnIndex, $row)
+    public function getCommentByColumnAndRow($columnIndex, $row): Comment
     {
         return $this->getComment(Coordinate::stringFromColumnIndex($columnIndex) . $row);
     }

From 0492ea6d8a99ed0b0d3452bd94c9ef6778ab8205 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Fri, 12 Aug 2022 18:59:28 -0700
Subject: [PATCH 22/69] Use Only mb_convert_encoding in StringHelper
 sanitizeUTF8 (#2994)

* Test if UConverter Exists Without Autoload

Fix #2982. That issue is actually closed, but it did expose a problem. Our test environments all enable php-intl, but that extension isn't a formal requirement for PhpSpreadsheet. Perhaps it ought to be. Nevertheless ...

Using UConverter for string translation solved some problems for us. However, it is only available when php-intl is enabled. The code tests if it exists before using it, so no big deal ... except it seems likely that the people reporting the issue not only did not have php-intl, but they do have their own autoloader which issues an exception when the class isn't found. The test for existence of UConverter defaulted to attempting to autoload it if not found. So, on a system without php-intl but with a custom autoloader, there is a problem. Code is changed to suppress autoload when testing UConverter existence.

Pending this fix, the workaround for this issue is to enable php-intl.

* Minor Improvement

Make mb_convert_encoding use same substitution character as UConverter, ensuring consistent results whatever the user's environment.

* And Now That I Figured That Out

Since mb_convert_encoding can now return the same output as UConverter, we don't need UConverter (or iconv) after all in sanitizeUTF8.
---
 src/PhpSpreadsheet/Shared/StringHelper.php | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/PhpSpreadsheet/Shared/StringHelper.php b/src/PhpSpreadsheet/Shared/StringHelper.php
index 030df66d..0fe10e4d 100644
--- a/src/PhpSpreadsheet/Shared/StringHelper.php
+++ b/src/PhpSpreadsheet/Shared/StringHelper.php
@@ -3,7 +3,6 @@
 namespace PhpOffice\PhpSpreadsheet\Shared;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
-use UConverter;
 
 class StringHelper
 {
@@ -334,26 +333,13 @@ class StringHelper
     public static function sanitizeUTF8(string $textValue): string
     {
         $textValue = str_replace(["\xef\xbf\xbe", "\xef\xbf\xbf"], "\xef\xbf\xbd", $textValue);
-        if (class_exists(UConverter::class)) {
-            $returnValue = UConverter::transcode($textValue, 'UTF-8', 'UTF-8');
-            if ($returnValue !== false) {
-                return $returnValue;
-            }
-        }
-        // @codeCoverageIgnoreStart
-        // I don't think any of the code below should ever be executed.
-        if (self::getIsIconvEnabled()) {
-            $returnValue = @iconv('UTF-8', 'UTF-8', $textValue);
-            if ($returnValue !== false) {
-                return $returnValue;
-            }
-        }
-
+        $subst = mb_substitute_character(); // default is question mark
+        mb_substitute_character(65533); // Unicode substitution character
         // Phpstan does not think this can return false.
         $returnValue = mb_convert_encoding($textValue, 'UTF-8', 'UTF-8');
+        mb_substitute_character($subst);
 
         return $returnValue;
-        // @codeCoverageIgnoreEnd
     }
 
     /**

From f34e0ead2991e07d4868553ea623f4f6f121a5cb Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Fri, 12 Aug 2022 20:10:45 -0700
Subject: [PATCH 23/69] Add setName Method for Chart (#3001)

Addresses a problem identified in issue #2991. Chart name is set in constructor, but there is no method to subsequently change it. This PR adds a method to do so.
---
 src/PhpSpreadsheet/Chart/Chart.php                  | 7 +++++++
 tests/PhpSpreadsheetTests/Chart/ChartMethodTest.php | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/PhpSpreadsheet/Chart/Chart.php b/src/PhpSpreadsheet/Chart/Chart.php
index 556b0eff..b962978d 100644
--- a/src/PhpSpreadsheet/Chart/Chart.php
+++ b/src/PhpSpreadsheet/Chart/Chart.php
@@ -188,6 +188,13 @@ class Chart
         return $this->name;
     }
 
+    public function setName(string $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
     /**
      * Get Worksheet.
      */
diff --git a/tests/PhpSpreadsheetTests/Chart/ChartMethodTest.php b/tests/PhpSpreadsheetTests/Chart/ChartMethodTest.php
index 027ddc53..5c3622ad 100644
--- a/tests/PhpSpreadsheetTests/Chart/ChartMethodTest.php
+++ b/tests/PhpSpreadsheetTests/Chart/ChartMethodTest.php
@@ -93,8 +93,9 @@ class ChartMethodTest extends TestCase
             $xAxis, // xAxis
             $yAxis // yAxis
         );
-        $chart2 = new Chart('chart1');
+        $chart2 = new Chart('xyz');
         $chart2
+            ->setName('chart1')
             ->setLegend($legend)
             ->setPlotArea($plotArea)
             ->setPlotVisibleOnly(true)

From 5c13b179a162a87c07f10324743cc84dadadc612 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Sat, 13 Aug 2022 18:14:25 -0700
Subject: [PATCH 24/69] Replace Dev jpgraph/jpgraph with mitoteam/jpgraph
 (#2997)

* Replace Dev jpgraph/jpgraph with mitoteam/jpgraph

PR #2979 added support for mitoteam/jpgraph as an alternative to jpgraph/jpgraph. The package jpgraph/jpgraph is abandoned in composer, and the version loaded with composer has been unusable for some time. This PR removes the dev requirement for jpgraph/jpgraph, and adds a dev requirement for mitoteam/jpgraph in its place.

With a usable graph library, a number of tests and samples that had been disabled are now re-enabled. A lot of new functionality has been added to Charts recently. Some of that new code has exposed bugs in JpgraphRendererBase. I have fixed those where I could. A handful of exceptions remain; I will investigate, and hopefully fix, those over time, but I don't feel it is necessary to fix them all before installing this PR - we are already way ahead of the game with the graphs that are working.

Three members had been ignoring code coverage in whole or in part because of the unavailability of a usable graph libray. Code coverage is restored in them. I am relieved to report that, although they aren't completely covered, adding them did not reduce code coverage by much - it is still over 90.4%.

I took a look at JpgraphRendererBase and Phpstan. Phpstan reports 128 problems. When I added some docblocks to correct some of those, the number increased to 284. Sigh. I will investigate over time, but, for now, we will still suppress Phpstan for JpgraphRendererBase.

I do not find a License file for mitoteam. However, there also wasn't one for jpgraph in the first place. Based on that and the discussion in #2996 (mitoteam will be used in exactly the same manner as mpdf), I don't think this is a problem. IANAL.

* PHP 8.2 Problems

Tons of "cannot create dynamic property" deprecations in jpgraph. Disable the test with most of those for now; leave the two with only a handful of messages enabled.

* Correct Failures in 2 Stock Charts

Down to 6 templates on which Render fails.
---
 composer.json                                 |  9 +-
 composer.lock                                 | 88 ++++++++++---------
 phpstan.neon.dist                             |  1 -
 samples/Chart/32_Chart_read_write_HTML.php    |  3 +-
 samples/Chart/32_Chart_read_write_PDF.php     |  3 +-
 samples/Chart/35_Chart_render.php             | 26 ++++--
 src/PhpSpreadsheet/Chart/Chart.php            |  4 -
 .../Chart/Renderer/JpGraphRendererBase.php    | 22 +++--
 .../Chart/Renderer/MtJpGraphRenderer.php      |  2 -
 src/PhpSpreadsheet/Writer/Html.php            | 10 ---
 .../PhpSpreadsheetTests/Chart/RenderTest.php  | 15 ++++
 .../PhpSpreadsheetTests/Helper/SampleTest.php |  9 +-
 12 files changed, 110 insertions(+), 82 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Chart/RenderTest.php

diff --git a/composer.json b/composer.json
index 16991514..4ef1c1b4 100644
--- a/composer.json
+++ b/composer.json
@@ -81,7 +81,7 @@
         "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
         "dompdf/dompdf": "^1.0 || ^2.0",
         "friendsofphp/php-cs-fixer": "^3.2",
-        "jpgraph/jpgraph": "^4.0",
+        "mitoteam/jpgraph": "^10.1",
         "mpdf/mpdf": "8.1.1",
         "phpcompatibility/php-compatibility": "^9.3",
         "phpstan/phpstan": "^1.1",
@@ -91,10 +91,11 @@
         "tecnickcom/tcpdf": "^6.4"
     },
     "suggest": {
+        "ext-intl": "PHP Internationalization Functions",
         "mpdf/mpdf": "Option for rendering PDF with PDF Writer",
-        "dompdf/dompdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)",
-        "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)",
-        "jpgraph/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers"
+        "dompdf/dompdf": "Option for rendering PDF with PDF Writer",
+        "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer (doesn't yet fully support PHP8)",
+        "mitoteam/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers"
     },
     "autoload": {
         "psr-4": {
diff --git a/composer.lock b/composer.lock
index 3f82754d..bbbd0c75 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "6cbb20f8d8f2daae0aeb72431cda0980",
+    "content-hash": "fc6928651785d4bb82d727d22f50227d",
     "packages": [
         {
             "name": "ezyang/htmlpurifier",
@@ -1192,47 +1192,6 @@
             ],
             "time": "2021-12-11T16:25:08+00:00"
         },
-        {
-            "name": "jpgraph/jpgraph",
-            "version": "4.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/ztec/JpGraph.git",
-                "reference": "e82db7da6a546d3926c24c9a346226da7aa49094"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/ztec/JpGraph/zipball/e82db7da6a546d3926c24c9a346226da7aa49094",
-                "reference": "e82db7da6a546d3926c24c9a346226da7aa49094",
-                "shasum": ""
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "lib/JpGraph.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "QPL 1.0"
-            ],
-            "authors": [
-                {
-                    "name": "JpGraph team"
-                }
-            ],
-            "description": "jpGraph, library to make graphs and charts",
-            "homepage": "http://jpgraph.net/",
-            "keywords": [
-                "chart",
-                "data",
-                "graph",
-                "jpgraph",
-                "pie"
-            ],
-            "abandoned": true,
-            "time": "2017-02-23T09:44:15+00:00"
-        },
         {
             "name": "masterminds/html5",
             "version": "2.7.5",
@@ -1298,6 +1257,49 @@
             ],
             "time": "2021-07-01T14:25:37+00:00"
         },
+        {
+            "name": "mitoteam/jpgraph",
+            "version": "10.1.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mitoteam/jpgraph.git",
+                "reference": "425a2a0f0c97a28fe0aca60a4384ce85880e438a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/mitoteam/jpgraph/zipball/425a2a0f0c97a28fe0aca60a4384ce85880e438a",
+                "reference": "425a2a0f0c97a28fe0aca60a4384ce85880e438a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/MtJpGraph.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "QPL-1.0"
+            ],
+            "authors": [
+                {
+                    "name": "JpGraph team"
+                }
+            ],
+            "description": "Composer compatible version of JpGraph library with PHP 8.1 support",
+            "homepage": "https://github.com/mitoteam/jpgraph",
+            "keywords": [
+                "jpgraph"
+            ],
+            "support": {
+                "issues": "https://github.com/mitoteam/jpgraph/issues",
+                "source": "https://github.com/mitoteam/jpgraph/tree/10.1.3"
+            },
+            "time": "2022-07-05T16:46:34+00:00"
+        },
         {
             "name": "mpdf/mpdf",
             "version": "v8.1.1",
@@ -5273,5 +5275,5 @@
         "ext-zlib": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "1.1.0"
+    "plugin-api-version": "2.2.0"
 }
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 92767872..5cac36a1 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -12,7 +12,6 @@ parameters:
     excludePaths:
         - src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
         - src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php
-        - src/PhpSpreadsheet/Chart/Renderer/MtJpGraphRenderer.php
     parallel:
         processTimeout: 300.0
     checkMissingIterableValueType: false
diff --git a/samples/Chart/32_Chart_read_write_HTML.php b/samples/Chart/32_Chart_read_write_HTML.php
index 5febbf93..90d61c5d 100644
--- a/samples/Chart/32_Chart_read_write_HTML.php
+++ b/samples/Chart/32_Chart_read_write_HTML.php
@@ -6,7 +6,8 @@ use PhpOffice\PhpSpreadsheet\Settings;
 require __DIR__ . '/../Header.php';
 
 // Change these values to select the Rendering library that you wish to use
-Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\JpGraph::class);
+//Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\JpGraph::class);
+Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\MtJpGraphRenderer::class);
 
 $inputFileType = 'Xlsx';
 $inputFileNames = __DIR__ . '/../templates/36write*.xlsx';
diff --git a/samples/Chart/32_Chart_read_write_PDF.php b/samples/Chart/32_Chart_read_write_PDF.php
index ee3ad0e0..214c3d38 100644
--- a/samples/Chart/32_Chart_read_write_PDF.php
+++ b/samples/Chart/32_Chart_read_write_PDF.php
@@ -8,7 +8,8 @@ require __DIR__ . '/../Header.php';
 IOFactory::registerWriter('Pdf', \PhpOffice\PhpSpreadsheet\Writer\Pdf\Mpdf::class);
 
 // Change these values to select the Rendering library that you wish to use
-Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\JpGraph::class);
+//Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\JpGraph::class);
+Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\MtJpGraphRenderer::class);
 
 $inputFileType = 'Xlsx';
 $inputFileNames = __DIR__ . '/../templates/36write*.xlsx';
diff --git a/samples/Chart/35_Chart_render.php b/samples/Chart/35_Chart_render.php
index ebab16a7..2376008c 100644
--- a/samples/Chart/35_Chart_render.php
+++ b/samples/Chart/35_Chart_render.php
@@ -5,16 +5,13 @@ use PhpOffice\PhpSpreadsheet\Settings;
 
 require __DIR__ . '/../Header.php';
 
-if (PHP_VERSION_ID >= 80000) {
-    $helper->log('Jpgraph no longer runs against PHP8');
-    exit;
-}
-
 // Change these values to select the Rendering library that you wish to use
-Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\JpGraph::class);
+//Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\JpGraph::class);
+Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\MtJpGraphRenderer::class);
 
 $inputFileType = 'Xlsx';
 $inputFileNames = __DIR__ . '/../templates/32readwrite*[0-9].xlsx';
+//$inputFileNames = __DIR__ . '/../templates/32readwriteStockChart5.xlsx';
 
 if ((isset($argc)) && ($argc > 1)) {
     $inputFileNames = [];
@@ -24,6 +21,18 @@ if ((isset($argc)) && ($argc > 1)) {
 } else {
     $inputFileNames = glob($inputFileNames);
 }
+if (count($inputFileNames) === 1) {
+    $unresolvedErrors = [];
+} else {
+    $unresolvedErrors = [
+        '32readwriteBubbleChart2.xlsx',
+        '32readwritePieChart3.xlsx',
+        '32readwritePieChart4.xlsx',
+        '32readwritePieChart3D1.xlsx',
+        '32readwritePieChartExploded1.xlsx',
+        '32readwritePieChartExploded3D1.xlsx',
+    ];
+}
 foreach ($inputFileNames as $inputFileName) {
     $inputFileNameShort = basename($inputFileName);
 
@@ -32,6 +41,11 @@ foreach ($inputFileNames as $inputFileName) {
 
         continue;
     }
+    if (in_array($inputFileNameShort, $unresolvedErrors, true)) {
+        $helper->log('File ' . $inputFileNameShort . ' does not yet work with this script');
+
+        continue;
+    }
 
     $helper->log("Load Test from $inputFileType file " . $inputFileNameShort);
 
diff --git a/src/PhpSpreadsheet/Chart/Chart.php b/src/PhpSpreadsheet/Chart/Chart.php
index b962978d..036338c6 100644
--- a/src/PhpSpreadsheet/Chart/Chart.php
+++ b/src/PhpSpreadsheet/Chart/Chart.php
@@ -661,14 +661,10 @@ class Chart
 
     /**
      * Render the chart to given file (or stream).
-     * Unable to cover code until a usable current version of JpGraph
-     * is made available through Composer.
      *
      * @param string $outputDestination Name of the file render to
      *
      * @return bool true on success
-     *
-     * @codeCoverageIgnore
      */
     public function render($outputDestination = null)
     {
diff --git a/src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php b/src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php
index 4d5526b8..f0ce1f65 100644
--- a/src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php
+++ b/src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php
@@ -277,7 +277,8 @@ abstract class JpGraphRendererBase implements IRenderer
     {
         $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
 
-        $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount();
+        $index = array_keys($this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotOrder())[0];
+        $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($index)->getPointCount();
         if ($labelCount > 0) {
             $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
             $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels, $labelCount);
@@ -294,8 +295,9 @@ abstract class JpGraphRendererBase implements IRenderer
 
         //    Loop through each data series in turn
         for ($i = 0; $i < $seriesCount; ++$i) {
-            $dataValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
-            $marker = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
+            $index = array_keys($this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotOrder())[$i];
+            $dataValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($index)->getDataValues();
+            $marker = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($index)->getPointMarker();
 
             if ($grouping == 'percentStacked') {
                 $dataValues = $this->percentageAdjustValues($dataValues, $sumValues);
@@ -324,7 +326,7 @@ abstract class JpGraphRendererBase implements IRenderer
                 //    Set the appropriate plot marker
                 $this->formatPointMarker($seriesPlot, $marker);
             }
-            $dataLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($i)->getDataValue();
+            $dataLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($index)->getDataValue();
             $seriesPlot->SetLegend($dataLabel);
 
             $seriesPlots[] = $seriesPlot;
@@ -347,7 +349,8 @@ abstract class JpGraphRendererBase implements IRenderer
         }
         $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
 
-        $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount();
+        $index = array_keys($this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotOrder())[0];
+        $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($index)->getPointCount();
         if ($labelCount > 0) {
             $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
             $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels, $labelCount, $rotation);
@@ -371,7 +374,8 @@ abstract class JpGraphRendererBase implements IRenderer
 
         //    Loop through each data series in turn
         for ($j = 0; $j < $seriesCount; ++$j) {
-            $dataValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($j)->getDataValues();
+            $index = array_keys($this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotOrder())[$j];
+            $dataValues = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($index)->getDataValues();
             if ($grouping == 'percentStacked') {
                 $dataValues = $this->percentageAdjustValues($dataValues, $sumValues);
             }
@@ -535,6 +539,10 @@ abstract class JpGraphRendererBase implements IRenderer
         $dataValues = [];
         //    Loop through each data series in turn and build the plot arrays
         foreach ($plotOrder as $i => $v) {
+            $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($v);
+            if ($dataValuesX === false) {
+                continue;
+            }
             $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($v)->getDataValues();
             foreach ($dataValuesX as $j => $dataValueX) {
                 $dataValues[$plotOrder[$i]][$j] = $dataValueX;
@@ -549,7 +557,7 @@ abstract class JpGraphRendererBase implements IRenderer
         $jMax = count($dataValues[0]);
         for ($j = 0; $j < $jMax; ++$j) {
             for ($i = 0; $i < $seriesCount; ++$i) {
-                $dataValuesPlot[] = $dataValues[$i][$j];
+                $dataValuesPlot[] = $dataValues[$i][$j] ?? null;
             }
         }
 
diff --git a/src/PhpSpreadsheet/Chart/Renderer/MtJpGraphRenderer.php b/src/PhpSpreadsheet/Chart/Renderer/MtJpGraphRenderer.php
index 3fef3b6e..e1f0f90a 100644
--- a/src/PhpSpreadsheet/Chart/Renderer/MtJpGraphRenderer.php
+++ b/src/PhpSpreadsheet/Chart/Renderer/MtJpGraphRenderer.php
@@ -9,8 +9,6 @@ namespace PhpOffice\PhpSpreadsheet\Chart\Renderer;
  * https://packagist.org/packages/mitoteam/jpgraph
  *
  * This package is up to date for August 2022 and has PHP 8.1 support.
- *
- * @codeCoverageIgnore
  */
 class MtJpGraphRenderer extends JpGraphRendererBase
 {
diff --git a/src/PhpSpreadsheet/Writer/Html.php b/src/PhpSpreadsheet/Writer/Html.php
index 6e51b7a8..f6c34a8a 100644
--- a/src/PhpSpreadsheet/Writer/Html.php
+++ b/src/PhpSpreadsheet/Writer/Html.php
@@ -551,15 +551,10 @@ class Html extends BaseWriter
      * Extend Row if chart is placed after nominal end of row.
      * This code should be exercised by sample:
      * Chart/32_Chart_read_write_PDF.php.
-     * However, that test is suppressed due to out-of-date
-     * Jpgraph code issuing warnings. So, don't measure
-     * code coverage for this function till that is fixed.
      *
      * @param int $row Row to check for charts
      *
      * @return array
-     *
-     * @codeCoverageIgnore
      */
     private function extendRowsForCharts(Worksheet $worksheet, int $row)
     {
@@ -725,11 +720,6 @@ class Html extends BaseWriter
      * Generate chart tag in cell.
      * This code should be exercised by sample:
      * Chart/32_Chart_read_write_PDF.php.
-     * However, that test is suppressed due to out-of-date
-     * Jpgraph code issuing warnings. So, don't measure
-     * code coverage for this function till that is fixed.
-     *
-     * @codeCoverageIgnore
      */
     private function writeChartInCell(Worksheet $worksheet, string $coordinates): string
     {
diff --git a/tests/PhpSpreadsheetTests/Chart/RenderTest.php b/tests/PhpSpreadsheetTests/Chart/RenderTest.php
new file mode 100644
index 00000000..f0eaffee
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Chart/RenderTest.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Writer\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Chart\Chart;
+use PHPUnit\Framework\TestCase;
+
+class RenderTest extends TestCase
+{
+    public function testNoRenderer(): void
+    {
+        $chart = new Chart('Chart1');
+        self::assertFalse($chart->render());
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Helper/SampleTest.php b/tests/PhpSpreadsheetTests/Helper/SampleTest.php
index 50a650f8..a104e8ff 100644
--- a/tests/PhpSpreadsheetTests/Helper/SampleTest.php
+++ b/tests/PhpSpreadsheetTests/Helper/SampleTest.php
@@ -26,10 +26,13 @@ class SampleTest extends TestCase
     public function providerSample(): array
     {
         $skipped = [
-            'Chart/32_Chart_read_write_PDF.php', // Unfortunately JpGraph is not up to date for latest PHP and raise many warnings
-            'Chart/32_Chart_read_write_HTML.php', // idem
-            'Chart/35_Chart_render.php', // idem
         ];
+        if (PHP_VERSION_ID >= 80200) {
+            // Hopefully temporary. Continue to try
+            //  32_chart_read_write_PDF/HTML
+            // so as not to lose track of the problem.
+            $skipped[] = 'Chart/35_Chart_render.php';
+        }
 
         // Unfortunately some tests are too long to run with code-coverage
         // analysis on GitHub Actions, so we need to exclude them

From fadfb727bf14cd098f55f1d4329160399afae058 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Sat, 13 Aug 2022 18:28:22 -0700
Subject: [PATCH 25/69] Minor Changes for Mpdf, Dompdf (#3002)

See discussion in #2999. Mpdf is not acknowledging the styling that we're using to hide table rows. I have opened an issue with them, but enclosing the cells in the hidden row inside a div with appropriate css does seem to be a workaround, and that can be incorporated into PhpSpreadsheet. It's kludgey, and it isn't even valid HTML, but ...

Mpdf also doesn't like the addition of the ```file:///``` prefix when using local images from Windows (sample 21). Results are better when that prefix is not added.

Dompdf seemed to have problems with sample 21 images on both Windows and Unix, with or without the file prefix. It does, however, support data urls for both, so is changed to embed images. It's still not perfect - the image seems truncated to the row height - but the results are better. I will continue to research, but may proceed as-is if I don't find anything better to do.

Html Writer was producing a file with mixed line endings on Windows. This didn't cause any harm, but it seems a bit sloppy. It is changed to always use PHP_EOL as a line ending.
---
 samples/Pdf/21a_Pdf.php                  |  2 +
 src/PhpSpreadsheet/Writer/Html.php       | 58 ++++++++++++++----------
 src/PhpSpreadsheet/Writer/Pdf/Dompdf.php |  7 +++
 3 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/samples/Pdf/21a_Pdf.php b/samples/Pdf/21a_Pdf.php
index b5572afe..33b61c9f 100644
--- a/samples/Pdf/21a_Pdf.php
+++ b/samples/Pdf/21a_Pdf.php
@@ -12,6 +12,8 @@ $spreadsheet->getActiveSheet()->setShowGridLines(false);
 $helper->log('Set orientation to landscape');
 $spreadsheet->getActiveSheet()->getPageSetup()->setOrientation(PageSetup::ORIENTATION_LANDSCAPE);
 $spreadsheet->setActiveSheetIndex(0)->setPrintGridlines(true);
+// Issue 2299 - mpdf can't handle hide rows without kludge
+$spreadsheet->getActiveSheet()->getRowDimension(2)->setVisible(false);
 
 function changeGridlines(string $html): string
 {
diff --git a/src/PhpSpreadsheet/Writer/Html.php b/src/PhpSpreadsheet/Writer/Html.php
index f6c34a8a..362eae00 100644
--- a/src/PhpSpreadsheet/Writer/Html.php
+++ b/src/PhpSpreadsheet/Writer/Html.php
@@ -54,7 +54,7 @@ class Html extends BaseWriter
      *
      * @var bool
      */
-    private $embedImages = false;
+    protected $embedImages = false;
 
     /**
      * Use inline CSS?
@@ -630,11 +630,12 @@ class Html extends BaseWriter
      *
      * @return string
      */
-    public static function winFileToUrl($filename)
+    public static function winFileToUrl($filename, bool $mpdf = false)
     {
         // Windows filename
         if (substr($filename, 1, 2) === ':\\') {
-            $filename = 'file:///' . str_replace('\\', '/', $filename);
+            $protocol = $mpdf ? '' : 'file:///';
+            $filename = $protocol . str_replace('\\', '/', $filename);
         }
 
         return $filename;
@@ -676,9 +677,9 @@ class Html extends BaseWriter
                 $filename = htmlspecialchars($filename, Settings::htmlEntityFlags());
 
                 $html .= PHP_EOL;
-                $imageData = self::winFileToUrl($filename);
+                $imageData = self::winFileToUrl($filename, $this->isMPdf);
 
-                if (($this->embedImages && !$this->isPdf) || substr($imageData, 0, 6) === 'zip://') {
+                if ($this->embedImages || substr($imageData, 0, 6) === 'zip://') {
                     $picture = @file_get_contents($filename);
                     if ($picture !== false) {
                         $imageDetails = getimagesize($filename);
@@ -1160,9 +1161,9 @@ class Html extends BaseWriter
         $html = '';
         $id = $showid ? "id='sheet$sheetIndex'" : '';
         if ($showid) {
-            $html .= "<div style='page: page$sheetIndex'>\n";
+            $html .= "<div style='page: page$sheetIndex'>" . PHP_EOL;
         } else {
-            $html .= "<div style='page: page$sheetIndex' class='scrpgbrk'>\n";
+            $html .= "<div style='page: page$sheetIndex' class='scrpgbrk'>" . PHP_EOL;
         }
 
         $this->generateTableTag($worksheet, $id, $html, $sheetIndex);
@@ -1457,6 +1458,10 @@ class Html extends BaseWriter
         // Sheet index
         $sheetIndex = $worksheet->getParent()->getIndex($worksheet);
         $html = $this->generateRowStart($worksheet, $sheetIndex, $row);
+        $generateDiv = $this->isMPdf && $worksheet->getRowDimension($row + 1)->getVisible() === false;
+        if ($generateDiv) {
+            $html .= '<div style="visibility:hidden; display:none;">' . PHP_EOL;
+        }
 
         // Write cells
         $colNum = 0;
@@ -1504,6 +1509,9 @@ class Html extends BaseWriter
         }
 
         // Write row end
+        if ($generateDiv) {
+            $html .= '</div>' . PHP_EOL;
+        }
         $html .= '          </tr>' . PHP_EOL;
 
         // Return
@@ -1834,26 +1842,26 @@ class Html extends BaseWriter
             } elseif ($orientation === \PhpOffice\PhpSpreadsheet\Worksheet\PageSetup::ORIENTATION_PORTRAIT) {
                 $htmlPage .= 'size: portrait; ';
             }
-            $htmlPage .= "}\n";
+            $htmlPage .= '}' . PHP_EOL;
             ++$sheetId;
         }
-        $htmlPage .= <<<EOF
-.navigation {page-break-after: always;}
-.scrpgbrk, div + div {page-break-before: always;}
-@media screen {
-  .gridlines td {border: 1px solid black;}
-  .gridlines th {border: 1px solid black;}
-  body>div {margin-top: 5px;}
-  body>div:first-child {margin-top: 0;}
-  .scrpgbrk {margin-top: 1px;}
-}
-@media print {
-  .gridlinesp td {border: 1px solid black;}
-  .gridlinesp th {border: 1px solid black;}
-  .navigation {display: none;}
-}
-
-EOF;
+        $htmlPage .= implode(PHP_EOL, [
+            '.navigation {page-break-after: always;}',
+            '.scrpgbrk, div + div {page-break-before: always;}',
+            '@media screen {',
+            '  .gridlines td {border: 1px solid black;}',
+            '  .gridlines th {border: 1px solid black;}',
+            '  body>div {margin-top: 5px;}',
+            '  body>div:first-child {margin-top: 0;}',
+            '  .scrpgbrk {margin-top: 1px;}',
+            '}',
+            '@media print {',
+            '  .gridlinesp td {border: 1px solid black;}',
+            '  .gridlinesp th {border: 1px solid black;}',
+            '  .navigation {display: none;}',
+            '}',
+            '',
+        ]);
         $htmlPage .= $generateSurroundingHTML ? ('</style>' . PHP_EOL) : '';
 
         return $htmlPage;
diff --git a/src/PhpSpreadsheet/Writer/Pdf/Dompdf.php b/src/PhpSpreadsheet/Writer/Pdf/Dompdf.php
index bf9e28cb..cd17cccf 100644
--- a/src/PhpSpreadsheet/Writer/Pdf/Dompdf.php
+++ b/src/PhpSpreadsheet/Writer/Pdf/Dompdf.php
@@ -7,6 +7,13 @@ use PhpOffice\PhpSpreadsheet\Writer\Pdf;
 
 class Dompdf extends Pdf
 {
+    /**
+     * embed images, or link to images.
+     *
+     * @var bool
+     */
+    protected $embedImages = true;
+
     /**
      * Gets the implementation of external PDF library that should be used.
      *

From bb072d1ca7529b70d98f1015fe23df4b70ab5419 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Sun, 14 Aug 2022 10:57:34 -0700
Subject: [PATCH 26/69] Upgrade Dev TCPDF to 6.5 (#3006)

* Upgrade Dev TCPDF to 6.5

Implementation of https://github.com/tecnickcom/TCPDF/pull/467, which is available in just-released Tcpdf 6.5, will improve look of Tcpdf rendering for PhpSpreadsheet. Fix #1164.

One test had been suppressed for Tcpdf, ostensibly because it was not compatible with Php8. As it turns out, the PhpSpreadsheet code which invokes Tcpdf was (harmlessly) incorrect, so the Php8 issue was actually with PhpSpreadsheet, not Tcpdf. That code is corrected, and the test is no longer suppressed.

* Update Change Log

Pick up some earlier changes as well as this one, and deprecations which had been omitted from the 1.24 change log.
---
 CHANGELOG.md                                     | 16 +++++++++++++++-
 composer.json                                    |  4 ++--
 composer.lock                                    | 16 ++++++++++------
 src/PhpSpreadsheet/Writer/Pdf/Tcpdf.php          |  2 +-
 .../Functional/StreamTest.php                    |  8 +-------
 5 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00167722..4e19cb2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Implementation of the `ARRAYTOTEXT()` Excel Function
 - Support for [mitoteam/jpgraph](https://packagist.org/packages/mitoteam/jpgraph) implementation of
   JpGraph library to render charts added.
+- Charts: Add Gradients, Transparency, Hidden Axes, Rounded Corners, Trendlines.
 
 ### Changed
 
@@ -20,7 +21,12 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Deprecated
 
-- Nothing
+- Axis getLineProperty deprecated in favor of getLineColorProperty.
+- Moved majorGridlines and minorGridlines from Chart to Axis. Setting either in Chart constructor or through Chart methods, or getting either using Chart methods is deprecated.
+- Chart::EXCEL_COLOR_TYPE_* copied from Properties to ChartColor; use in Properties is deprecated.
+- ChartColor::EXCEL_COLOR_TYPE_ARGB deprecated in favor of EXCEL_COLOR_TYPE_RGB ("A" component was never allowed).
+- Misspelled Properties::LINE_STYLE_DASH_SQUERE_DOT deprecated in favor of LINE_STYLE_DASH_SQUARE_DOT.
+- Clone not permitted for Spreadsheet. Spreadsheet->copy() can be used instead.
 
 ### Removed
 
@@ -30,6 +36,14 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 - Fully flatten an array [Issue #2955](https://github.com/PHPOffice/PhpSpreadsheet/issues/2955) [PR #2956](https://github.com/PHPOffice/PhpSpreadsheet/pull/2956)
 - cellExists() and getCell() methods should support UTF-8 named cells [Issue #2987](https://github.com/PHPOffice/PhpSpreadsheet/issues/2987) [PR #2988](https://github.com/PHPOffice/PhpSpreadsheet/pull/2988)
+- Spreadsheet copy fixed, clone disabled. [PR #2951](https://github.com/PHPOffice/PhpSpreadsheet/pull/2951)
+- Fix PDF problems with text rotation and paper size. [Issue #1747](https://github.com/PHPOffice/PhpSpreadsheet/issues/1747) [Issue #1713](https://github.com/PHPOffice/PhpSpreadsheet/issues/1713) [PR #2960](https://github.com/PHPOffice/PhpSpreadsheet/pull/2960)
+- Limited support for chart titles as formulas [Issue #2965](https://github.com/PHPOffice/PhpSpreadsheet/issues/2965) [Issue #749](https://github.com/PHPOffice/PhpSpreadsheet/issues/749) [PR #2971](https://github.com/PHPOffice/PhpSpreadsheet/pull/2971)
+- Add Gradients, Transparency, and Hidden Axes to Chart [Issue #2257](https://github.com/PHPOffice/PhpSpreadsheet/issues/2257) [Issue #2229](https://github.com/PHPOffice/PhpSpreadsheet/issues/2929) [Issue #2935](https://github.com/PHPOffice/PhpSpreadsheet/issues/2935) [PR #2950](https://github.com/PHPOffice/PhpSpreadsheet/pull/2950)
+- Chart Support for Rounded Corners and Trendlines [Issue #2968](https://github.com/PHPOffice/PhpSpreadsheet/issues/2968) [Issue #2815](https://github.com/PHPOffice/PhpSpreadsheet/issues/2815) [PR #2976](https://github.com/PHPOffice/PhpSpreadsheet/pull/2976)
+- Add setName Method for Chart [Issue #2991](https://github.com/PHPOffice/PhpSpreadsheet/issues/2991) [PR #3001](https://github.com/PHPOffice/PhpSpreadsheet/pull/3001)
+- Eliminate partial dependency on php-intl in StringHelper [Issue #2982](https://github.com/PHPOffice/PhpSpreadsheet/issues/2982) [PR #2994](https://github.com/PHPOffice/PhpSpreadsheet/pull/2994)
+- Minor changes for Pdf [Issue #2999](https://github.com/PHPOffice/PhpSpreadsheet/issues/2999) [PR #3002](https://github.com/PHPOffice/PhpSpreadsheet/pull/3002) [PR #3006](https://github.com/PHPOffice/PhpSpreadsheet/pull/3006)
 
 ## 1.24.1 - 2022-07-18
 
diff --git a/composer.json b/composer.json
index 4ef1c1b4..cda2dc96 100644
--- a/composer.json
+++ b/composer.json
@@ -88,13 +88,13 @@
         "phpstan/phpstan-phpunit": "^1.0",
         "phpunit/phpunit": "^8.5 || ^9.0",
         "squizlabs/php_codesniffer": "^3.7",
-        "tecnickcom/tcpdf": "^6.4"
+        "tecnickcom/tcpdf": "6.5"
     },
     "suggest": {
         "ext-intl": "PHP Internationalization Functions",
         "mpdf/mpdf": "Option for rendering PDF with PDF Writer",
         "dompdf/dompdf": "Option for rendering PDF with PDF Writer",
-        "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer (doesn't yet fully support PHP8)",
+        "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer",
         "mitoteam/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers"
     },
     "autoload": {
diff --git a/composer.lock b/composer.lock
index bbbd0c75..f54b9c58 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "fc6928651785d4bb82d727d22f50227d",
+    "content-hash": "05bd955232ea7ceab5b849e990f593bd",
     "packages": [
         {
             "name": "ezyang/htmlpurifier",
@@ -5084,16 +5084,16 @@
         },
         {
             "name": "tecnickcom/tcpdf",
-            "version": "6.4.4",
+            "version": "6.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/tecnickcom/TCPDF.git",
-                "reference": "42cd0f9786af7e5db4fcedaa66f717b0d0032320"
+                "reference": "cc54c1503685e618b23922f53635f46e87653662"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/42cd0f9786af7e5db4fcedaa66f717b0d0032320",
-                "reference": "42cd0f9786af7e5db4fcedaa66f717b0d0032320",
+                "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/cc54c1503685e618b23922f53635f46e87653662",
+                "reference": "cc54c1503685e618b23922f53635f46e87653662",
                 "shasum": ""
             },
             "require": {
@@ -5142,13 +5142,17 @@
                 "pdf417",
                 "qrcode"
             ],
+            "support": {
+                "issues": "https://github.com/tecnickcom/TCPDF/issues",
+                "source": "https://github.com/tecnickcom/TCPDF/tree/6.5.0"
+            },
             "funding": [
                 {
                     "url": "https://www.paypal.com/cgi-bin/webscr?cmd=_donations&currency_code=GBP&business=paypal@tecnick.com&item_name=donation%20for%20tcpdf%20project",
                     "type": "custom"
                 }
             ],
-            "time": "2021-12-31T08:39:24+00:00"
+            "time": "2022-08-12T07:50:54+00:00"
         },
         {
             "name": "theseer/tokenizer",
diff --git a/src/PhpSpreadsheet/Writer/Pdf/Tcpdf.php b/src/PhpSpreadsheet/Writer/Pdf/Tcpdf.php
index d29d4764..aefc6b56 100644
--- a/src/PhpSpreadsheet/Writer/Pdf/Tcpdf.php
+++ b/src/PhpSpreadsheet/Writer/Pdf/Tcpdf.php
@@ -77,7 +77,7 @@ class Tcpdf extends Pdf
         $pdf->SetCreator($this->spreadsheet->getProperties()->getCreator());
 
         //  Write to file
-        fwrite($fileHandle, $pdf->output($filename, 'S'));
+        fwrite($fileHandle, $pdf->output('', 'S'));
 
         parent::restoreStateAfterSave();
     }
diff --git a/tests/PhpSpreadsheetTests/Functional/StreamTest.php b/tests/PhpSpreadsheetTests/Functional/StreamTest.php
index a84a2490..05b87ab9 100644
--- a/tests/PhpSpreadsheetTests/Functional/StreamTest.php
+++ b/tests/PhpSpreadsheetTests/Functional/StreamTest.php
@@ -18,15 +18,9 @@ class StreamTest extends TestCase
             ['Html'],
             ['Mpdf'],
             ['Dompdf'],
+            ['Tcpdf'],
         ];
 
-        if (\PHP_VERSION_ID < 80000) {
-            $providerFormats = array_merge(
-                $providerFormats,
-                [['Tcpdf']]
-            );
-        }
-
         return $providerFormats;
     }
 

From cd6629890162f447edd2c343c5b45fe0dfa8f8fe Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Sun, 14 Aug 2022 23:43:52 +0200
Subject: [PATCH 27/69] Adjust `extractAllCellReferencesInRange()` method to
 allow a worksheet in the reference

---
 src/PhpSpreadsheet/Cell/Coordinate.php        | 21 +++++++++++-
 src/PhpSpreadsheet/Worksheet/Worksheet.php    | 23 +++++++++----
 testing/cellReferenceTest.php                 | 28 ++++++++++++++++
 .../CellExtractAllCellReferencesInRange.php   | 33 +++++++++++++++++++
 4 files changed, 98 insertions(+), 7 deletions(-)
 create mode 100644 testing/cellReferenceTest.php

diff --git a/src/PhpSpreadsheet/Cell/Coordinate.php b/src/PhpSpreadsheet/Cell/Coordinate.php
index 50678397..2fca6212 100644
--- a/src/PhpSpreadsheet/Cell/Coordinate.php
+++ b/src/PhpSpreadsheet/Cell/Coordinate.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Cell;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Exception;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 
@@ -349,6 +350,19 @@ abstract class Coordinate
      */
     public static function extractAllCellReferencesInRange($cellRange): array
     {
+        if (substr_count($cellRange, '!') > 1) {
+            throw new Exception('3-D Range References are not supported');
+        }
+
+        [$worksheet, $cellRange] = Worksheet::extractSheetTitle($cellRange, true);
+        $quoted = '';
+        if ($worksheet > '') {
+            $quoted = Worksheet::nameRequiresQuotes($worksheet) ? "'" : '';
+            if (substr($worksheet, 0, 1) === "'" && substr($worksheet, -1, 1) === "'") {
+                $worksheet = substr($worksheet, 1, -1);
+            }
+            $worksheet = str_replace("'", "''", $worksheet);
+        }
         [$ranges, $operators] = self::getCellBlocksFromRangeString($cellRange);
 
         $cells = [];
@@ -364,7 +378,12 @@ abstract class Coordinate
 
         $cellList = array_merge(...$cells);
 
-        return self::sortCellReferenceArray($cellList);
+        return array_map(
+            function ($cellAddress) use ($worksheet, $quoted) {
+                return ($worksheet !== '') ? "{$quoted}{$worksheet}{$quoted}!{$cellAddress}" : $cellAddress;
+            },
+            self::sortCellReferenceArray($cellList)
+        );
     }
 
     private static function processRangeSetOperators(array $operators, array $cells): array
diff --git a/src/PhpSpreadsheet/Worksheet/Worksheet.php b/src/PhpSpreadsheet/Worksheet/Worksheet.php
index e89043c8..3464a321 100644
--- a/src/PhpSpreadsheet/Worksheet/Worksheet.php
+++ b/src/PhpSpreadsheet/Worksheet/Worksheet.php
@@ -32,14 +32,16 @@ use PhpOffice\PhpSpreadsheet\Style\Style;
 class Worksheet implements IComparable
 {
     // Break types
-    const BREAK_NONE = 0;
-    const BREAK_ROW = 1;
-    const BREAK_COLUMN = 2;
+    public const BREAK_NONE = 0;
+    public const BREAK_ROW = 1;
+    public const BREAK_COLUMN = 2;
 
     // Sheet state
-    const SHEETSTATE_VISIBLE = 'visible';
-    const SHEETSTATE_HIDDEN = 'hidden';
-    const SHEETSTATE_VERYHIDDEN = 'veryHidden';
+    public const SHEETSTATE_VISIBLE = 'visible';
+    public const SHEETSTATE_HIDDEN = 'hidden';
+    public const SHEETSTATE_VERYHIDDEN = 'veryHidden';
+
+    protected const SHEET_NAME_REQUIRES_NO_QUOTES = '/^[_\p{L}][_\p{L}\p{N}]*$/mui';
 
     /**
      * Maximum 31 characters allowed for sheet title.
@@ -3051,7 +3053,11 @@ class Worksheet implements IComparable
      * Extract worksheet title from range.
      *
      * Example: extractSheetTitle("testSheet!A1") ==> 'A1'
+     * Example: extractSheetTitle("testSheet!A1:C3") ==> 'A1:C3'
      * Example: extractSheetTitle("'testSheet 1'!A1", true) ==> ['testSheet 1', 'A1'];
+     * Example: extractSheetTitle("'testSheet 1'!A1:C3", true) ==> ['testSheet 1', 'A1:C3'];
+     * Example: extractSheetTitle("A1", true) ==> ['', 'A1'];
+     * Example: extractSheetTitle("A1:C3", true) ==> ['', 'A1:C3']
      *
      * @param string $range Range to extract title from
      * @param bool $returnRange Return range? (see example)
@@ -3450,4 +3456,9 @@ class Worksheet implements IComparable
     {
         return $this->codeName !== null;
     }
+
+    public static function nameRequiresQuotes(string $sheetName): bool
+    {
+        return preg_match(self::SHEET_NAME_REQUIRES_NO_QUOTES, $sheetName) !== 1;
+    }
 }
diff --git a/testing/cellReferenceTest.php b/testing/cellReferenceTest.php
new file mode 100644
index 00000000..c8d1659c
--- /dev/null
+++ b/testing/cellReferenceTest.php
@@ -0,0 +1,28 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+
+error_reporting(E_ALL);
+set_time_limit(0);
+
+date_default_timezone_set('UTC');
+
+// Adjust the path as required to reference the PHPSpreadsheet Bootstrap file
+require_once __DIR__ . '/../vendor/autoload.php';
+
+$cellRange1 = Coordinate::extractAllCellReferencesInRange('D3');
+var_dump($cellRange1);
+$cellRange2 = Coordinate::extractAllCellReferencesInRange('D3:E4');
+var_dump($cellRange2);
+$cellRange3 = Coordinate::extractAllCellReferencesInRange('Sheet1!D3');
+var_dump($cellRange3);
+$cellRange4 = Coordinate::extractAllCellReferencesInRange('Sheet1!D3:E4');
+var_dump($cellRange4);
+
+$cellRange11 = Coordinate::extractAllCellReferencesInRange('D3:E4 D4:F6');
+var_dump($cellRange11);
+$cellRange12 = Coordinate::extractAllCellReferencesInRange('D3:E4,D4:F6');
+var_dump($cellRange12);
+
+$cellRange5 = Coordinate::extractAllCellReferencesInRange('Sheet1!D3:Sheet2!E4');
+var_dump($cellRange5);
diff --git a/tests/data/CellExtractAllCellReferencesInRange.php b/tests/data/CellExtractAllCellReferencesInRange.php
index a2ecbdd2..192500ce 100644
--- a/tests/data/CellExtractAllCellReferencesInRange.php
+++ b/tests/data/CellExtractAllCellReferencesInRange.php
@@ -130,4 +130,37 @@ return [
         ],
         'Z2:AA3',
     ],
+    [
+        [
+            'Sheet1!D3',
+        ],
+        'Sheet1!D3',
+    ],
+    [
+        [
+            'Sheet1!D3',
+            'Sheet1!E3',
+            'Sheet1!D4',
+            'Sheet1!E4',
+        ],
+        'Sheet1!D3:E4',
+    ],
+    [
+        [
+            "'Sheet 1'!D3",
+            "'Sheet 1'!E3",
+            "'Sheet 1'!D4",
+            "'Sheet 1'!E4",
+        ],
+        "'Sheet 1'!D3:E4",
+    ],
+    [
+        [
+            "'Mark''s Sheet'!D3",
+            "'Mark''s Sheet'!E3",
+            "'Mark''s Sheet'!D4",
+            "'Mark''s Sheet'!E4",
+        ],
+        "'Mark's Sheet'!D3:E4",
+    ],
 ];

From b0f7e83dc2e82287f575b659b388cef6a281647c Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Mon, 15 Aug 2022 06:33:31 +0200
Subject: [PATCH 28/69] Fix phpstan baseline

---
 phpstan-baseline.neon | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 596e1e10..c6d769d5 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1060,11 +1060,6 @@ parameters:
 			count: 1
 			path: src/PhpSpreadsheet/Calculation/TextData/Text.php
 
-		-
-			message: "#^Elseif branch is unreachable because previous condition is always true\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Cell/Cell.php
-
 		-
 			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Cell\\:\\:getFormulaAttributes\\(\\) has no return type specified\\.$#"
 			count: 1

From d7da20610323508de897e3640445e8f8b842c396 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Mon, 15 Aug 2022 07:47:27 +0200
Subject: [PATCH 29/69] Remove file accidentally committed

---
 testing/cellReferenceTest.php | 28 ----------------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 testing/cellReferenceTest.php

diff --git a/testing/cellReferenceTest.php b/testing/cellReferenceTest.php
deleted file mode 100644
index c8d1659c..00000000
--- a/testing/cellReferenceTest.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
-
-error_reporting(E_ALL);
-set_time_limit(0);
-
-date_default_timezone_set('UTC');
-
-// Adjust the path as required to reference the PHPSpreadsheet Bootstrap file
-require_once __DIR__ . '/../vendor/autoload.php';
-
-$cellRange1 = Coordinate::extractAllCellReferencesInRange('D3');
-var_dump($cellRange1);
-$cellRange2 = Coordinate::extractAllCellReferencesInRange('D3:E4');
-var_dump($cellRange2);
-$cellRange3 = Coordinate::extractAllCellReferencesInRange('Sheet1!D3');
-var_dump($cellRange3);
-$cellRange4 = Coordinate::extractAllCellReferencesInRange('Sheet1!D3:E4');
-var_dump($cellRange4);
-
-$cellRange11 = Coordinate::extractAllCellReferencesInRange('D3:E4 D4:F6');
-var_dump($cellRange11);
-$cellRange12 = Coordinate::extractAllCellReferencesInRange('D3:E4,D4:F6');
-var_dump($cellRange12);
-
-$cellRange5 = Coordinate::extractAllCellReferencesInRange('Sheet1!D3:Sheet2!E4');
-var_dump($cellRange5);

From 269e9ba14de6e26e60eda088a58f53e359cef9a8 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Fri, 19 Aug 2022 11:28:51 +0200
Subject: [PATCH 30/69] Bugfix for Issue #3013, Named ranges not usable as
 anchors in OFFSET function

---
 src/PhpSpreadsheet/Calculation/Functions.php  |  2 +-
 .../Calculation/LookupRef/Offset.php          | 11 ++++++
 .../Functions/LookupRef/HLookupTest.php       | 39 +++++++++++++++++++
 .../Functions/LookupRef/OffsetTest.php        | 15 +++++++
 4 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/src/PhpSpreadsheet/Calculation/Functions.php b/src/PhpSpreadsheet/Calculation/Functions.php
index b3d6998c..172f2022 100644
--- a/src/PhpSpreadsheet/Calculation/Functions.php
+++ b/src/PhpSpreadsheet/Calculation/Functions.php
@@ -687,7 +687,7 @@ class Functions
             $worksheet2 = $defined->getWorkSheet();
             if (!$defined->isFormula() && $worksheet2 !== null) {
                 $coordinate = "'" . $worksheet2->getTitle() . "'!" .
-                    (string) preg_replace('/^=/', '', $defined->getValue());
+                    (string) preg_replace('/^=/', '', str_replace('$', '', $defined->getValue()));
             }
         }
 
diff --git a/src/PhpSpreadsheet/Calculation/LookupRef/Offset.php b/src/PhpSpreadsheet/Calculation/LookupRef/Offset.php
index 9f3377f6..02a25581 100644
--- a/src/PhpSpreadsheet/Calculation/LookupRef/Offset.php
+++ b/src/PhpSpreadsheet/Calculation/LookupRef/Offset.php
@@ -99,6 +99,8 @@ class Offset
 
     private static function extractWorksheet($cellAddress, Cell $cell): array
     {
+        $cellAddress = self::assessCellAddress($cellAddress, $cell);
+
         $sheetName = '';
         if (strpos($cellAddress, '!') !== false) {
             [$sheetName, $cellAddress] = Worksheet::extractSheetTitle($cellAddress, true);
@@ -112,6 +114,15 @@ class Offset
         return [$cellAddress, $worksheet];
     }
 
+    private static function assessCellAddress(string $cellAddress, Cell $cell): string
+    {
+        if (preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/mui', $cellAddress) !== false) {
+            $cellAddress = Functions::expandDefinedName($cellAddress, $cell);
+        }
+
+        return $cellAddress;
+    }
+
     private static function adjustEndCellColumnForWidth(string $endCellColumn, $width, int $startCellColumn, $columns)
     {
         $endCellColumn = Coordinate::columnIndexFromString($endCellColumn) - 1;
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/HLookupTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/HLookupTest.php
index 0ce3513b..084e3d9f 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/HLookupTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/HLookupTest.php
@@ -5,6 +5,7 @@ namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\LookupRef;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\NamedRange;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PHPUnit\Framework\TestCase;
 
@@ -91,6 +92,44 @@ class HLookupTest extends TestCase
         self::assertSame($expectedResult, $result);
     }
 
+    /**
+     * @dataProvider providerHLookupNamedRange
+     */
+    public function testHLookupNamedRange(string $expectedResult, string $cellAddress): void
+    {
+        $lookupData = [
+            ['Rating', 1, 2, 3, 4],
+            ['Level', 'Poor', 'Average', 'Good', 'Excellent'],
+        ];
+        $formData = [
+            ['Category', 'Rating', 'Level'],
+            ['Service', 2, '=HLOOKUP(C5,Lookup_Table,2,FALSE)'],
+            ['Quality', 3, '=HLOOKUP(C6,Lookup_Table,2,FALSE)'],
+            ['Value', 4, '=HLOOKUP(C7,Lookup_Table,2,FALSE)'],
+            ['Cleanliness', 3, '=HLOOKUP(C8,Lookup_Table,2,FALSE)'],
+        ];
+
+        $spreadsheet = new Spreadsheet();
+        $worksheet = $spreadsheet->getActiveSheet();
+        $worksheet->fromArray($lookupData, null, 'F4');
+        $worksheet->fromArray($formData, null, 'B4');
+
+        $spreadsheet->addNamedRange(new NamedRange('Lookup_Table', $worksheet, '=$G$4:$J$5'));
+
+        $result = $worksheet->getCell($cellAddress)->getCalculatedValue();
+        self::assertEquals($expectedResult, $result);
+    }
+
+    public function providerHLookupNamedRange(): array
+    {
+        return [
+            ['Average', 'D5'],
+            ['Good', 'D6'],
+            ['Excellent', 'D7'],
+            ['Good', 'D8'],
+        ];
+    }
+
     /**
      * @dataProvider providerHLookupArray
      */
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/OffsetTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/OffsetTest.php
index e0786505..22787e25 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/OffsetTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/OffsetTest.php
@@ -3,6 +3,7 @@
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\LookupRef;
 
 use PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
+use PhpOffice\PhpSpreadsheet\NamedRange;
 
 class OffsetTest extends AllSetupTeardown
 {
@@ -46,4 +47,18 @@ class OffsetTest extends AllSetupTeardown
         $sheet->getCell('A5')->setValue('=OFFSET(C1, 0, 0)');
         self::assertSame(5, $sheet->getCell('A5')->getCalculatedValue());
     }
+
+    public function testOffsetNamedRange(): void
+    {
+        $workSheet = $this->getSheet();
+        $workSheet->setCellValue('A1', 1);
+        $workSheet->setCellValue('A2', 2);
+
+        $this->getSpreadsheet()->addNamedRange(new NamedRange('demo', $workSheet, '=$A$1'));
+
+        $workSheet->setCellValue('B1', '=demo');
+        $workSheet->setCellValue('B2', '=OFFSET(demo, 1, 0)');
+
+        self::assertSame(2, $workSheet->getCell('B2')->getCalculatedValue());
+    }
 }

From 4e82b55f3718ced5bf8fc8b12e789482c741529a Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Fri, 19 Aug 2022 14:26:39 +0200
Subject: [PATCH 31/69] Update Change Log

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e19cb2d..62fdaf91 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Fixed
 
+- Named ranges not usable as anchors in OFFSET function [Issue #3013](https://github.com/PHPOffice/PhpSpreadsheet/issues/3013)
 - Fully flatten an array [Issue #2955](https://github.com/PHPOffice/PhpSpreadsheet/issues/2955) [PR #2956](https://github.com/PHPOffice/PhpSpreadsheet/pull/2956)
 - cellExists() and getCell() methods should support UTF-8 named cells [Issue #2987](https://github.com/PHPOffice/PhpSpreadsheet/issues/2987) [PR #2988](https://github.com/PHPOffice/PhpSpreadsheet/pull/2988)
 - Spreadsheet copy fixed, clone disabled. [PR #2951](https://github.com/PHPOffice/PhpSpreadsheet/pull/2951)

From e67de6f300b687721b3359cdb6b0e421b26f5bdc Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Sat, 20 Aug 2022 21:27:05 +0200
Subject: [PATCH 32/69] Support for SimpleCache Interface versions 1.0, 2.0 and
 3.0; to stop people moaning; even though it requires a second implementation
 of the Memory cache for Cells

---
 CHANGELOG.md                                  |   1 +
 composer.json                                 |   2 +-
 phpstan-baseline.neon                         |   5 -
 src/PhpSpreadsheet/Collection/Cells.php       |   4 +-
 .../{Memory.php => Memory/SimpleCache1.php}   |   7 +-
 .../Collection/Memory/SimpleCache3.php        | 109 ++++++++++++++++++
 .../Reader/Security/XmlScanner.php            |   2 +-
 src/PhpSpreadsheet/Settings.php               |  10 +-
 .../Collection/CellsTest.php                  |  10 +-
 9 files changed, 137 insertions(+), 13 deletions(-)
 rename src/PhpSpreadsheet/Collection/{Memory.php => Memory/SimpleCache1.php} (93%)
 create mode 100644 src/PhpSpreadsheet/Collection/Memory/SimpleCache3.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62fdaf91..da29bc8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Added
 
+- Support for SimpleCache Interface versions 1.0, 2.0 and 3.0
 - Add Chart Axis Option textRotation [Issue #2705](https://github.com/PHPOffice/PhpSpreadsheet/issues/2705) [PR #2940](https://github.com/PHPOffice/PhpSpreadsheet/pull/2940)
 
 ### Changed
diff --git a/composer.json b/composer.json
index cda2dc96..46ee56b9 100644
--- a/composer.json
+++ b/composer.json
@@ -75,7 +75,7 @@
         "markbaker/matrix": "^3.0",
         "psr/http-client": "^1.0",
         "psr/http-factory": "^1.0",
-        "psr/simple-cache": "^1.0 || ^2.0"
+        "psr/simple-cache": "^1.0 || ^2.0 || ^3.0"
     },
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index c6d769d5..7c0070d7 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1100,11 +1100,6 @@ parameters:
 			count: 1
 			path: src/PhpSpreadsheet/Cell/Coordinate.php
 
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Collection\\\\Memory\\:\\:\\$cache has no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Collection/Memory.php
-
 		-
 			message: "#^Parameter \\#1 \\$namedRange of method PhpOffice\\\\PhpSpreadsheet\\\\Spreadsheet\\:\\:addNamedRange\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\NamedRange, \\$this\\(PhpOffice\\\\PhpSpreadsheet\\\\DefinedName\\) given\\.$#"
 			count: 1
diff --git a/src/PhpSpreadsheet/Collection/Cells.php b/src/PhpSpreadsheet/Collection/Cells.php
index 03ad1cd4..82c9ae1a 100644
--- a/src/PhpSpreadsheet/Collection/Cells.php
+++ b/src/PhpSpreadsheet/Collection/Cells.php
@@ -268,7 +268,9 @@ class Cells
      */
     private function getUniqueID()
     {
-        return Settings::getCache() instanceof Memory
+        $cacheType = Settings::getCache();
+
+        return ($cacheType instanceof Memory\SimpleCache1 || $cacheType instanceof Memory\SimpleCache3)
             ? random_bytes(7) . ':'
             : uniqid('phpspreadsheet.', true) . '.';
     }
diff --git a/src/PhpSpreadsheet/Collection/Memory.php b/src/PhpSpreadsheet/Collection/Memory/SimpleCache1.php
similarity index 93%
rename from src/PhpSpreadsheet/Collection/Memory.php
rename to src/PhpSpreadsheet/Collection/Memory/SimpleCache1.php
index 2690ab7d..a0eb6ec2 100644
--- a/src/PhpSpreadsheet/Collection/Memory.php
+++ b/src/PhpSpreadsheet/Collection/Memory/SimpleCache1.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpOffice\PhpSpreadsheet\Collection;
+namespace PhpOffice\PhpSpreadsheet\Collection\Memory;
 
 use DateInterval;
 use Psr\SimpleCache\CacheInterface;
@@ -11,8 +11,11 @@ use Psr\SimpleCache\CacheInterface;
  * Alternatives implementation should leverage off-memory, non-volatile storage
  * to reduce overall memory usage.
  */
-class Memory implements CacheInterface
+class SimpleCache1 implements CacheInterface
 {
+    /**
+     * @var array Cell Cache
+     */
     private $cache = [];
 
     /**
diff --git a/src/PhpSpreadsheet/Collection/Memory/SimpleCache3.php b/src/PhpSpreadsheet/Collection/Memory/SimpleCache3.php
new file mode 100644
index 00000000..34f64470
--- /dev/null
+++ b/src/PhpSpreadsheet/Collection/Memory/SimpleCache3.php
@@ -0,0 +1,109 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Collection\Memory;
+
+use DateInterval;
+use Psr\SimpleCache\CacheInterface;
+
+/**
+ * This is the default implementation for in-memory cell collection.
+ *
+ * Alternatives implementation should leverage off-memory, non-volatile storage
+ * to reduce overall memory usage.
+ */
+class SimpleCache3 implements CacheInterface
+{
+    /**
+     * @var array Cell Cache
+     */
+    private $cache = [];
+
+    public function clear(): bool
+    {
+        $this->cache = [];
+
+        return true;
+    }
+
+    /**
+     * @param string $key
+     */
+    public function delete($key): bool
+    {
+        unset($this->cache[$key]);
+
+        return true;
+    }
+
+    /**
+     * @param iterable $keys
+     */
+    public function deleteMultiple($keys): bool
+    {
+        foreach ($keys as $key) {
+            $this->delete($key);
+        }
+
+        return true;
+    }
+
+    /**
+     * @param string $key
+     * @param mixed  $default
+     */
+    public function get($key, $default = null): mixed
+    {
+        if ($this->has($key)) {
+            return $this->cache[$key];
+        }
+
+        return $default;
+    }
+
+    /**
+     * @param iterable $keys
+     * @param mixed    $default
+     */
+    public function getMultiple($keys, $default = null): iterable
+    {
+        $results = [];
+        foreach ($keys as $key) {
+            $results[$key] = $this->get($key, $default);
+        }
+
+        return $results;
+    }
+
+    /**
+     * @param string $key
+     */
+    public function has($key): bool
+    {
+        return array_key_exists($key, $this->cache);
+    }
+
+    /**
+     * @param string                 $key
+     * @param mixed                  $value
+     * @param null|DateInterval|int $ttl
+     */
+    public function set($key, $value, $ttl = null): bool
+    {
+        $this->cache[$key] = $value;
+
+        return true;
+    }
+
+    /**
+     * @param iterable               $values
+     * @param null|DateInterval|int $ttl
+     */
+    public function setMultiple($values, $ttl = null): bool
+    {
+        foreach ($values as $key => $value) {
+            $this->set($key, $value);
+        }
+
+        return true;
+    }
+}
diff --git a/src/PhpSpreadsheet/Reader/Security/XmlScanner.php b/src/PhpSpreadsheet/Reader/Security/XmlScanner.php
index 8155b838..40008d01 100644
--- a/src/PhpSpreadsheet/Reader/Security/XmlScanner.php
+++ b/src/PhpSpreadsheet/Reader/Security/XmlScanner.php
@@ -52,7 +52,7 @@ class XmlScanner
 
     public static function threadSafeLibxmlDisableEntityLoaderAvailability()
     {
-        if (PHP_MAJOR_VERSION == 7) {
+        if (PHP_MAJOR_VERSION === 7) {
             switch (PHP_MINOR_VERSION) {
                 case 2:
                     return PHP_RELEASE_VERSION >= 1;
diff --git a/src/PhpSpreadsheet/Settings.php b/src/PhpSpreadsheet/Settings.php
index 5fbbadb6..3282a596 100644
--- a/src/PhpSpreadsheet/Settings.php
+++ b/src/PhpSpreadsheet/Settings.php
@@ -8,6 +8,7 @@ use PhpOffice\PhpSpreadsheet\Collection\Memory;
 use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestFactoryInterface;
 use Psr\SimpleCache\CacheInterface;
+use ReflectionClass;
 
 class Settings
 {
@@ -161,12 +162,19 @@ class Settings
     public static function getCache(): CacheInterface
     {
         if (!self::$cache) {
-            self::$cache = new Memory();
+            self::$cache = self::useSimpleCacheVersion3() ? new Memory\SimpleCache3() : new Memory\SimpleCache1();
         }
 
         return self::$cache;
     }
 
+    public static function useSimpleCacheVersion3(): bool
+    {
+        return
+            PHP_MAJOR_VERSION === 8 &&
+            (new ReflectionClass(CacheInterface::class))->getMethod('get')->getReturnType() !== null;
+    }
+
     /**
      * Set the HTTP client implementation to be used for network request.
      */
diff --git a/tests/PhpSpreadsheetTests/Collection/CellsTest.php b/tests/PhpSpreadsheetTests/Collection/CellsTest.php
index 5731d581..9e662b92 100644
--- a/tests/PhpSpreadsheetTests/Collection/CellsTest.php
+++ b/tests/PhpSpreadsheetTests/Collection/CellsTest.php
@@ -5,6 +5,7 @@ namespace PhpOffice\PhpSpreadsheetTests\Collection;
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use PhpOffice\PhpSpreadsheet\Collection\Cells;
 use PhpOffice\PhpSpreadsheet\Collection\Memory;
+use PhpOffice\PhpSpreadsheet\Settings;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use PHPUnit\Framework\TestCase;
@@ -107,7 +108,10 @@ class CellsTest extends TestCase
         $this->expectException(\PhpOffice\PhpSpreadsheet\Exception::class);
 
         $collection = $this->getMockBuilder(Cells::class)
-            ->setConstructorArgs([new Worksheet(), new Memory()])
+            ->setConstructorArgs([
+                new Worksheet(),
+                Settings::useSimpleCacheVersion3() ? new Memory\SimpleCache3() : new Memory\SimpleCache1(),
+            ])
             ->onlyMethods(['has'])
             ->getMock();
 
@@ -121,7 +125,9 @@ class CellsTest extends TestCase
     {
         $this->expectException(\PhpOffice\PhpSpreadsheet\Exception::class);
 
-        $cache = $this->createMock(Memory::class);
+        $cache = $this->createMock(
+            Settings::useSimpleCacheVersion3() ? Memory\SimpleCache3::class : Memory\SimpleCache1::class
+        );
         $cell = $this->createMock(Cell::class);
         $cache->method('set')
             ->willReturn(false);

From d55978cf931ced2bc9f0d982bb6b8269fbace1f9 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Sat, 20 Aug 2022 19:58:43 -0700
Subject: [PATCH 33/69] Correct Namespaces in 11 Tests (#3020)

The setup for unit testing in Github in the "Install dependencies" log reports 11 members as "does not comply with with psr-4 autoloading standard." In each case, it is because the test namespace does not match the directory; in most cases, it was caused by the member being moved from one directory to another without changing the namespace declaration. No harm results from these problems, but there's also no reason to not correct them.
---
 tests/PhpSpreadsheetTests/Calculation/XlfnFunctionsTest.php     | 2 +-
 tests/PhpSpreadsheetTests/Chart/BarChartCustomColorsTest.php    | 2 +-
 tests/PhpSpreadsheetTests/Chart/PieFillTest.php                 | 2 +-
 tests/PhpSpreadsheetTests/Chart/RenderTest.php                  | 2 +-
 .../PhpSpreadsheetTests/Reader/Xlsx/NamespaceIssue2109bTest.php | 2 +-
 tests/PhpSpreadsheetTests/Reader/Xlsx/NamespaceNonStdTest.php   | 2 +-
 .../PhpSpreadsheetTests/Reader/Xlsx/NamespaceOpenpyxl35Test.php | 2 +-
 tests/PhpSpreadsheetTests/Reader/Xlsx/NamespacePurlTest.php     | 2 +-
 tests/PhpSpreadsheetTests/Reader/Xlsx/NamespaceStdTest.php      | 2 +-
 .../Style/ConditionalFormatting/Wizard/DateValueWizardTest.php  | 2 +-
 tests/PhpSpreadsheetTests/Writer/Mpdf/ImageCopyPdfTest.php      | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tests/PhpSpreadsheetTests/Calculation/XlfnFunctionsTest.php b/tests/PhpSpreadsheetTests/Calculation/XlfnFunctionsTest.php
index f8f02f0e..3edd22c8 100644
--- a/tests/PhpSpreadsheetTests/Calculation/XlfnFunctionsTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/XlfnFunctionsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpOffice\PhpSpreadsheetTests\Writer\Xlsx;
+namespace PhpOffice\PhpSpreadsheetTests\Calculation;
 
 use PhpOffice\PhpSpreadsheet\Shared\File;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
diff --git a/tests/PhpSpreadsheetTests/Chart/BarChartCustomColorsTest.php b/tests/PhpSpreadsheetTests/Chart/BarChartCustomColorsTest.php
index 72c541fb..431ad670 100644
--- a/tests/PhpSpreadsheetTests/Chart/BarChartCustomColorsTest.php
+++ b/tests/PhpSpreadsheetTests/Chart/BarChartCustomColorsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpOffice\PhpSpreadsheetTests\Writer\Xlsx;
+namespace PhpOffice\PhpSpreadsheetTests\Chart;
 
 use PhpOffice\PhpSpreadsheet\Chart\Chart;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeries;
diff --git a/tests/PhpSpreadsheetTests/Chart/PieFillTest.php b/tests/PhpSpreadsheetTests/Chart/PieFillTest.php
index d659f21c..5b35ca3d 100644
--- a/tests/PhpSpreadsheetTests/Chart/PieFillTest.php
+++ b/tests/PhpSpreadsheetTests/Chart/PieFillTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpOffice\PhpSpreadsheetTests\Writer\Xlsx;
+namespace PhpOffice\PhpSpreadsheetTests\Chart;
 
 use PhpOffice\PhpSpreadsheet\Chart\Chart;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeries;
diff --git a/tests/PhpSpreadsheetTests/Chart/RenderTest.php b/tests/PhpSpreadsheetTests/Chart/RenderTest.php
index f0eaffee..b10e854f 100644
--- a/tests/PhpSpreadsheetTests/Chart/RenderTest.php
+++ b/tests/PhpSpreadsheetTests/Chart/RenderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpOffice\PhpSpreadsheetTests\Writer\Xlsx;
+namespace PhpOffice\PhpSpreadsheetTests\Chart;
 
 use PhpOffice\PhpSpreadsheet\Chart\Chart;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespaceIssue2109bTest.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespaceIssue2109bTest.php
index 4c1628fc..b970f084 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespaceIssue2109bTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespaceIssue2109bTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpOffice\PhpSpreadsheetTests\Reader;
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xlsx;
 
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespaceNonStdTest.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespaceNonStdTest.php
index 7f55c939..1849c5bd 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespaceNonStdTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespaceNonStdTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpOffice\PhpSpreadsheetTests\Reader;
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xlsx;
 
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 use PhpOffice\PhpSpreadsheet\Style\Border;
diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespaceOpenpyxl35Test.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespaceOpenpyxl35Test.php
index d57dc049..1b1743c9 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespaceOpenpyxl35Test.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespaceOpenpyxl35Test.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpOffice\PhpSpreadsheetTests\Reader;
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xlsx;
 
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespacePurlTest.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespacePurlTest.php
index ddd6ac5d..e8e9eaba 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespacePurlTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespacePurlTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpOffice\PhpSpreadsheetTests\Reader;
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xlsx;
 
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 
diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespaceStdTest.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespaceStdTest.php
index 73e5d5c3..8b47d141 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespaceStdTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespaceStdTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpOffice\PhpSpreadsheetTests\Reader;
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xlsx;
 
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 use PhpOffice\PhpSpreadsheet\Style\Border;
diff --git a/tests/PhpSpreadsheetTests/Style/ConditionalFormatting/Wizard/DateValueWizardTest.php b/tests/PhpSpreadsheetTests/Style/ConditionalFormatting/Wizard/DateValueWizardTest.php
index 06d76bb2..4bbda920 100644
--- a/tests/PhpSpreadsheetTests/Style/ConditionalFormatting/Wizard/DateValueWizardTest.php
+++ b/tests/PhpSpreadsheetTests/Style/ConditionalFormatting/Wizard/DateValueWizardTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpOffice\PhpSpreadsheetTests\Style\ConditionalFormatting;
+namespace PhpOffice\PhpSpreadsheetTests\Style\ConditionalFormatting\Wizard;
 
 use PhpOffice\PhpSpreadsheet\Exception;
 use PhpOffice\PhpSpreadsheet\Style\Conditional;
diff --git a/tests/PhpSpreadsheetTests/Writer/Mpdf/ImageCopyPdfTest.php b/tests/PhpSpreadsheetTests/Writer/Mpdf/ImageCopyPdfTest.php
index 111848da..5d31bc01 100644
--- a/tests/PhpSpreadsheetTests/Writer/Mpdf/ImageCopyPdfTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Mpdf/ImageCopyPdfTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpOffice\PhpSpreadsheetTests\Writer\Html;
+namespace PhpOffice\PhpSpreadsheetTests\Writer\Mpdf;
 
 use PhpOffice\PhpSpreadsheet\Reader\Xls as XlsReader;
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx as XlsxReader;

From 99c6fed1e044ee571bb9c2b619a1e2583a019455 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Wed, 24 Aug 2022 08:33:57 +0200
Subject: [PATCH 34/69] Minor changes, mainly cosmetic

---
 composer.lock                                 | 1014 ++++++++---------
 samples/Calculations/LookupRef/VLOOKUP.php    |   27 +-
 samples/Chart/33_Chart_create_scatter2.php    |    2 +-
 samples/Chart/33_Chart_create_scatter3.php    |    2 +-
 .../33_Chart_create_scatter5_trendlines.php   |    2 +-
 .../Calculation/Calculation.php               |    8 +-
 .../Calculation/Engine/Logger.php             |    6 +-
 .../Calculation/MathTrig/Random.php           |    2 +-
 .../Calculation/Statistical/Averages.php      |    2 +-
 .../Statistical/Distributions/ChiSquared.php  |    2 +-
 .../Chart/Renderer/JpGraphRendererBase.php    |   18 +-
 src/PhpSpreadsheet/Reader/Xls.php             |    2 +-
 src/PhpSpreadsheet/Reader/Xlsx.php            |    7 +-
 .../Shared/JAMA/EigenvalueDecomposition.php   |    6 +-
 src/PhpSpreadsheet/Shared/JAMA/Matrix.php     |   14 +-
 .../JAMA/SingularValueDecomposition.php       |    6 +-
 src/PhpSpreadsheet/Writer/Xls/Parser.php      |    2 +-
 src/PhpSpreadsheet/Writer/Xls/Worksheet.php   |    2 +-
 18 files changed, 560 insertions(+), 564 deletions(-)

diff --git a/composer.lock b/composer.lock
index f54b9c58..37e2dfa8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "05bd955232ea7ceab5b849e990f593bd",
+    "content-hash": "dd19bb54ddc39f5b24f564818cb46c7e",
     "packages": [
         {
             "name": "ezyang/htmlpurifier",
@@ -51,33 +51,39 @@
             "keywords": [
                 "html"
             ],
+            "support": {
+                "issues": "https://github.com/ezyang/htmlpurifier/issues",
+                "source": "https://github.com/ezyang/htmlpurifier/tree/v4.14.0"
+            },
             "time": "2021-12-25T01:21:49+00:00"
         },
         {
             "name": "maennchen/zipstream-php",
-            "version": "2.1.0",
+            "version": "2.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/maennchen/ZipStream-PHP.git",
-                "reference": "c4c5803cc1f93df3d2448478ef79394a5981cc58"
+                "reference": "211e9ba1530ea5260b45d90c9ea252f56ec52729"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/c4c5803cc1f93df3d2448478ef79394a5981cc58",
-                "reference": "c4c5803cc1f93df3d2448478ef79394a5981cc58",
+                "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/211e9ba1530ea5260b45d90c9ea252f56ec52729",
+                "reference": "211e9ba1530ea5260b45d90c9ea252f56ec52729",
                 "shasum": ""
             },
             "require": {
                 "myclabs/php-enum": "^1.5",
-                "php": ">= 7.1",
+                "php": "^7.4 || ^8.0",
                 "psr/http-message": "^1.0",
                 "symfony/polyfill-mbstring": "^1.0"
             },
             "require-dev": {
                 "ext-zip": "*",
-                "guzzlehttp/guzzle": ">= 6.3",
+                "guzzlehttp/guzzle": "^6.5.3 || ^7.2.0",
                 "mikey179/vfsstream": "^1.6",
-                "phpunit/phpunit": ">= 7.5"
+                "php-coveralls/php-coveralls": "^2.4",
+                "phpunit/phpunit": "^8.5.8 || ^9.4.2",
+                "vimeo/psalm": "^4.1"
             },
             "type": "library",
             "autoload": {
@@ -112,13 +118,17 @@
                 "stream",
                 "zip"
             ],
+            "support": {
+                "issues": "https://github.com/maennchen/ZipStream-PHP/issues",
+                "source": "https://github.com/maennchen/ZipStream-PHP/tree/2.2.1"
+            },
             "funding": [
                 {
                     "url": "https://opencollective.com/zipstream",
                     "type": "open_collective"
                 }
             ],
-            "time": "2020-05-30T13:11:16+00:00"
+            "time": "2022-05-18T15:52:06+00:00"
         },
         {
             "name": "markbaker/complex",
@@ -165,6 +175,10 @@
                 "complex",
                 "mathematics"
             ],
+            "support": {
+                "issues": "https://github.com/MarkBaker/PHPComplex/issues",
+                "source": "https://github.com/MarkBaker/PHPComplex/tree/3.0.1"
+            },
             "time": "2021-06-29T15:32:53+00:00"
         },
         {
@@ -217,20 +231,24 @@
                 "matrix",
                 "vector"
             ],
+            "support": {
+                "issues": "https://github.com/MarkBaker/PHPMatrix/issues",
+                "source": "https://github.com/MarkBaker/PHPMatrix/tree/3.0.0"
+            },
             "time": "2021-07-01T19:01:15+00:00"
         },
         {
             "name": "myclabs/php-enum",
-            "version": "1.8.3",
+            "version": "1.8.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/php-enum.git",
-                "reference": "b942d263c641ddb5190929ff840c68f78713e937"
+                "reference": "a867478eae49c9f59ece437ae7f9506bfaa27483"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/php-enum/zipball/b942d263c641ddb5190929ff840c68f78713e937",
-                "reference": "b942d263c641ddb5190929ff840c68f78713e937",
+                "url": "https://api.github.com/repos/myclabs/php-enum/zipball/a867478eae49c9f59ece437ae7f9506bfaa27483",
+                "reference": "a867478eae49c9f59ece437ae7f9506bfaa27483",
                 "shasum": ""
             },
             "require": {
@@ -246,7 +264,10 @@
             "autoload": {
                 "psr-4": {
                     "MyCLabs\\Enum\\": "src/"
-                }
+                },
+                "classmap": [
+                    "stubs/Stringable.php"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -263,6 +284,10 @@
             "keywords": [
                 "enum"
             ],
+            "support": {
+                "issues": "https://github.com/myclabs/php-enum/issues",
+                "source": "https://github.com/myclabs/php-enum/tree/1.8.4"
+            },
             "funding": [
                 {
                     "url": "https://github.com/mnapoli",
@@ -273,7 +298,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-05T08:18:36+00:00"
+            "time": "2022-08-04T09:53:51+00:00"
         },
         {
             "name": "psr/http-client",
@@ -322,6 +347,9 @@
                 "psr",
                 "psr-18"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/http-client/tree/master"
+            },
             "time": "2020-06-29T06:28:15+00:00"
         },
         {
@@ -374,6 +402,9 @@
                 "request",
                 "response"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/http-factory/tree/master"
+            },
             "time": "2019-04-30T12:38:16+00:00"
         },
         {
@@ -424,6 +455,9 @@
                 "request",
                 "response"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/http-message/tree/master"
+            },
             "time": "2016-08-06T14:39:51+00:00"
         },
         {
@@ -472,32 +506,38 @@
                 "psr-16",
                 "simple-cache"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/simple-cache/tree/master"
+            },
             "time": "2017-10-23T01:57:42+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.23.1",
+            "version": "v1.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6"
+                "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6",
-                "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
+                "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1"
             },
+            "provide": {
+                "ext-mbstring": "*"
+            },
             "suggest": {
                 "ext-mbstring": "For best performance"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -535,6 +575,9 @@
                 "portable",
                 "shim"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -549,36 +592,36 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-27T12:26:48+00:00"
+            "time": "2022-05-24T11:49:31+00:00"
         }
     ],
     "packages-dev": [
         {
             "name": "composer/pcre",
-            "version": "1.0.0",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/pcre.git",
-                "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2"
+                "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/3d322d715c43a1ac36c7fe215fa59336265500f2",
-                "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/e300eb6c535192decd27a85bc72a9290f0d6b3bd",
+                "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.2 || ^7.0 || ^8.0"
+                "php": "^7.4 || ^8.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1",
+                "phpstan/phpstan": "^1.3",
                 "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^4.2 || ^5"
+                "symfony/phpunit-bridge": "^5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.x-dev"
+                    "dev-main": "3.x-dev"
                 }
             },
             "autoload": {
@@ -604,6 +647,10 @@
                 "regex",
                 "regular expression"
             ],
+            "support": {
+                "issues": "https://github.com/composer/pcre/issues",
+                "source": "https://github.com/composer/pcre/tree/3.0.0"
+            },
             "funding": [
                 {
                     "url": "https://packagist.com",
@@ -618,27 +665,27 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-06T15:17:27+00:00"
+            "time": "2022-02-25T20:21:48+00:00"
         },
         {
             "name": "composer/semver",
-            "version": "3.2.6",
+            "version": "3.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/semver.git",
-                "reference": "83e511e247de329283478496f7a1e114c9517506"
+                "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/83e511e247de329283478496f7a1e114c9517506",
-                "reference": "83e511e247de329283478496f7a1e114c9517506",
+                "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9",
+                "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.3.2 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "^0.12.54",
+                "phpstan/phpstan": "^1.4",
                 "symfony/phpunit-bridge": "^4.2 || ^5"
             },
             "type": "library",
@@ -680,6 +727,11 @@
                 "validation",
                 "versioning"
             ],
+            "support": {
+                "irc": "irc://irc.freenode.org/composer",
+                "issues": "https://github.com/composer/semver/issues",
+                "source": "https://github.com/composer/semver/tree/3.3.2"
+            },
             "funding": [
                 {
                     "url": "https://packagist.com",
@@ -694,31 +746,31 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-10-25T11:34:17+00:00"
+            "time": "2022-04-01T19:23:25+00:00"
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "2.0.3",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "6555461e76962fd0379c444c46fd558a0fcfb65e"
+                "reference": "ced299686f41dce890debac69273b47ffe98a40c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6555461e76962fd0379c444c46fd558a0fcfb65e",
-                "reference": "6555461e76962fd0379c444c46fd558a0fcfb65e",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c",
+                "reference": "ced299686f41dce890debac69273b47ffe98a40c",
                 "shasum": ""
             },
             "require": {
-                "composer/pcre": "^1",
-                "php": "^5.3.2 || ^7.0 || ^8.0",
+                "composer/pcre": "^1 || ^2 || ^3",
+                "php": "^7.2.5 || ^8.0",
                 "psr/log": "^1 || ^2 || ^3"
             },
             "require-dev": {
                 "phpstan/phpstan": "^1.0",
                 "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0"
+                "symfony/phpunit-bridge": "^6.0"
             },
             "type": "library",
             "autoload": {
@@ -741,6 +793,11 @@
                 "Xdebug",
                 "performance"
             ],
+            "support": {
+                "irc": "irc://irc.freenode.org/composer",
+                "issues": "https://github.com/composer/xdebug-handler/issues",
+                "source": "https://github.com/composer/xdebug-handler/tree/3.0.3"
+            },
             "funding": [
                 {
                     "url": "https://packagist.com",
@@ -755,7 +812,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-08T13:07:32+00:00"
+            "time": "2022-02-25T21:32:43+00:00"
         },
         {
             "name": "dealerdirect/phpcodesniffer-composer-installer",
@@ -784,6 +841,7 @@
                 "phpcompatibility/php-compatibility": "^9.0",
                 "yoast/phpunit-polyfills": "^1.0"
             },
+            "default-branch": true,
             "type": "composer-plugin",
             "extra": {
                 "class": "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin"
@@ -829,20 +887,24 @@
                 "stylecheck",
                 "tests"
             ],
+            "support": {
+                "issues": "https://github.com/PHPCSStandards/composer-installer/issues",
+                "source": "https://github.com/PHPCSStandards/composer-installer"
+            },
             "time": "2022-07-26T12:51:47+00:00"
         },
         {
             "name": "doctrine/annotations",
-            "version": "1.13.2",
+            "version": "1.13.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/annotations.git",
-                "reference": "5b668aef16090008790395c02c893b1ba13f7e08"
+                "reference": "648b0343343565c4a056bfc8392201385e8d89f0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/5b668aef16090008790395c02c893b1ba13f7e08",
-                "reference": "5b668aef16090008790395c02c893b1ba13f7e08",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/648b0343343565c4a056bfc8392201385e8d89f0",
+                "reference": "648b0343343565c4a056bfc8392201385e8d89f0",
                 "shasum": ""
             },
             "require": {
@@ -854,9 +916,10 @@
             "require-dev": {
                 "doctrine/cache": "^1.11 || ^2.0",
                 "doctrine/coding-standard": "^6.0 || ^8.1",
-                "phpstan/phpstan": "^0.12.20",
+                "phpstan/phpstan": "^1.4.10 || ^1.8.0",
                 "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5",
-                "symfony/cache": "^4.4 || ^5.2"
+                "symfony/cache": "^4.4 || ^5.2",
+                "vimeo/psalm": "^4.10"
             },
             "type": "library",
             "autoload": {
@@ -897,7 +960,11 @@
                 "docblock",
                 "parser"
             ],
-            "time": "2021-08-05T19:00:23+00:00"
+            "support": {
+                "issues": "https://github.com/doctrine/annotations/issues",
+                "source": "https://github.com/doctrine/annotations/tree/1.13.3"
+            },
+            "time": "2022-07-02T10:48:51+00:00"
         },
         {
             "name": "doctrine/instantiator",
@@ -949,6 +1016,10 @@
                 "constructor",
                 "instantiate"
             ],
+            "support": {
+                "issues": "https://github.com/doctrine/instantiator/issues",
+                "source": "https://github.com/doctrine/instantiator/tree/1.4.1"
+            },
             "funding": [
                 {
                     "url": "https://www.doctrine-project.org/sponsorship.html",
@@ -967,32 +1038,28 @@
         },
         {
             "name": "doctrine/lexer",
-            "version": "1.2.1",
+            "version": "1.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/lexer.git",
-                "reference": "e864bbf5904cb8f5bb334f99209b48018522f042"
+                "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042",
-                "reference": "e864bbf5904cb8f5bb334f99209b48018522f042",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/c268e882d4dbdd85e36e4ad69e02dc284f89d229",
+                "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2 || ^8.0"
+                "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^6.0",
-                "phpstan/phpstan": "^0.11.8",
-                "phpunit/phpunit": "^8.2"
+                "doctrine/coding-standard": "^9.0",
+                "phpstan/phpstan": "^1.3",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "vimeo/psalm": "^4.11"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
@@ -1025,6 +1092,10 @@
                 "parser",
                 "php"
             ],
+            "support": {
+                "issues": "https://github.com/doctrine/lexer/issues",
+                "source": "https://github.com/doctrine/lexer/tree/1.2.3"
+            },
             "funding": [
                 {
                     "url": "https://www.doctrine-project.org/sponsorship.html",
@@ -1039,7 +1110,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-05-25T17:44:05+00:00"
+            "time": "2022-02-28T11:07:21+00:00"
         },
         {
             "name": "dompdf/dompdf",
@@ -1105,56 +1176,60 @@
             ],
             "description": "DOMPDF is a CSS 2.1 compliant HTML to PDF converter",
             "homepage": "https://github.com/dompdf/dompdf",
+            "support": {
+                "issues": "https://github.com/dompdf/dompdf/issues",
+                "source": "https://github.com/dompdf/dompdf/tree/v2.0.0"
+            },
             "time": "2022-06-21T21:14:57+00:00"
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.4.0",
+            "version": "v3.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "47177af1cfb9dab5d1cc4daf91b7179c2efe7fad"
+                "reference": "76d7da666e66d83a1dc27a9d1c625c80cc4ac1fe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/47177af1cfb9dab5d1cc4daf91b7179c2efe7fad",
-                "reference": "47177af1cfb9dab5d1cc4daf91b7179c2efe7fad",
+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/76d7da666e66d83a1dc27a9d1c625c80cc4ac1fe",
+                "reference": "76d7da666e66d83a1dc27a9d1c625c80cc4ac1fe",
                 "shasum": ""
             },
             "require": {
                 "composer/semver": "^3.2",
-                "composer/xdebug-handler": "^2.0",
-                "doctrine/annotations": "^1.12",
+                "composer/xdebug-handler": "^3.0.3",
+                "doctrine/annotations": "^1.13",
                 "ext-json": "*",
                 "ext-tokenizer": "*",
-                "php": "^7.2.5 || ^8.0",
-                "php-cs-fixer/diff": "^2.0",
-                "symfony/console": "^4.4.20 || ^5.1.3 || ^6.0",
-                "symfony/event-dispatcher": "^4.4.20 || ^5.0 || ^6.0",
-                "symfony/filesystem": "^4.4.20 || ^5.0 || ^6.0",
-                "symfony/finder": "^4.4.20 || ^5.0 || ^6.0",
-                "symfony/options-resolver": "^4.4.20 || ^5.0 || ^6.0",
+                "php": "^7.4 || ^8.0",
+                "sebastian/diff": "^4.0",
+                "symfony/console": "^5.4 || ^6.0",
+                "symfony/event-dispatcher": "^5.4 || ^6.0",
+                "symfony/filesystem": "^5.4 || ^6.0",
+                "symfony/finder": "^5.4 || ^6.0",
+                "symfony/options-resolver": "^5.4 || ^6.0",
                 "symfony/polyfill-mbstring": "^1.23",
-                "symfony/polyfill-php80": "^1.23",
-                "symfony/polyfill-php81": "^1.23",
-                "symfony/process": "^4.4.20 || ^5.0 || ^6.0",
-                "symfony/stopwatch": "^4.4.20 || ^5.0 || ^6.0"
+                "symfony/polyfill-php80": "^1.25",
+                "symfony/polyfill-php81": "^1.25",
+                "symfony/process": "^5.4 || ^6.0",
+                "symfony/stopwatch": "^5.4 || ^6.0"
             },
             "require-dev": {
                 "justinrainbow/json-schema": "^5.2",
                 "keradus/cli-executor": "^1.5",
-                "mikey179/vfsstream": "^1.6.8",
+                "mikey179/vfsstream": "^1.6.10",
                 "php-coveralls/php-coveralls": "^2.5.2",
                 "php-cs-fixer/accessible-object": "^1.1",
                 "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2",
                 "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1",
                 "phpspec/prophecy": "^1.15",
-                "phpspec/prophecy-phpunit": "^1.1 || ^2.0",
-                "phpunit/phpunit": "^8.5.21 || ^9.5",
+                "phpspec/prophecy-phpunit": "^2.0",
+                "phpunit/phpunit": "^9.5",
                 "phpunitgoodpractices/polyfill": "^1.5",
                 "phpunitgoodpractices/traits": "^1.9.1",
-                "symfony/phpunit-bridge": "^5.2.4 || ^6.0",
-                "symfony/yaml": "^4.4.20 || ^5.0 || ^6.0"
+                "symfony/phpunit-bridge": "^6.0",
+                "symfony/yaml": "^5.4 || ^6.0"
             },
             "suggest": {
                 "ext-dom": "For handling output formats in XML",
@@ -1184,26 +1259,30 @@
                 }
             ],
             "description": "A tool to automatically fix PHP code style",
+            "support": {
+                "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues",
+                "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.10.0"
+            },
             "funding": [
                 {
                     "url": "https://github.com/keradus",
                     "type": "github"
                 }
             ],
-            "time": "2021-12-11T16:25:08+00:00"
+            "time": "2022-08-17T22:13:10+00:00"
         },
         {
             "name": "masterminds/html5",
-            "version": "2.7.5",
+            "version": "2.7.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Masterminds/html5-php.git",
-                "reference": "f640ac1bdddff06ea333a920c95bbad8872429ab"
+                "reference": "897eb517a343a2281f11bc5556d6548db7d93947"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f640ac1bdddff06ea333a920c95bbad8872429ab",
-                "reference": "f640ac1bdddff06ea333a920c95bbad8872429ab",
+                "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/897eb517a343a2281f11bc5556d6548db7d93947",
+                "reference": "897eb517a343a2281f11bc5556d6548db7d93947",
                 "shasum": ""
             },
             "require": {
@@ -1255,7 +1334,11 @@
                 "serializer",
                 "xml"
             ],
-            "time": "2021-07-01T14:25:37+00:00"
+            "support": {
+                "issues": "https://github.com/Masterminds/html5-php/issues",
+                "source": "https://github.com/Masterminds/html5-php/tree/2.7.6"
+            },
+            "time": "2022-08-18T16:18:26+00:00"
         },
         {
             "name": "mitoteam/jpgraph",
@@ -1364,6 +1447,11 @@
                 "php",
                 "utf-8"
             ],
+            "support": {
+                "docs": "http://mpdf.github.io",
+                "issues": "https://github.com/mpdf/mpdf/issues",
+                "source": "https://github.com/mpdf/mpdf"
+            },
             "funding": [
                 {
                     "url": "https://www.paypal.me/mpdf",
@@ -1419,6 +1507,10 @@
                 "object",
                 "object graph"
             ],
+            "support": {
+                "issues": "https://github.com/myclabs/DeepCopy/issues",
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0"
+            },
             "funding": [
                 {
                     "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
@@ -1477,6 +1569,10 @@
                 "parser",
                 "php"
             ],
+            "support": {
+                "issues": "https://github.com/nikic/PHP-Parser/issues",
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.14.0"
+            },
             "time": "2022-05-31T20:59:12+00:00"
         },
         {
@@ -1522,6 +1618,11 @@
                 "pseudorandom",
                 "random"
             ],
+            "support": {
+                "email": "info@paragonie.com",
+                "issues": "https://github.com/paragonie/random_compat/issues",
+                "source": "https://github.com/paragonie/random_compat"
+            },
             "time": "2020-10-15T08:29:30+00:00"
         },
         {
@@ -1578,6 +1679,10 @@
                 }
             ],
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
+            "support": {
+                "issues": "https://github.com/phar-io/manifest/issues",
+                "source": "https://github.com/phar-io/manifest/tree/2.0.3"
+            },
             "time": "2021-07-20T11:28:43+00:00"
         },
         {
@@ -1625,6 +1730,10 @@
                 }
             ],
             "description": "Library for handling version information and constraints",
+            "support": {
+                "issues": "https://github.com/phar-io/version/issues",
+                "source": "https://github.com/phar-io/version/tree/3.2.1"
+            },
             "time": "2022-02-21T01:04:05+00:00"
         },
         {
@@ -1665,6 +1774,10 @@
             ],
             "description": "A library to read, parse, export and make subsets of different types of font files.",
             "homepage": "https://github.com/PhenX/php-font-lib",
+            "support": {
+                "issues": "https://github.com/dompdf/php-font-lib/issues",
+                "source": "https://github.com/dompdf/php-font-lib/tree/0.5.4"
+            },
             "time": "2021-12-17T19:44:54+00:00"
         },
         {
@@ -1707,56 +1820,12 @@
             ],
             "description": "A library to read, parse and export to PDF SVG files.",
             "homepage": "https://github.com/PhenX/php-svg-lib",
+            "support": {
+                "issues": "https://github.com/dompdf/php-svg-lib/issues",
+                "source": "https://github.com/dompdf/php-svg-lib/tree/0.4.1"
+            },
             "time": "2022-03-07T12:52:04+00:00"
         },
-        {
-            "name": "php-cs-fixer/diff",
-            "version": "v2.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/PHP-CS-Fixer/diff.git",
-                "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/29dc0d507e838c4580d018bd8b5cb412474f7ec3",
-                "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0 || ^8.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0",
-                "symfony/process": "^3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                }
-            ],
-            "description": "sebastian/diff v3 backport support for PHP 5.6+",
-            "homepage": "https://github.com/PHP-CS-Fixer",
-            "keywords": [
-                "diff"
-            ],
-            "time": "2020-10-14T08:32:19+00:00"
-        },
         {
             "name": "php-http/message-factory",
             "version": "v1.0.2",
@@ -1805,6 +1874,10 @@
                 "stream",
                 "uri"
             ],
+            "support": {
+                "issues": "https://github.com/php-http/message-factory/issues",
+                "source": "https://github.com/php-http/message-factory/tree/master"
+            },
             "time": "2015-12-19T14:08:53+00:00"
         },
         {
@@ -1863,219 +1936,12 @@
                 "phpcs",
                 "standards"
             ],
+            "support": {
+                "issues": "https://github.com/PHPCompatibility/PHPCompatibility/issues",
+                "source": "https://github.com/PHPCompatibility/PHPCompatibility"
+            },
             "time": "2019-12-27T09:44:58+00:00"
         },
-        {
-            "name": "phpdocumentor/reflection-common",
-            "version": "2.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
-                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.x": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "opensource@ijaap.nl"
-                }
-            ],
-            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-            "homepage": "http://www.phpdoc.org",
-            "keywords": [
-                "FQSEN",
-                "phpDocumentor",
-                "phpdoc",
-                "reflection",
-                "static analysis"
-            ],
-            "time": "2020-06-27T09:03:43+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "5.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170",
-                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170",
-                "shasum": ""
-            },
-            "require": {
-                "ext-filter": "*",
-                "php": "^7.2 || ^8.0",
-                "phpdocumentor/reflection-common": "^2.2",
-                "phpdocumentor/type-resolver": "^1.3",
-                "webmozart/assert": "^1.9.1"
-            },
-            "require-dev": {
-                "mockery/mockery": "~1.3.2",
-                "psalm/phar": "^4.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                },
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "account@ijaap.nl"
-                }
-            ],
-            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2021-10-19T17:43:47+00:00"
-        },
-        {
-            "name": "phpdocumentor/type-resolver",
-            "version": "1.6.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "77a32518733312af16a44300404e945338981de3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3",
-                "reference": "77a32518733312af16a44300404e945338981de3",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0",
-                "phpdocumentor/reflection-common": "^2.0"
-            },
-            "require-dev": {
-                "ext-tokenizer": "*",
-                "psalm/phar": "^4.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-1.x": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
-            "time": "2022-03-15T21:29:03+00:00"
-        },
-        {
-            "name": "phpspec/prophecy",
-            "version": "v1.15.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
-                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.2",
-                "php": "^7.2 || ~8.0, <8.2",
-                "phpdocumentor/reflection-docblock": "^5.2",
-                "sebastian/comparator": "^3.0 || ^4.0",
-                "sebastian/recursion-context": "^3.0 || ^4.0"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "^6.0 || ^7.0",
-                "phpunit/phpunit": "^8.0 || ^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Prophecy\\": "src/Prophecy"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "time": "2021-12-08T12:19:24+00:00"
-        },
         {
             "name": "phpstan/phpstan",
             "version": "1.8.2",
@@ -2111,6 +1977,10 @@
                 "MIT"
             ],
             "description": "PHPStan - PHP Static Analysis Tool",
+            "support": {
+                "issues": "https://github.com/phpstan/phpstan/issues",
+                "source": "https://github.com/phpstan/phpstan/tree/1.8.2"
+            },
             "funding": [
                 {
                     "url": "https://github.com/ondrejmirtes",
@@ -2177,27 +2047,31 @@
                 "MIT"
             ],
             "description": "PHPUnit extensions and rules for PHPStan",
+            "support": {
+                "issues": "https://github.com/phpstan/phpstan-phpunit/issues",
+                "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.1.1"
+            },
             "time": "2022-04-20T15:24:25+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.15",
+            "version": "9.2.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f"
+                "reference": "2593003befdcc10db5e213f9f28814f5aa8ac073"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
-                "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2593003befdcc10db5e213f9f28814f5aa8ac073",
+                "reference": "2593003befdcc10db5e213f9f28814f5aa8ac073",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.13.0",
+                "nikic/php-parser": "^4.14",
                 "php": ">=7.3",
                 "phpunit/php-file-iterator": "^3.0.3",
                 "phpunit/php-text-template": "^2.0.2",
@@ -2244,13 +2118,17 @@
                 "testing",
                 "xunit"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.16"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
                 }
             ],
-            "time": "2022-03-07T09:28:20+00:00"
+            "time": "2022-08-20T05:26:47+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -2300,6 +2178,10 @@
                 "filesystem",
                 "iterator"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -2359,6 +2241,10 @@
             "keywords": [
                 "process"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
+                "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -2414,6 +2300,10 @@
             "keywords": [
                 "template"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -2469,6 +2359,10 @@
             "keywords": [
                 "timer"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -2479,16 +2373,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.21",
+            "version": "9.5.23",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1"
+                "reference": "888556852e7e9bbeeedb9656afe46118765ade34"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0e32b76be457de00e83213528f6bb37e2a38fcb1",
-                "reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/888556852e7e9bbeeedb9656afe46118765ade34",
+                "reference": "888556852e7e9bbeeedb9656afe46118765ade34",
                 "shasum": ""
             },
             "require": {
@@ -2503,7 +2397,6 @@
                 "phar-io/manifest": "^2.0.3",
                 "phar-io/version": "^3.0.2",
                 "php": ">=7.3",
-                "phpspec/prophecy": "^1.12.1",
                 "phpunit/php-code-coverage": "^9.2.13",
                 "phpunit/php-file-iterator": "^3.0.5",
                 "phpunit/php-invoker": "^3.1.1",
@@ -2521,9 +2414,6 @@
                 "sebastian/type": "^3.0",
                 "sebastian/version": "^3.0.2"
             },
-            "require-dev": {
-                "phpspec/prophecy-phpunit": "^2.0.1"
-            },
             "suggest": {
                 "ext-soap": "*",
                 "ext-xdebug": "*"
@@ -2563,6 +2453,10 @@
                 "testing",
                 "xunit"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.23"
+            },
             "funding": [
                 {
                     "url": "https://phpunit.de/sponsors.html",
@@ -2573,7 +2467,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-06-19T12:14:25+00:00"
+            "time": "2022-08-22T14:01:36+00:00"
         },
         {
             "name": "psr/cache",
@@ -2619,24 +2513,27 @@
                 "psr",
                 "psr-6"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/cache/tree/master"
+            },
             "time": "2016-08-06T20:24:11+00:00"
         },
         {
             "name": "psr/container",
-            "version": "1.1.1",
+            "version": "1.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/container.git",
-                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf"
+                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf",
-                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea",
+                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.0"
+                "php": ">=7.4.0"
             },
             "type": "library",
             "autoload": {
@@ -2663,7 +2560,11 @@
                 "container-interop",
                 "psr"
             ],
-            "time": "2021-03-05T17:36:06+00:00"
+            "support": {
+                "issues": "https://github.com/php-fig/container/issues",
+                "source": "https://github.com/php-fig/container/tree/1.1.2"
+            },
+            "time": "2021-11-05T16:50:12+00:00"
         },
         {
             "name": "psr/event-dispatcher",
@@ -2709,6 +2610,10 @@
                 "psr",
                 "psr-14"
             ],
+            "support": {
+                "issues": "https://github.com/php-fig/event-dispatcher/issues",
+                "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0"
+            },
             "time": "2019-01-08T18:20:26+00:00"
         },
         {
@@ -2756,6 +2661,9 @@
                 "psr",
                 "psr-3"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/log/tree/1.1.4"
+            },
             "time": "2021-05-03T11:20:27+00:00"
         },
         {
@@ -2805,6 +2713,10 @@
                 "parser",
                 "stylesheet"
             ],
+            "support": {
+                "issues": "https://github.com/sabberworm/PHP-CSS-Parser/issues",
+                "source": "https://github.com/sabberworm/PHP-CSS-Parser/tree/8.4.0"
+            },
             "time": "2021-12-11T13:40:54+00:00"
         },
         {
@@ -2851,6 +2763,10 @@
             ],
             "description": "Library for parsing CLI options",
             "homepage": "https://github.com/sebastianbergmann/cli-parser",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -2903,6 +2819,10 @@
             ],
             "description": "Collection of value objects that represent the PHP code units",
             "homepage": "https://github.com/sebastianbergmann/code-unit",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/code-unit/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -2954,6 +2874,10 @@
             ],
             "description": "Looks up which function or method a line of code belongs to",
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -3024,6 +2948,10 @@
                 "compare",
                 "equality"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/comparator/issues",
+                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -3077,6 +3005,10 @@
             ],
             "description": "Library for calculating the complexity of PHP code units",
             "homepage": "https://github.com/sebastianbergmann/complexity",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/complexity/issues",
+                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -3139,6 +3071,10 @@
                 "unidiff",
                 "unified diff"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/diff/issues",
+                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -3198,6 +3134,10 @@
                 "environment",
                 "hhvm"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/environment/issues",
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -3271,6 +3211,10 @@
                 "export",
                 "exporter"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/exporter/issues",
+                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -3331,6 +3275,10 @@
             "keywords": [
                 "global state"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/global-state/issues",
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -3384,6 +3332,10 @@
             ],
             "description": "Library for counting the lines of code in PHP source code",
             "homepage": "https://github.com/sebastianbergmann/lines-of-code",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -3437,6 +3389,10 @@
             ],
             "description": "Traverses array structures and object graphs to enumerate all referenced objects",
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
+                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -3488,6 +3444,10 @@
             ],
             "description": "Allows reflection of object attributes, including inherited and non-public ones",
             "homepage": "https://github.com/sebastianbergmann/object-reflector/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
+                "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -3547,6 +3507,10 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -3598,6 +3562,10 @@
             ],
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
+                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -3650,6 +3618,10 @@
             ],
             "description": "Collection of value objects that represent the types of the PHP type system",
             "homepage": "https://github.com/sebastianbergmann/type",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/type/issues",
+                "source": "https://github.com/sebastianbergmann/type/tree/3.0.0"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -3699,6 +3671,10 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/version/issues",
+                "source": "https://github.com/sebastianbergmann/version/tree/3.0.2"
+            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -3767,6 +3743,10 @@
                 "fpdi",
                 "pdf"
             ],
+            "support": {
+                "issues": "https://github.com/Setasign/FPDI/issues",
+                "source": "https://github.com/Setasign/FPDI/tree/v2.3.6"
+            },
             "funding": [
                 {
                     "url": "https://tidelift.com/funding/github/packagist/setasign/fpdi",
@@ -3824,20 +3804,25 @@
                 "phpcs",
                 "standards"
             ],
+            "support": {
+                "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
+                "source": "https://github.com/squizlabs/PHP_CodeSniffer",
+                "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
+            },
             "time": "2022-06-18T07:21:10+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v5.4.2",
+            "version": "v5.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "a2c6b7ced2eb7799a35375fb9022519282b5405e"
+                "reference": "535846c7ee6bc4dd027ca0d93220601456734b10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/a2c6b7ced2eb7799a35375fb9022519282b5405e",
-                "reference": "a2c6b7ced2eb7799a35375fb9022519282b5405e",
+                "url": "https://api.github.com/repos/symfony/console/zipball/535846c7ee6bc4dd027ca0d93220601456734b10",
+                "reference": "535846c7ee6bc4dd027ca0d93220601456734b10",
                 "shasum": ""
             },
             "require": {
@@ -3906,6 +3891,9 @@
                 "console",
                 "terminal"
             ],
+            "support": {
+                "source": "https://github.com/symfony/console/tree/v5.4.11"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -3920,20 +3908,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-20T16:11:12+00:00"
+            "time": "2022-07-22T10:42:43+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v2.5.0",
+            "version": "v2.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8"
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8",
-                "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
                 "shasum": ""
             },
             "require": {
@@ -3970,6 +3958,9 @@
             ],
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -3984,20 +3975,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-12T14:48:14+00:00"
+            "time": "2022-01-02T09:53:40+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v5.4.0",
+            "version": "v5.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "27d39ae126352b9fa3be5e196ccf4617897be3eb"
+                "reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/27d39ae126352b9fa3be5e196ccf4617897be3eb",
-                "reference": "27d39ae126352b9fa3be5e196ccf4617897be3eb",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc",
+                "reference": "8e6ce1cc0279e3ff3c8ff0f43813bc88d21ca1bc",
                 "shasum": ""
             },
             "require": {
@@ -4052,6 +4043,9 @@
             ],
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.9"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -4066,20 +4060,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-23T10:19:22+00:00"
+            "time": "2022-05-05T16:45:39+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v2.5.0",
+            "version": "v2.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "66bea3b09be61613cd3b4043a65a8ec48cfa6d2a"
+                "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/66bea3b09be61613cd3b4043a65a8ec48cfa6d2a",
-                "reference": "66bea3b09be61613cd3b4043a65a8ec48cfa6d2a",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1",
+                "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1",
                 "shasum": ""
             },
             "require": {
@@ -4128,6 +4122,9 @@
                 "interoperability",
                 "standards"
             ],
+            "support": {
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.2"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -4142,20 +4139,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-12T14:48:14+00:00"
+            "time": "2022-01-02T09:53:40+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v5.4.0",
+            "version": "v5.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "731f917dc31edcffec2c6a777f3698c33bea8f01"
+                "reference": "6699fb0228d1bc35b12aed6dd5e7455457609ddd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/731f917dc31edcffec2c6a777f3698c33bea8f01",
-                "reference": "731f917dc31edcffec2c6a777f3698c33bea8f01",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/6699fb0228d1bc35b12aed6dd5e7455457609ddd",
+                "reference": "6699fb0228d1bc35b12aed6dd5e7455457609ddd",
                 "shasum": ""
             },
             "require": {
@@ -4189,6 +4186,9 @@
             ],
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/filesystem/tree/v5.4.11"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -4203,20 +4203,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-10-28T13:39:27+00:00"
+            "time": "2022-07-20T13:00:38+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v5.4.2",
+            "version": "v5.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "e77046c252be48c48a40816187ed527703c8f76c"
+                "reference": "7872a66f57caffa2916a584db1aa7f12adc76f8c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/e77046c252be48c48a40816187ed527703c8f76c",
-                "reference": "e77046c252be48c48a40816187ed527703c8f76c",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/7872a66f57caffa2916a584db1aa7f12adc76f8c",
+                "reference": "7872a66f57caffa2916a584db1aa7f12adc76f8c",
                 "shasum": ""
             },
             "require": {
@@ -4249,6 +4249,9 @@
             ],
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/finder/tree/v5.4.11"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -4263,20 +4266,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-15T11:06:13+00:00"
+            "time": "2022-07-29T07:37:50+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v5.4.0",
+            "version": "v5.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "b0fb78576487af19c500aaddb269fd36701d4847"
+                "reference": "54f14e36aa73cb8f7261d7686691fd4d75ea2690"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/b0fb78576487af19c500aaddb269fd36701d4847",
-                "reference": "b0fb78576487af19c500aaddb269fd36701d4847",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/54f14e36aa73cb8f7261d7686691fd4d75ea2690",
+                "reference": "54f14e36aa73cb8f7261d7686691fd4d75ea2690",
                 "shasum": ""
             },
             "require": {
@@ -4315,6 +4318,9 @@
                 "configuration",
                 "options"
             ],
+            "support": {
+                "source": "https://github.com/symfony/options-resolver/tree/v5.4.11"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -4329,7 +4335,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-23T10:19:22+00:00"
+            "time": "2022-07-20T13:00:38+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -4394,6 +4400,9 @@
                 "polyfill",
                 "portable"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -4412,16 +4421,16 @@
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.23.1",
+            "version": "v1.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "16880ba9c5ebe3642d1995ab866db29270b36535"
+                "reference": "433d05519ce6990bf3530fba6957499d327395c2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/16880ba9c5ebe3642d1995ab866db29270b36535",
-                "reference": "16880ba9c5ebe3642d1995ab866db29270b36535",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/433d05519ce6990bf3530fba6957499d327395c2",
+                "reference": "433d05519ce6990bf3530fba6957499d327395c2",
                 "shasum": ""
             },
             "require": {
@@ -4433,7 +4442,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -4472,6 +4481,9 @@
                 "portable",
                 "shim"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.26.0"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -4486,20 +4498,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-27T12:26:48+00:00"
+            "time": "2022-05-24T11:49:31+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.23.0",
+            "version": "v1.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8"
+                "reference": "219aa369ceff116e673852dce47c3a41794c14bd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8",
-                "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd",
+                "reference": "219aa369ceff116e673852dce47c3a41794c14bd",
                 "shasum": ""
             },
             "require": {
@@ -4511,7 +4523,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -4553,6 +4565,9 @@
                 "portable",
                 "shim"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.26.0"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -4567,20 +4582,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-19T12:13:01+00:00"
+            "time": "2022-05-24T11:49:31+00:00"
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.23.0",
+            "version": "v1.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010"
+                "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010",
-                "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/e440d35fa0286f77fb45b79a03fedbeda9307e85",
+                "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85",
                 "shasum": ""
             },
             "require": {
@@ -4589,7 +4604,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -4629,6 +4644,9 @@
                 "portable",
                 "shim"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php73/tree/v1.26.0"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -4643,20 +4661,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-19T12:13:01+00:00"
+            "time": "2022-05-24T11:49:31+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.23.1",
+            "version": "v1.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be"
+                "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be",
-                "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace",
+                "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace",
                 "shasum": ""
             },
             "require": {
@@ -4665,7 +4683,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -4709,6 +4727,9 @@
                 "portable",
                 "shim"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -4723,20 +4744,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-28T13:41:28+00:00"
+            "time": "2022-05-10T07:21:04+00:00"
         },
         {
             "name": "symfony/polyfill-php81",
-            "version": "v1.23.0",
+            "version": "v1.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php81.git",
-                "reference": "e66119f3de95efc359483f810c4c3e6436279436"
+                "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/e66119f3de95efc359483f810c4c3e6436279436",
-                "reference": "e66119f3de95efc359483f810c4c3e6436279436",
+                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1",
+                "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1",
                 "shasum": ""
             },
             "require": {
@@ -4745,7 +4766,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.26-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -4785,6 +4806,9 @@
                 "portable",
                 "shim"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.26.0"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -4799,20 +4823,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-21T13:25:03+00:00"
+            "time": "2022-05-24T11:49:31+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v5.4.2",
+            "version": "v5.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "2b3ba8722c4aaf3e88011be5e7f48710088fb5e4"
+                "reference": "6e75fe6874cbc7e4773d049616ab450eff537bf1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/2b3ba8722c4aaf3e88011be5e7f48710088fb5e4",
-                "reference": "2b3ba8722c4aaf3e88011be5e7f48710088fb5e4",
+                "url": "https://api.github.com/repos/symfony/process/zipball/6e75fe6874cbc7e4773d049616ab450eff537bf1",
+                "reference": "6e75fe6874cbc7e4773d049616ab450eff537bf1",
                 "shasum": ""
             },
             "require": {
@@ -4844,6 +4868,9 @@
             ],
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/process/tree/v5.4.11"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -4858,26 +4885,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-27T21:01:00+00:00"
+            "time": "2022-06-27T16:58:25+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v2.5.0",
+            "version": "v2.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc"
+                "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc",
-                "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
+                "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
                 "psr/container": "^1.1",
-                "symfony/deprecation-contracts": "^2.1"
+                "symfony/deprecation-contracts": "^2.1|^3"
             },
             "conflict": {
                 "ext-psr": "<1.1|>=2"
@@ -4924,6 +4951,9 @@
                 "interoperability",
                 "standards"
             ],
+            "support": {
+                "source": "https://github.com/symfony/service-contracts/tree/v2.5.2"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -4938,20 +4968,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-04T16:48:04+00:00"
+            "time": "2022-05-30T19:17:29+00:00"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v5.4.0",
+            "version": "v5.4.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "208ef96122bfed82a8f3a61458a07113a08bdcfe"
+                "reference": "4d04b5c24f3c9a1a168a131f6cbe297155bc0d30"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/208ef96122bfed82a8f3a61458a07113a08bdcfe",
-                "reference": "208ef96122bfed82a8f3a61458a07113a08bdcfe",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/4d04b5c24f3c9a1a168a131f6cbe297155bc0d30",
+                "reference": "4d04b5c24f3c9a1a168a131f6cbe297155bc0d30",
                 "shasum": ""
             },
             "require": {
@@ -4983,6 +5013,9 @@
             ],
             "description": "Provides a way to profile code",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/stopwatch/tree/v5.4.5"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -4997,20 +5030,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-23T10:19:22+00:00"
+            "time": "2022-02-18T16:06:09+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v5.4.2",
+            "version": "v5.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d"
+                "reference": "5eb661e49ad389e4ae2b6e4df8d783a8a6548322"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d",
-                "reference": "e6a5d5ecf6589c5247d18e0e74e30b11dfd51a3d",
+                "url": "https://api.github.com/repos/symfony/string/zipball/5eb661e49ad389e4ae2b6e4df8d783a8a6548322",
+                "reference": "5eb661e49ad389e4ae2b6e4df8d783a8a6548322",
                 "shasum": ""
             },
             "require": {
@@ -5066,6 +5099,9 @@
                 "utf-8",
                 "utf8"
             ],
+            "support": {
+                "source": "https://github.com/symfony/string/tree/v5.4.11"
+            },
             "funding": [
                 {
                     "url": "https://symfony.com/sponsor",
@@ -5080,7 +5116,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-16T21:52:00+00:00"
+            "time": "2022-07-24T16:15:25+00:00"
         },
         {
             "name": "tecnickcom/tcpdf",
@@ -5192,6 +5228,10 @@
                 }
             ],
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
+            "support": {
+                "issues": "https://github.com/theseer/tokenizer/issues",
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
+            },
             "funding": [
                 {
                     "url": "https://github.com/theseer",
@@ -5199,60 +5239,6 @@
                 }
             ],
             "time": "2021-07-28T10:34:58+00:00"
-        },
-        {
-            "name": "webmozart/assert",
-            "version": "1.11.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozarts/assert.git",
-                "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991",
-                "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991",
-                "shasum": ""
-            },
-            "require": {
-                "ext-ctype": "*",
-                "php": "^7.2 || ^8.0"
-            },
-            "conflict": {
-                "phpstan/phpstan": "<0.12.20",
-                "vimeo/psalm": "<4.6.1 || 4.6.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^8.5.13"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.10-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\Assert\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "Assertions to validate method input/output with nice error messages.",
-            "keywords": [
-                "assert",
-                "check",
-                "validate"
-            ],
-            "time": "2022-06-03T18:03:27+00:00"
         }
     ],
     "aliases": [],
@@ -5279,5 +5265,5 @@
         "ext-zlib": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.3.0"
 }
diff --git a/samples/Calculations/LookupRef/VLOOKUP.php b/samples/Calculations/LookupRef/VLOOKUP.php
index 3e7eaa71..16a911e8 100644
--- a/samples/Calculations/LookupRef/VLOOKUP.php
+++ b/samples/Calculations/LookupRef/VLOOKUP.php
@@ -14,8 +14,8 @@ $worksheet = $spreadsheet->getActiveSheet();
 
 $data = [
     ['ID', 'First Name', 'Last Name', 'Salary'],
-    [72, 'Emily', 'Smith', 64901, null, 'ID', 53, 66, 56],
-    [66, 'James', 'Anderson', 70855, null, 'Salary'],
+    [72, 'Emily', 'Smith', 64901],
+    [66, 'James', 'Anderson', 70855],
     [14, 'Mia', 'Clark', 188657],
     [30, 'John', 'Lewis', 97566],
     [53, 'Jessica', 'Walker', 58339],
@@ -25,11 +25,24 @@ $data = [
 
 $worksheet->fromArray($data, null, 'B2');
 
-$worksheet->getCell('H4')->setValue('=VLOOKUP(H3, B3:E9, 4, FALSE)');
-$worksheet->getCell('I4')->setValue('=VLOOKUP(I3, B3:E9, 4, FALSE)');
-$worksheet->getCell('J4')->setValue('=VLOOKUP(J3, B3:E9, 4, FALSE)');
+$lookupFields = [
+    ['ID', 53, 66, 56],
+    ['Name'],
+    ['Salary'],
+];
+
+$worksheet->fromArray($lookupFields, null, 'G3');
+
+$worksheet->getCell('H4')->setValue('=VLOOKUP(H3, B3:E9, 2, FALSE) & " " & VLOOKUP(H3, B3:E9, 3, FALSE)');
+$worksheet->getCell('I4')->setValue('=VLOOKUP(I3, B3:E9, 2, FALSE) & " " & VLOOKUP(I3, B3:E9, 3, FALSE)');
+$worksheet->getCell('J4')->setValue('=VLOOKUP(J3, B3:E9, 2, FALSE) & " " & VLOOKUP(J3, B3:E9, 3, FALSE)');
+$worksheet->getCell('H5')->setValue('=VLOOKUP(H3, B3:E9, 4, FALSE)');
+$worksheet->getCell('I5')->setValue('=VLOOKUP(I3, B3:E9, 4, FALSE)');
+$worksheet->getCell('J5')->setValue('=VLOOKUP(J3, B3:E9, 4, FALSE)');
 
 for ($column = 'H'; $column !== 'K'; ++$column) {
-    $cell = $worksheet->getCell("{$column}4");
-    $helper->log("{$column}4: {$cell->getValue()} => {$cell->getCalculatedValue()}");
+    for ($row = 4; $row <= 5; ++$row) {
+        $cell = $worksheet->getCell("{$column}{$row}");
+        $helper->log("{$column}{$row}: {$cell->getValue()} => {$cell->getCalculatedValue()}");
+    }
 }
diff --git a/samples/Chart/33_Chart_create_scatter2.php b/samples/Chart/33_Chart_create_scatter2.php
index eed87119..59310620 100644
--- a/samples/Chart/33_Chart_create_scatter2.php
+++ b/samples/Chart/33_Chart_create_scatter2.php
@@ -120,7 +120,7 @@ $dataSeriesValues[2] // triangle border
     ->setColorProperties('accent4', null, ChartColor::EXCEL_COLOR_TYPE_SCHEME);
 $dataSeriesValues[2]->setScatterLines(false); // points not connected
 
-  // Added so that Xaxis shows dates instead of Excel-equivalent-year1900-numbers
+// Added so that Xaxis shows dates instead of Excel-equivalent-year1900-numbers
 $xAxis = new Axis();
 //$xAxis->setAxisNumberProperties(Properties::FORMAT_CODE_DATE );
 $xAxis->setAxisNumberProperties(Properties::FORMAT_CODE_DATE_ISO8601, true);
diff --git a/samples/Chart/33_Chart_create_scatter3.php b/samples/Chart/33_Chart_create_scatter3.php
index b4fc97b1..f6f9a6f4 100644
--- a/samples/Chart/33_Chart_create_scatter3.php
+++ b/samples/Chart/33_Chart_create_scatter3.php
@@ -120,7 +120,7 @@ $dataSeriesValues[2] // triangle border
     ->setColorProperties('accent4', null, ChartColor::EXCEL_COLOR_TYPE_SCHEME);
 $dataSeriesValues[2]->setScatterLines(false); // points not connected
 
-  // Added so that Xaxis shows dates instead of Excel-equivalent-year1900-numbers
+// Added so that Xaxis shows dates instead of Excel-equivalent-year1900-numbers
 $xAxis = new Axis();
 //$xAxis->setAxisNumberProperties(Properties::FORMAT_CODE_DATE );
 $xAxis->setAxisNumberProperties(Properties::FORMAT_CODE_DATE_ISO8601, true);
diff --git a/samples/Chart/33_Chart_create_scatter5_trendlines.php b/samples/Chart/33_Chart_create_scatter5_trendlines.php
index a87f6ee1..da831fa9 100644
--- a/samples/Chart/33_Chart_create_scatter5_trendlines.php
+++ b/samples/Chart/33_Chart_create_scatter5_trendlines.php
@@ -121,7 +121,7 @@ $dataSeriesValues[2] // triangle border
     ->getMarkerBorderColor()
     ->setColorProperties('accent4', null, ChartColor::EXCEL_COLOR_TYPE_SCHEME);
 $dataSeriesValues[2]->setScatterLines(false); // points not connected
-  // Added so that Xaxis shows dates instead of Excel-equivalent-year1900-numbers
+// Added so that Xaxis shows dates instead of Excel-equivalent-year1900-numbers
 $xAxis = new Axis();
 $xAxis->setAxisNumberProperties(Properties::FORMAT_CODE_DATE_ISO8601, true);
 
diff --git a/src/PhpSpreadsheet/Calculation/Calculation.php b/src/PhpSpreadsheet/Calculation/Calculation.php
index cf93a694..d9485ad9 100644
--- a/src/PhpSpreadsheet/Calculation/Calculation.php
+++ b/src/PhpSpreadsheet/Calculation/Calculation.php
@@ -4756,9 +4756,8 @@ class Calculation
 
                         break;
                 }
-
-                // if the token is a unary operator, pop one value off the stack, do the operation, and push it back on
             } elseif (($token === '~') || ($token === '%')) {
+                // if the token is a unary operator, pop one value off the stack, do the operation, and push it back on
                 if (($arg = $stack->pop()) === null) {
                     return $this->raiseFormulaError('Internal error - Operand value missing from stack');
                 }
@@ -4865,9 +4864,8 @@ class Calculation
                 if (isset($storeKey)) {
                     $branchStore[$storeKey] = $cellValue;
                 }
-
-                // if the token is a function, pop arguments off the stack, hand them to the function, and push the result back on
             } 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 ($pCellParent) {
                     $cell->attach($pCellParent);
                 }
@@ -4977,8 +4975,8 @@ class Calculation
                     if (isset($storeKey)) {
                         $branchStore[$storeKey] = $token;
                     }
-                    // if the token is a named range or formula, evaluate it and push the result onto the stack
                 } elseif (preg_match('/^' . self::CALCULATION_REGEXP_DEFINEDNAME . '$/miu', $token, $matches)) {
+                    // if the token is a named range or formula, evaluate it and push the result onto the stack
                     $definedName = $matches[6];
                     if ($cell === null || $pCellWorksheet === null) {
                         return $this->raiseFormulaError("undefined name '$token'");
diff --git a/src/PhpSpreadsheet/Calculation/Engine/Logger.php b/src/PhpSpreadsheet/Calculation/Engine/Logger.php
index c6ee5969..256c3eff 100644
--- a/src/PhpSpreadsheet/Calculation/Engine/Logger.php
+++ b/src/PhpSpreadsheet/Calculation/Engine/Logger.php
@@ -98,9 +98,9 @@ class Logger
             $cellReference = implode(' -> ', $this->cellStack->showStack());
             if ($this->echoDebugLog) {
                 echo $cellReference,
-                    ($this->cellStack->count() > 0 ? ' => ' : ''),
-                    $message,
-                    PHP_EOL;
+                ($this->cellStack->count() > 0 ? ' => ' : ''),
+                $message,
+                PHP_EOL;
             }
             $this->debugLog[] = $cellReference .
                 ($this->cellStack->count() > 0 ? ' => ' : '') .
diff --git a/src/PhpSpreadsheet/Calculation/MathTrig/Random.php b/src/PhpSpreadsheet/Calculation/MathTrig/Random.php
index b9fcfc73..22cad2cf 100644
--- a/src/PhpSpreadsheet/Calculation/MathTrig/Random.php
+++ b/src/PhpSpreadsheet/Calculation/MathTrig/Random.php
@@ -17,7 +17,7 @@ class Random
      */
     public static function rand()
     {
-        return (mt_rand(0, 10000000)) / 10000000;
+        return mt_rand(0, 10000000) / 10000000;
     }
 
     /**
diff --git a/src/PhpSpreadsheet/Calculation/Statistical/Averages.php b/src/PhpSpreadsheet/Calculation/Statistical/Averages.php
index 41b011a5..85195c88 100644
--- a/src/PhpSpreadsheet/Calculation/Statistical/Averages.php
+++ b/src/PhpSpreadsheet/Calculation/Statistical/Averages.php
@@ -203,7 +203,7 @@ class Averages extends AggregateBase
             $args,
             function ($value) {
                 // Is it a numeric value?
-                return  (is_numeric($value)) && (!is_string($value));
+                return  is_numeric($value) && (!is_string($value));
             }
         );
     }
diff --git a/src/PhpSpreadsheet/Calculation/Statistical/Distributions/ChiSquared.php b/src/PhpSpreadsheet/Calculation/Statistical/Distributions/ChiSquared.php
index 8574d58d..c8743364 100644
--- a/src/PhpSpreadsheet/Calculation/Statistical/Distributions/ChiSquared.php
+++ b/src/PhpSpreadsheet/Calculation/Statistical/Distributions/ChiSquared.php
@@ -101,7 +101,7 @@ class ChiSquared
             return 1 - self::distributionRightTail($value, $degrees);
         }
 
-        return (($value ** (($degrees / 2) - 1) * exp(-$value / 2))) /
+        return ($value ** (($degrees / 2) - 1) * exp(-$value / 2)) /
             ((2 ** ($degrees / 2)) * Gamma::gammaValue($degrees / 2));
     }
 
diff --git a/src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php b/src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php
index f0ce1f65..d31a55b3 100644
--- a/src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php
+++ b/src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php
@@ -729,21 +729,21 @@ abstract class JpGraphRendererBase implements IRenderer
             switch ($chartType) {
                 case 'area3DChart':
                     $dimensions = '3d';
-                // no break
+                    // no break
                 case 'areaChart':
                     $this->renderPlotLine($i, true, true, $dimensions);
 
                     break;
                 case 'bar3DChart':
                     $dimensions = '3d';
-                // no break
+                    // no break
                 case 'barChart':
                     $this->renderPlotBar($i, $dimensions);
 
                     break;
                 case 'line3DChart':
                     $dimensions = '3d';
-                // no break
+                    // no break
                 case 'lineChart':
                     $this->renderPlotLine($i, false, true, $dimensions);
 
@@ -799,35 +799,35 @@ abstract class JpGraphRendererBase implements IRenderer
         switch ($chartType) {
             case 'area3DChart':
                 $dimensions = '3d';
-            // no break
+                // no break
             case 'areaChart':
                 $this->renderAreaChart($groupCount, $dimensions);
 
                 break;
             case 'bar3DChart':
                 $dimensions = '3d';
-            // no break
+                // no break
             case 'barChart':
                 $this->renderBarChart($groupCount, $dimensions);
 
                 break;
             case 'line3DChart':
                 $dimensions = '3d';
-            // no break
+                // no break
             case 'lineChart':
                 $this->renderLineChart($groupCount, $dimensions);
 
                 break;
             case 'pie3DChart':
                 $dimensions = '3d';
-            // no break
+                // no break
             case 'pieChart':
                 $this->renderPieChart($groupCount, $dimensions, false, false);
 
                 break;
             case 'doughnut3DChart':
                 $dimensions = '3d';
-            // no break
+                // no break
             case 'doughnutChart':
                 $this->renderPieChart($groupCount, $dimensions, true, true);
 
@@ -846,7 +846,7 @@ abstract class JpGraphRendererBase implements IRenderer
                 break;
             case 'surface3DChart':
                 $dimensions = '3d';
-            // no break
+                // no break
             case 'surfaceChart':
                 $this->renderContourChart($groupCount, $dimensions);
 
diff --git a/src/PhpSpreadsheet/Reader/Xls.php b/src/PhpSpreadsheet/Reader/Xls.php
index 9f8a3ace..71496ece 100644
--- a/src/PhpSpreadsheet/Reader/Xls.php
+++ b/src/PhpSpreadsheet/Reader/Xls.php
@@ -6999,7 +6999,7 @@ class Xls extends BaseReader
                 }
 
                 break;
-            // Unknown cases    // don't know how to deal with
+                // Unknown cases    // don't know how to deal with
             default:
                 throw new Exception('Unrecognized token ' . sprintf('%02X', $id) . ' in formula');
 
diff --git a/src/PhpSpreadsheet/Reader/Xlsx.php b/src/PhpSpreadsheet/Reader/Xlsx.php
index 52df94e4..630fd1dd 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx.php
@@ -479,7 +479,7 @@ class Xlsx extends BaseReader
                     $propertyReader->readCustomProperties($this->getFromZipArchive($zip, $relTarget));
 
                     break;
-                //Ribbon
+                    // Ribbon
                 case Namespaces::EXTENSIBILITY:
                     $customUI = $relTarget;
                     if ($customUI) {
@@ -530,7 +530,7 @@ class Xlsx extends BaseReader
                                 }
 
                                 break;
-                            // a vbaProject ? (: some macros)
+                                // a vbaProject ? (: some macros)
                             case Namespaces::VBA:
                                 $macros = $ele['Target'];
 
@@ -1695,8 +1695,8 @@ class Xlsx extends BaseReader
 
                         break;
 
-                    // unparsed
                     case 'application/vnd.ms-excel.controlproperties+xml':
+                        // unparsed
                         $unparsedLoadedData['override_content_types'][(string) $contentType['PartName']] = (string) $contentType['ContentType'];
 
                         break;
@@ -1722,7 +1722,6 @@ class Xlsx extends BaseReader
             $value->createText(StringHelper::controlCharacterOOXML2PHP((string) $is->t));
         } else {
             if (is_object($is->r)) {
-
                 /** @var SimpleXMLElement $run */
                 foreach ($is->r as $run) {
                     if (!isset($run->rPr)) {
diff --git a/src/PhpSpreadsheet/Shared/JAMA/EigenvalueDecomposition.php b/src/PhpSpreadsheet/Shared/JAMA/EigenvalueDecomposition.php
index 66111b6c..1ec7f6ab 100644
--- a/src/PhpSpreadsheet/Shared/JAMA/EigenvalueDecomposition.php
+++ b/src/PhpSpreadsheet/Shared/JAMA/EigenvalueDecomposition.php
@@ -495,7 +495,7 @@ class EigenvalueDecomposition
                         $this->V[$i][$n - 1] = $q * $z + $p * $this->V[$i][$n];
                         $this->V[$i][$n] = $q * $this->V[$i][$n] - $p * $z;
                     }
-                    // Complex pair
+                // Complex pair
                 } else {
                     $this->d[$n - 1] = $x + $p;
                     $this->d[$n] = $x + $p;
@@ -671,7 +671,7 @@ class EigenvalueDecomposition
                             } else {
                                 $this->H[$i][$n] = -$r / ($eps * $norm);
                             }
-                            // Solve real equations
+                        // Solve real equations
                         } else {
                             $x = $this->H[$i][$i + 1];
                             $y = $this->H[$i + 1][$i];
@@ -693,7 +693,7 @@ class EigenvalueDecomposition
                         }
                     }
                 }
-                // Complex vector
+            // Complex vector
             } elseif ($q < 0) {
                 $l = $n - 1;
                 // Last vector component imaginary so matrix is triangular
diff --git a/src/PhpSpreadsheet/Shared/JAMA/Matrix.php b/src/PhpSpreadsheet/Shared/JAMA/Matrix.php
index 0bbd94a7..5e35d491 100644
--- a/src/PhpSpreadsheet/Shared/JAMA/Matrix.php
+++ b/src/PhpSpreadsheet/Shared/JAMA/Matrix.php
@@ -67,21 +67,21 @@ class Matrix
                     $this->A = $args[0];
 
                     break;
-                //Square matrix - n x n
+                    //Square matrix - n x n
                 case 'integer':
                     $this->m = $args[0];
                     $this->n = $args[0];
                     $this->A = array_fill(0, $this->m, array_fill(0, $this->n, 0));
 
                     break;
-                //Rectangular matrix - m x n
+                    //Rectangular matrix - m x n
                 case 'integer,integer':
                     $this->m = $args[0];
                     $this->n = $args[1];
                     $this->A = array_fill(0, $this->m, array_fill(0, $this->n, 0));
 
                     break;
-                //Rectangular matrix - m x n initialized from packed array
+                    //Rectangular matrix - m x n initialized from packed array
                 case 'array,integer':
                     $this->m = $args[1];
                     if ($this->m != 0) {
@@ -191,7 +191,7 @@ class Matrix
                     return $R;
 
                     break;
-                //A($i0...$iF; $j0...$jF)
+                    //A($i0...$iF; $j0...$jF)
                 case 'integer,integer,integer,integer':
                     [$i0, $iF, $j0, $jF] = $args;
                     if (($iF > $i0) && ($this->m >= $iF) && ($i0 >= 0)) {
@@ -214,7 +214,7 @@ class Matrix
                     return $R;
 
                     break;
-                //$R = array of row indices; $C = array of column indices
+                    //$R = array of row indices; $C = array of column indices
                 case 'array,array':
                     [$RL, $CL] = $args;
                     if (count($RL) > 0) {
@@ -237,7 +237,7 @@ class Matrix
                     return $R;
 
                     break;
-                //A($i0...$iF); $CL = array of column indices
+                    //A($i0...$iF); $CL = array of column indices
                 case 'integer,integer,array':
                     [$i0, $iF, $CL] = $args;
                     if (($iF > $i0) && ($this->m >= $iF) && ($i0 >= 0)) {
@@ -260,7 +260,7 @@ class Matrix
                     return $R;
 
                     break;
-                //$RL = array of row indices
+                    //$RL = array of row indices
                 case 'array,integer,integer':
                     [$RL, $j0, $jF] = $args;
                     if (count($RL) > 0) {
diff --git a/src/PhpSpreadsheet/Shared/JAMA/SingularValueDecomposition.php b/src/PhpSpreadsheet/Shared/JAMA/SingularValueDecomposition.php
index 6c8999d0..b809bfa1 100644
--- a/src/PhpSpreadsheet/Shared/JAMA/SingularValueDecomposition.php
+++ b/src/PhpSpreadsheet/Shared/JAMA/SingularValueDecomposition.php
@@ -315,7 +315,7 @@ class SingularValueDecomposition
                     }
 
                     break;
-                // Split at negligible s(k).
+                    // Split at negligible s(k).
                 case 2:
                     $f = $e[$k - 1];
                     $e[$k - 1] = 0.0;
@@ -336,7 +336,7 @@ class SingularValueDecomposition
                     }
 
                     break;
-                // Perform one qr step.
+                    // Perform one qr step.
                 case 3:
                     // Calculate the shift.
                     $scale = max(max(max(max(abs($this->s[$p - 1]), abs($this->s[$p - 2])), abs($e[$p - 2])), abs($this->s[$k])), abs($e[$k]));
@@ -396,7 +396,7 @@ class SingularValueDecomposition
                     $iter = $iter + 1;
 
                     break;
-                // Convergence.
+                    // Convergence.
                 case 4:
                     // Make the singular values positive.
                     if ($this->s[$k] <= 0.0) {
diff --git a/src/PhpSpreadsheet/Writer/Xls/Parser.php b/src/PhpSpreadsheet/Writer/Xls/Parser.php
index 2f75f908..ca9b67b5 100644
--- a/src/PhpSpreadsheet/Writer/Xls/Parser.php
+++ b/src/PhpSpreadsheet/Writer/Xls/Parser.php
@@ -531,7 +531,7 @@ class Parser
             {
                 return($this->convertFunction($token, $this->_func_args));
             }*/
-            // if it's an argument, ignore the token (the argument remains)
+        // if it's an argument, ignore the token (the argument remains)
         } elseif ($token == 'arg') {
             return '';
         }
diff --git a/src/PhpSpreadsheet/Writer/Xls/Worksheet.php b/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
index 37865518..8f09af69 100644
--- a/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
+++ b/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
@@ -2836,7 +2836,7 @@ class Worksheet extends BIFFwriter
                     $operatorType = 0x01;
 
                     break;
-                // not OPERATOR_NOTBETWEEN 0x02
+                    // not OPERATOR_NOTBETWEEN 0x02
             }
         }
 

From d0781c3fd236b594d94335b53691b339b4fe8818 Mon Sep 17 00:00:00 2001
From: Alexis Lefebvre <alexislefebvre@gmail.com>
Date: Thu, 25 Aug 2022 02:47:22 +0200
Subject: [PATCH 35/69] Explain that UoM = Unit of Measure (#3014)

---
 docs/topics/recipes.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/topics/recipes.md b/docs/topics/recipes.md
index e4313382..afa3dcc8 100644
--- a/docs/topics/recipes.md
+++ b/docs/topics/recipes.md
@@ -1161,7 +1161,7 @@ A column's width can be set using the following code:
 $spreadsheet->getActiveSheet()->getColumnDimension('D')->setWidth(12);
 ```
 
-If you want to set a column width using a different unit of measure,
+If you want to set a column width using a different UoM (Unit of Measure),
 then you can do so by telling PhpSpreadsheet what UoM the width value
 that you are setting is measured in.
 Valid units are `pt` (points), `px` (pixels), `pc` (pica), `in` (inches),
@@ -1258,7 +1258,7 @@ Excel measures row height in points, where 1 pt is 1/72 of an inch (or
 about 0.35mm). The default value is 12.75 pts; and the permitted range
 of values is between 0 and 409 pts, where 0 pts is a hidden row.
 
-If you want to set a row height using a different unit of measure,
+If you want to set a row height using a different UoM (Unit of Measure),
 then you can do so by telling PhpSpreadsheet what UoM the height value
 that you are setting is measured in.
 Valid units are `pt` (points), `px` (pixels), `pc` (pica), `in` (inches),
@@ -1670,7 +1670,7 @@ $spreadsheet->getActiveSheet()->getDefaultColumnDimension()->setWidth(12);
 Excel measures column width in its own proprietary units, based on the number
 of characters that will be displayed in the default font.
 
-If you want to set the default column width using a different unit of measure,
+If you want to set the default column width using a different UoM (Unit of Measure),
 then you can do so by telling PhpSpreadsheet what UoM the width value
 that you are setting is measured in.
 Valid units are `pt` (points), `px` (pixels), `pc` (pica), `in` (inches),
@@ -1693,7 +1693,7 @@ Excel measures row height in points, where 1 pt is 1/72 of an inch (or
 about 0.35mm). The default value is 12.75 pts; and the permitted range
 of values is between 0 and 409 pts, where 0 pts is a hidden row.
 
-If you want to set a row height using a different unit of measure,
+If you want to set a row height using a different UoM (Unit of Measure),
 then you can do so by telling PhpSpreadsheet what UoM the height value
 that you are setting is measured in.
 Valid units are `pt` (points), `px` (pixels), `pc` (pica), `in` (inches),

From e97428ba6708615fd12b411c9ef2a079bcb3d252 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Wed, 24 Aug 2022 18:00:37 -0700
Subject: [PATCH 36/69] Html Writer - Do Not Generate background-color When
 Fill is None (#3016)

* Html Writer - Do Not Generate background-color When Fill is None

For PR #3002, I noted that there was a problem with Dompdf truncating images. I raised an issue with them (https://github.com/dompdf/dompdf/issues/2980), and they agree that there is a bug; however, they also suggested a workaround, namely omitting background-color from any cells which the image overlays. That did not at first appear to be a solution which could be generalized for PhpSpreasheet. However, investigating further, I saw that Html Writer is generating background-color for all cells, even though most of them use the default Fill type None (which suggests that background-color should not be specified after all). So this PR changes HTML Writer to generate background-color only when the user has actually set Fill type to something other than None. This is not a complete workaround for the Dompdf problem - we will still see truncation if the image overlays a cell which does specify a Fill type - however, it is almost certainly good enough for most use cases.

In addition to that change, I made the generated Html a little smaller and the code a little more efficient by combining the TD and TH styles for each cell into a single declaration and calling createCssStyle only once.

* Revamp One Test

Look for both td.style and th.style instead of just td.style in test.
---
 src/PhpSpreadsheet/Writer/Html.php                    | 11 ++++++-----
 .../Writer/Html/VisibilityTest.php                    |  6 +++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/PhpSpreadsheet/Writer/Html.php b/src/PhpSpreadsheet/Writer/Html.php
index 362eae00..68e200f5 100644
--- a/src/PhpSpreadsheet/Writer/Html.php
+++ b/src/PhpSpreadsheet/Writer/Html.php
@@ -940,8 +940,8 @@ class Html extends BaseWriter
 
         // Calculate cell style hashes
         foreach ($this->spreadsheet->getCellXfCollection() as $index => $style) {
-            $css['td.style' . $index] = $this->createCSSStyle($style);
-            $css['th.style' . $index] = $this->createCSSStyle($style);
+            $css['td.style' . $index . ', th.style' . $index] = $this->createCSSStyle($style);
+            //$css['th.style' . $index] = $this->createCSSStyle($style);
         }
 
         // Fetch sheets
@@ -1094,9 +1094,10 @@ class Html extends BaseWriter
         $css = [];
 
         // Create CSS
-        $value = $fill->getFillType() == Fill::FILL_NONE ?
-            'white' : '#' . $fill->getStartColor()->getRGB();
-        $css['background-color'] = $value;
+        if ($fill->getFillType() !== Fill::FILL_NONE) {
+            $value = '#' . $fill->getStartColor()->getRGB();
+            $css['background-color'] = $value;
+        }
 
         return $css;
     }
diff --git a/tests/PhpSpreadsheetTests/Writer/Html/VisibilityTest.php b/tests/PhpSpreadsheetTests/Writer/Html/VisibilityTest.php
index c5d4da68..1c1ffb06 100644
--- a/tests/PhpSpreadsheetTests/Writer/Html/VisibilityTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Html/VisibilityTest.php
@@ -99,11 +99,11 @@ class VisibilityTest extends Functional\AbstractFunctional
         self::assertEquals(1, $rowsrch);
         $rowsrch = preg_match('/^\\s*table[.]sheet0 tr[.]row1 [{] height:25pt [}]\\s*$/m', $html);
         self::assertEquals(1, $rowsrch);
-        $rowsrch = preg_match('/^\\s*td[.]style1 [{].*text-decoration:line-through;.*[}]\\s*$/m', $html);
+        $rowsrch = preg_match('/^\\s*td[.]style1, th[.]style1 [{].*text-decoration:line-through;.*[}]\\s*$/m', $html);
         self::assertEquals(1, $rowsrch);
-        $rowsrch = preg_match('/^\\s*td[.]style2 [{].*text-decoration:underline line-through;.*[}]\\s*$/m', $html);
+        $rowsrch = preg_match('/^\\s*td[.]style2, th[.]style2 [{].*text-decoration:underline line-through;.*[}]\\s*$/m', $html);
         self::assertEquals(1, $rowsrch);
-        $rowsrch = preg_match('/^\\s*td[.]style3 [{].*text-decoration:underline;.*[}]\\s*$/m', $html);
+        $rowsrch = preg_match('/^\\s*td[.]style3, th[.]style3 [{].*text-decoration:underline;.*[}]\\s*$/m', $html);
         self::assertEquals(1, $rowsrch);
 
         $this->writeAndReload($spreadsheet, 'Html');

From 3861f7e37e9453a9babc30d09ed08b361bb219bb Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Wed, 24 Aug 2022 19:31:55 -0700
Subject: [PATCH 37/69] Charts - Add Support for Date Axis (#3018)

* Charts - Add Support for Date Axis

Fix #2967. Fix #2969 (which had already been fixed prior to opening the issue, but had added urgency for Date Axes). Add ability to set axis type to date axis, in addition to original possiblities of value axis and category axis.

* Update 33_Chart_create_line_dateaxis.php

No idea why php-cs-fixer is complaining. It didn't do so when I first uploaded. I can't duplicate problem on my own system. Not enough detail in error message for me to act. Grasping at straws, I have moved the function definition (which is the only use of braces in the entire script) from the end of the script to the beginning.

* Update 33_Chart_create_line_dateaxis.php

Some comments were mis-aligned. This may be related to the reasons behind PR #3025, which didn't take care of this because this script had not yet been merged.
---
 .../Chart/33_Chart_create_line_dateaxis.php   | 375 ++++++++++++++++++
 .../33_Chart_create_scatter5_trendlines.php   |   1 +
 .../32readwriteLineDateAxisChart1.xlsx        | Bin 0 -> 12114 bytes
 src/PhpSpreadsheet/Chart/Axis.php             |  26 +-
 src/PhpSpreadsheet/Reader/Xlsx/Chart.php      |  22 +-
 src/PhpSpreadsheet/Writer/Xlsx/Chart.php      |  42 +-
 .../Chart/AxisPropertiesTest.php              |  10 +-
 .../Chart/Charts32CatAxValAxTest.php          |   8 +-
 .../Chart/Charts32XmlTest.php                 |  41 ++
 9 files changed, 500 insertions(+), 25 deletions(-)
 create mode 100644 samples/Chart/33_Chart_create_line_dateaxis.php
 create mode 100644 samples/templates/32readwriteLineDateAxisChart1.xlsx

diff --git a/samples/Chart/33_Chart_create_line_dateaxis.php b/samples/Chart/33_Chart_create_line_dateaxis.php
new file mode 100644
index 00000000..1a47e5aa
--- /dev/null
+++ b/samples/Chart/33_Chart_create_line_dateaxis.php
@@ -0,0 +1,375 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Chart;
+
+use DateTime;
+use PhpOffice\PhpSpreadsheet\Chart\Legend as ChartLegend;
+use PhpOffice\PhpSpreadsheet\IOFactory;
+use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDate;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../Header.php';
+
+$spreadsheet = new Spreadsheet();
+$dataSheet = $spreadsheet->getActiveSheet();
+$dataSheet->setTitle('Data');
+// changed data to simulate a trend chart - Xaxis are dates; Yaxis are 3 meausurements from each date
+// Dates changed not to fall on exact quarter start
+$dataSheet->fromArray(
+    [
+        ['', 'date', 'metric1', 'metric2', 'metric3'],
+        ['=DATEVALUE(B2)', '2021-01-10', 12.1, 15.1, 21.1],
+        ['=DATEVALUE(B3)', '2021-04-21', 56.2, 73.2, 86.2],
+        ['=DATEVALUE(B4)', '2021-07-31', 52.2, 61.2, 69.2],
+        ['=DATEVALUE(B5)', '2021-10-11', 30.2, 22.2, 0.2],
+        ['=DATEVALUE(B6)', '2022-01-21', 40.1, 38.1, 65.1],
+        ['=DATEVALUE(B7)', '2022-04-11', 45.2, 44.2, 96.2],
+        ['=DATEVALUE(B8)', '2022-07-01', 52.2, 51.2, 55.2],
+        ['=DATEVALUE(B9)', '2022-10-31', 41.2, 72.2, 56.2],
+    ]
+);
+
+$dataSheet->getStyle('A2:A9')->getNumberFormat()->setFormatCode(Properties::FORMAT_CODE_DATE_ISO8601);
+$dataSheet->getColumnDimension('A')->setAutoSize(true);
+$dataSheet->getColumnDimension('B')->setAutoSize(true);
+$dataSheet->setSelectedCells('A1');
+
+// Set the Labels for each data series we want to plot
+//     Datatype
+//     Cell reference for data
+//     Format Code
+//     Number of datapoints in series
+$dataSeriesLabels = [
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, 'Data!$C$1', null, 1),
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, 'Data!$D$1', null, 1),
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, 'Data!$E$1', null, 1),
+];
+// Set the X-Axis Labels
+// NUMBER, not STRING
+// added x-axis values for each of the 3 metrics
+// added FORMATE_CODE_NUMBER
+// Number of datapoints in series
+$xAxisTickValues = [
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_NUMBER, 'Data!$A$2:$A$9', Properties::FORMAT_CODE_DATE_ISO8601, 8),
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_NUMBER, 'Data!$A$2:$A$9', Properties::FORMAT_CODE_DATE_ISO8601, 8),
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_NUMBER, 'Data!$A$2:$A$9', Properties::FORMAT_CODE_DATE_ISO8601, 8),
+];
+// Set the Data values for each data series we want to plot
+//     Datatype
+//     Cell reference for data
+//     Format Code
+//     Number of datapoints in series
+//     Data values
+//     Data Marker
+//     Data Marker Color fill/[fill,Border]
+//     Data Marker size
+//   Color(s) added
+// added FORMAT_CODE_NUMBER
+$dataSeriesValues = [
+    new DataSeriesValues(
+        DataSeriesValues::DATASERIES_TYPE_NUMBER,
+        'Data!$C$2:$C$9',
+        Properties::FORMAT_CODE_NUMBER,
+        8,
+        null,
+        'diamond',
+        null,
+        5
+    ),
+    new DataSeriesValues(
+        DataSeriesValues::DATASERIES_TYPE_NUMBER,
+        'Data!$D$2:$D$9',
+        Properties::FORMAT_CODE_NUMBER,
+        8,
+        null,
+        'square',
+        '*accent1',
+        6
+    ),
+    new DataSeriesValues(
+        DataSeriesValues::DATASERIES_TYPE_NUMBER,
+        'Data!$E$2:$E$9',
+        Properties::FORMAT_CODE_NUMBER,
+        8,
+        null,
+        null,
+        null,
+        7
+    ), // let Excel choose marker shape
+];
+// series 1 - metric1
+// marker details
+$dataSeriesValues[0]
+    ->getMarkerFillColor()
+    ->setColorProperties('0070C0', null, ChartColor::EXCEL_COLOR_TYPE_ARGB);
+$dataSeriesValues[0]
+    ->getMarkerBorderColor()
+    ->setColorProperties('002060', null, ChartColor::EXCEL_COLOR_TYPE_ARGB);
+
+// line details - dashed, smooth line (Bezier) with arrows, 40% transparent
+$dataSeriesValues[0]
+    ->setSmoothLine(true)
+    ->setScatterLines(true)
+    ->setLineColorProperties('accent1', 40, ChartColor::EXCEL_COLOR_TYPE_SCHEME); // value, alpha, type
+$dataSeriesValues[0]->setLineStyleProperties(
+    2.5, // width in points
+    Properties::LINE_STYLE_COMPOUND_TRIPLE, // compound
+    Properties::LINE_STYLE_DASH_SQUARE_DOT, // dash
+    Properties::LINE_STYLE_CAP_SQUARE, // cap
+    Properties::LINE_STYLE_JOIN_MITER, // join
+    Properties::LINE_STYLE_ARROW_TYPE_OPEN, // head type
+    Properties::LINE_STYLE_ARROW_SIZE_4, // head size preset index
+    Properties::LINE_STYLE_ARROW_TYPE_ARROW, // end type
+    Properties::LINE_STYLE_ARROW_SIZE_6 // end size preset index
+);
+
+// series 2 - metric2, straight line - no special effects, connected
+$dataSeriesValues[1] // square marker border color
+    ->getMarkerBorderColor()
+    ->setColorProperties('accent6', 3, ChartColor::EXCEL_COLOR_TYPE_SCHEME);
+$dataSeriesValues[1] // square marker fill color
+    ->getMarkerFillColor()
+    ->setColorProperties('0FFF00', null, ChartColor::EXCEL_COLOR_TYPE_ARGB);
+$dataSeriesValues[1]
+    ->setScatterLines(true)
+    ->setSmoothLine(false)
+    ->setLineColorProperties('FF0000', 80, ChartColor::EXCEL_COLOR_TYPE_ARGB);
+$dataSeriesValues[1]->setLineWidth(2.0);
+
+// series 3 - metric3, markers, no line
+$dataSeriesValues[2] // triangle? fill
+    //->setPointMarker('triangle') // let Excel choose shape, which is predicted to be a triangle
+    ->getMarkerFillColor()
+    ->setColorProperties('FFFF00', null, ChartColor::EXCEL_COLOR_TYPE_ARGB);
+$dataSeriesValues[2] // triangle border
+    ->getMarkerBorderColor()
+    ->setColorProperties('accent4', null, ChartColor::EXCEL_COLOR_TYPE_SCHEME);
+$dataSeriesValues[2]->setScatterLines(false); // points not connected
+// Added so that Xaxis shows dates instead of Excel-equivalent-year1900-numbers
+$xAxis = new Axis();
+$xAxis->setAxisNumberProperties(Properties::FORMAT_CODE_DATE_ISO8601);
+
+// Build the dataseries
+$series = new DataSeries(
+    DataSeries::TYPE_SCATTERCHART, // plotType
+    null, // plotGrouping (Scatter charts don't have grouping)
+    range(0, count($dataSeriesValues) - 1), // plotOrder
+    $dataSeriesLabels, // plotLabel
+    $xAxisTickValues, // plotCategory
+    $dataSeriesValues, // plotValues
+    null, // plotDirection
+    null, // smooth line
+    DataSeries::STYLE_SMOOTHMARKER // plotStyle
+);
+
+// Set the series in the plot area
+$plotArea = new PlotArea(null, [$series]);
+// Set the chart legend
+$legend = new ChartLegend(ChartLegend::POSITION_TOPRIGHT, null, false);
+
+$title = new Title('Test Scatter Chart');
+$yAxisLabel = new Title('Value ($k)');
+$yAxis = new Axis();
+$yAxis->setMajorGridlines(new GridLines());
+
+// Create the chart
+$chart = new Chart(
+    'chart1', // name
+    $title, // title
+    $legend, // legend
+    $plotArea, // plotArea
+    true, // plotVisibleOnly
+    DataSeries::EMPTY_AS_GAP, // displayBlanksAs
+    null, // xAxisLabel
+    $yAxisLabel,  // yAxisLabel
+    // added xAxis for correct date display
+    $xAxis, // xAxis
+    $yAxis, // yAxis
+);
+
+// Set the position of the chart in the chart sheet
+$chart->setTopLeftPosition('A1');
+$chart->setBottomRightPosition('P12');
+
+// create a 'Chart' worksheet, add $chart to it
+$spreadsheet->createSheet();
+$chartSheet = $spreadsheet->getSheet(1);
+$chartSheet->setTitle('Scatter+Line Chart');
+
+$chartSheet = $spreadsheet->getSheetByName('Scatter+Line Chart');
+// Add the chart to the worksheet
+$chartSheet->addChart($chart);
+
+// ------- Demonstrate Date Xaxis in Line Chart, not possible using Scatter Chart ------------
+
+// Set the Labels (Column header) for each data series we want to plot
+$dataSeriesLabels = [
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, 'Data!$E$1', null, 1),
+];
+
+// Set the X-Axis Labels - dates, N.B. 01/10/2021 === Jan 10, NOT Oct 1 !!
+// x-axis values are the Excel numeric representation of the date - so set
+// formatCode=General for the xAxis VALUES, but we want the labels to be
+// DISPLAYED as 'yyyy-mm-dd'  That is, read a number, display a date.
+$xAxisTickValues = [
+    new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_NUMBER, 'Data!$A$2:$A$9', Properties::FORMAT_CODE_DATE_ISO8601, 8),
+];
+
+// X axis (date) settings
+$xAxisLabel = new Title('Date');
+$xAxis = new Axis();
+$xAxis->setAxisNumberProperties(Properties::FORMAT_CODE_DATE_ISO8601); // yyyy-mm-dd
+
+// Set the Data values for each data series we want to plot
+$dataSeriesValues = [
+    new DataSeriesValues(
+        DataSeriesValues::DATASERIES_TYPE_NUMBER,
+        'Data!$E$2:$E$9',
+        Properties::FORMAT_CODE_NUMBER,
+        8,
+        null,
+        'triangle',
+        null,
+        7
+    ),
+];
+
+// series - metric3, markers, no line
+$dataSeriesValues[0]
+    ->setScatterlines(false); // disable connecting lines
+$dataSeriesValues[0]
+    ->getMarkerFillColor()
+    ->setColorProperties('FFFF00', null, ChartColor::EXCEL_COLOR_TYPE_ARGB);
+$dataSeriesValues[0]
+    ->getMarkerBorderColor()
+    ->setColorProperties('accent4', null, ChartColor::EXCEL_COLOR_TYPE_SCHEME);
+
+// Build the dataseries
+// must now use LineChart instead of ScatterChart, since ScatterChart does not
+// support "dateAx" axis type.
+$series = new DataSeries(
+    DataSeries::TYPE_LINECHART, // plotType
+    'standard', // plotGrouping
+    range(0, count($dataSeriesValues) - 1), // plotOrder
+    $dataSeriesLabels, // plotLabel
+    $xAxisTickValues, // plotCategory
+    $dataSeriesValues, // plotValues
+    null, // plotDirection
+    false, // smooth line
+    DataSeries::STYLE_LINEMARKER  // plotStyle
+    // DataSeries::STYLE_SMOOTHMARKER // plotStyle
+);
+
+// Set the series in the plot area
+$plotArea = new PlotArea(null, [$series]);
+// Set the chart legend
+$legend = new ChartLegend(ChartLegend::POSITION_RIGHT, null, false);
+
+$title = new Title('Test Line-Chart with Date Axis - metric3 values');
+
+// X axis (date) settings
+$xAxisLabel = new Title('Game Date');
+$xAxis = new Axis();
+// date axis values are Excel numbers, not yyyy-mm-dd Date strings
+$xAxis->setAxisNumberProperties(Properties::FORMAT_CODE_DATE_ISO8601);
+
+$xAxis->setAxisType('dateAx'); // dateAx available ONLY for LINECHART, not SCATTERCHART
+
+// measure the time span in Quarters, of data.
+$dateMinMax = dateRange(8, $spreadsheet); // array 'min'=>earliest date of first Q, 'max'=>latest date of final Q
+// change xAxis tick marks to match Qtr boundaries
+
+$nQtrs = sprintf('%3.2f', (($dateMinMax['max'] - $dateMinMax['min']) / 30.5) / 4);
+$tickMarkInterval = ($nQtrs > 20) ? 6 : 3; // tick marks every ? months
+
+$xAxis->setAxisOptionsProperties(
+    Properties::AXIS_LABELS_NEXT_TO, // axis_label pos
+    null, // horizontalCrossesValue
+    null, // horizontalCrosses
+    null, // axisOrientation
+    'in', // major_tick_mark
+    null, // minor_tick_mark
+    $dateMinMax['min'], // minimum calculate this from the earliest data: 'Data!$A$2'
+    $dateMinMax['max'], // maximum calculate this from the last data:     'Data!$A$'.($nrows+1)
+    $tickMarkInterval,  // majorUnit determines tickmarks & Gridlines ?
+    null, // minorUnit
+    null, // textRotation
+    null, // hidden
+    'days', // baseTimeUnit
+    'months', // majorTimeUnit,
+    'months',   // minorTimeUnit
+);
+
+$yAxisLabel = new Title('Value ($k)');
+$yAxis = new Axis();
+$yAxis->setMajorGridlines(new GridLines());
+$xAxis->setMajorGridlines(new GridLines());
+$minorGridLines = new GridLines();
+$minorGridLines->activateObject();
+$xAxis->setMinorGridlines($minorGridLines);
+
+// Create the chart
+$chart = new Chart(
+    'chart2', // name
+    $title, // title
+    $legend, // legend
+    $plotArea, // plotArea
+    true, // plotVisibleOnly
+    DataSeries::EMPTY_AS_GAP, // displayBlanksAs
+    null, // xAxisLabel
+    $yAxisLabel,  // yAxisLabel
+    // added xAxis for correct date display
+    $xAxis, // xAxis
+    $yAxis, // yAxis
+);
+
+// Set the position of the chart in the chart sheet below the first chart
+$chart->setTopLeftPosition('A13');
+$chart->setBottomRightPosition('P25');
+$chart->setRoundedCorners('true'); // Rounded corners in Chart Outline
+
+// Add the chart to the worksheet $chartSheet
+$chartSheet->addChart($chart);
+$spreadsheet->setActiveSheetIndex(1);
+
+// Save Excel 2007 file
+$filename = $helper->getFilename(__FILE__);
+$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
+$writer->setIncludeCharts(true);
+$callStartTime = microtime(true);
+$writer->save($filename);
+$helper->logWrite($writer, $filename, $callStartTime);
+$spreadsheet->disconnectWorksheets();
+
+function dateRange(int $nrows, Spreadsheet $wrkbk): array
+{
+    $dataSheet = $wrkbk->getSheetByName('Data');
+
+    // start the xaxis at the beginning of the quarter of the first date
+    $startDateStr = $dataSheet->getCell('B2')->getValue(); // yyyy-mm-dd date string
+    $startDate = DateTime::createFromFormat('Y-m-d', $startDateStr); // php date obj
+
+    // get date of first day of the quarter of the start date
+    $startMonth = $startDate->format('n'); // suppress leading zero
+    $startYr = $startDate->format('Y');
+    $qtr = intdiv($startMonth, 3) + (($startMonth % 3 > 0) ? 1 : 0);
+    $qtrStartMonth = sprintf('%02d', 1 + (($qtr - 1) * 3));
+    $qtrStartStr = "$startYr-$qtrStartMonth-01";
+    $ExcelQtrStartDateVal = SharedDate::convertIsoDate($qtrStartStr);
+
+    // end the xaxis at the end of the quarter of the last date
+    $lastDateStr = $dataSheet->getCellByColumnAndRow(2, $nrows + 1)->getValue();
+    $lastDate = DateTime::createFromFormat('Y-m-d', $lastDateStr);
+    $lastMonth = $lastDate->format('n');
+    $lastYr = $lastDate->format('Y');
+    $qtr = intdiv($lastMonth, 3) + (($lastMonth % 3 > 0) ? 1 : 0);
+    $qtrEndMonth = 3 + (($qtr - 1) * 3);
+    $lastDOM = cal_days_in_month(CAL_GREGORIAN, $qtrEndMonth, $lastYr);
+    $qtrEndMonth = sprintf('%02d', $qtrEndMonth);
+    $qtrEndStr = "$lastYr-$qtrEndMonth-$lastDOM";
+    $ExcelQtrEndDateVal = SharedDate::convertIsoDate($qtrEndStr);
+
+    $minMaxDates = ['min' => $ExcelQtrStartDateVal, 'max' => $ExcelQtrEndDateVal];
+
+    return $minMaxDates;
+}
diff --git a/samples/Chart/33_Chart_create_scatter5_trendlines.php b/samples/Chart/33_Chart_create_scatter5_trendlines.php
index da831fa9..a640f735 100644
--- a/samples/Chart/33_Chart_create_scatter5_trendlines.php
+++ b/samples/Chart/33_Chart_create_scatter5_trendlines.php
@@ -263,6 +263,7 @@ $chart->setBottomRightPosition('P25');
 
 // Add the chart to the worksheet $chartSheet
 $chartSheet->addChart($chart);
+$spreadsheet->setActiveSheetIndex(1);
 
 // Save Excel 2007 file
 $filename = $helper->getFilename(__FILE__);
diff --git a/samples/templates/32readwriteLineDateAxisChart1.xlsx b/samples/templates/32readwriteLineDateAxisChart1.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..42470303aa766a74253901e16ead0683db938d13
GIT binary patch
literal 12114
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

literal 0
HcmV?d00001

diff --git a/src/PhpSpreadsheet/Chart/Axis.php b/src/PhpSpreadsheet/Chart/Axis.php
index bd7082ff..3ac5c3cd 100644
--- a/src/PhpSpreadsheet/Chart/Axis.php
+++ b/src/PhpSpreadsheet/Chart/Axis.php
@@ -10,6 +10,14 @@ namespace PhpOffice\PhpSpreadsheet\Chart;
  */
 class Axis extends Properties
 {
+    const AXIS_TYPE_CATEGORY = 'catAx';
+    const AXIS_TYPE_DATE = 'dateAx';
+    const AXIS_TYPE_VALUE = 'valAx';
+
+    const TIME_UNIT_DAYS = 'days';
+    const TIME_UNIT_MONTHS = 'months';
+    const TIME_UNIT_YEARS = 'years';
+
     public function __construct()
     {
         parent::__construct();
@@ -62,6 +70,9 @@ class Axis extends Properties
         'horizontal_crosses_value' => null,
         'textRotation' => null,
         'hidden' => null,
+        'majorTimeUnit' => self::TIME_UNIT_YEARS,
+        'minorTimeUnit' => self::TIME_UNIT_MONTHS,
+        'baseTimeUnit' => self::TIME_UNIT_DAYS,
     ];
 
     /**
@@ -74,6 +85,7 @@ class Axis extends Properties
     private const NUMERIC_FORMAT = [
         Properties::FORMAT_CODE_NUMBER,
         Properties::FORMAT_CODE_DATE,
+        Properties::FORMAT_CODE_DATE_ISO8601,
     ];
 
     /**
@@ -115,12 +127,12 @@ class Axis extends Properties
 
     public function getAxisIsNumericFormat(): bool
     {
-        return (bool) $this->axisNumber['numeric'];
+        return $this->axisType === self::AXIS_TYPE_DATE || (bool) $this->axisNumber['numeric'];
     }
 
     public function setAxisOption(string $key, ?string $value): void
     {
-        if (!empty($value)) {
+        if ($value !== null && $value !== '') {
             $this->axisOptions[$key] = $value;
         }
     }
@@ -140,7 +152,10 @@ class Axis extends Properties
         ?string $majorUnit = null,
         ?string $minorUnit = null,
         ?string $textRotation = null,
-        ?string $hidden = null
+        ?string $hidden = null,
+        ?string $baseTimeUnit = null,
+        ?string $majorTimeUnit = null,
+        ?string $minorTimeUnit = null
     ): void {
         $this->axisOptions['axis_labels'] = $axisLabels;
         $this->setAxisOption('horizontal_crosses_value', $horizontalCrossesValue);
@@ -154,6 +169,9 @@ class Axis extends Properties
         $this->setAxisOption('minor_unit', $minorUnit);
         $this->setAxisOption('textRotation', $textRotation);
         $this->setAxisOption('hidden', $hidden);
+        $this->setAxisOption('baseTimeUnit', $baseTimeUnit);
+        $this->setAxisOption('majorTimeUnit', $majorTimeUnit);
+        $this->setAxisOption('minorTimeUnit', $minorTimeUnit);
     }
 
     /**
@@ -185,7 +203,7 @@ class Axis extends Properties
 
     public function setAxisType(string $type): self
     {
-        if ($type === 'catAx' || $type === 'valAx') {
+        if ($type === self::AXIS_TYPE_CATEGORY || $type === self::AXIS_TYPE_VALUE || $type === self::AXIS_TYPE_DATE) {
             $this->axisType = $type;
         } else {
             $this->axisType = '';
diff --git a/src/PhpSpreadsheet/Reader/Xlsx/Chart.php b/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
index dab2b410..76316db9 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
@@ -139,12 +139,13 @@ class Chart
                                             $plotAreaLayout = $this->chartLayoutDetails($chartDetail);
 
                                             break;
-                                        case 'catAx':
+                                        case Axis::AXIS_TYPE_CATEGORY:
+                                        case Axis::AXIS_TYPE_DATE:
                                             $catAxRead = true;
                                             if (isset($chartDetail->title)) {
                                                 $XaxisLabel = $this->chartTitle($chartDetail->title->children($this->cNamespace));
                                             }
-                                            $xAxis->setAxisType('catAx');
+                                            $xAxis->setAxisType($chartDetailKey);
                                             $this->readEffects($chartDetail, $xAxis);
                                             if (isset($chartDetail->spPr)) {
                                                 $sppr = $chartDetail->spPr->children($this->aNamespace);
@@ -173,13 +174,7 @@ class Chart
                                             $this->setAxisProperties($chartDetail, $xAxis);
 
                                             break;
-                                        case 'dateAx':
-                                            if (isset($chartDetail->title)) {
-                                                $XaxisLabel = $this->chartTitle($chartDetail->title->children($this->cNamespace));
-                                            }
-
-                                            break;
-                                        case 'valAx':
+                                        case Axis::AXIS_TYPE_VALUE:
                                             $whichAxis = null;
                                             $axPos = null;
                                             if (isset($chartDetail->axPos)) {
@@ -1375,6 +1370,15 @@ class Chart
         if (isset($chartDetail->minorUnit)) {
             $whichAxis->setAxisOption('minor_unit', (string) self::getAttribute($chartDetail->minorUnit, 'val', 'string'));
         }
+        if (isset($chartDetail->baseTimeUnit)) {
+            $whichAxis->setAxisOption('baseTimeUnit', (string) self::getAttribute($chartDetail->baseTimeUnit, 'val', 'string'));
+        }
+        if (isset($chartDetail->majorTimeUnit)) {
+            $whichAxis->setAxisOption('majorTimeUnit', (string) self::getAttribute($chartDetail->majorTimeUnit, 'val', 'string'));
+        }
+        if (isset($chartDetail->minorTimeUnit)) {
+            $whichAxis->setAxisOption('minorTimeUnit', (string) self::getAttribute($chartDetail->minorTimeUnit, 'val', 'string'));
+        }
         if (isset($chartDetail->txPr)) {
             $children = $chartDetail->txPr->children($this->aNamespace);
             if (isset($children->bodyPr)) {
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Chart.php b/src/PhpSpreadsheet/Writer/Xlsx/Chart.php
index ad746a0a..48f7d255 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/Chart.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/Chart.php
@@ -490,13 +490,14 @@ class Chart extends WriterPart
     private function writeCategoryAxis(XMLWriter $objWriter, ?Title $xAxisLabel, $id1, $id2, $isMultiLevelSeries, Axis $yAxis): void
     {
         // N.B. writeCategoryAxis may be invoked with the last parameter($yAxis) using $xAxis for ScatterChart, etc
-        // In that case, xAxis is NOT a category.
-        if ($yAxis->getAxisType() !== '') {
-            $objWriter->startElement('c:' . $yAxis->getAxisType());
+        // In that case, xAxis may contain values like the yAxis, or it may be a date axis (LINECHART).
+        $axisType = $yAxis->getAxisType();
+        if ($axisType !== '') {
+            $objWriter->startElement("c:$axisType");
         } elseif ($yAxis->getAxisIsNumericFormat()) {
-            $objWriter->startElement('c:valAx');
+            $objWriter->startElement('c:' . Axis::AXIS_TYPE_VALUE);
         } else {
-            $objWriter->startElement('c:catAx');
+            $objWriter->startElement('c:' . Axis::AXIS_TYPE_CATEGORY);
         }
         $majorGridlines = $yAxis->getMajorGridlines();
         $minorGridlines = $yAxis->getMinorGridlines();
@@ -654,7 +655,8 @@ class Chart extends WriterPart
         }
 
         $objWriter->startElement('c:auto');
-        $objWriter->writeAttribute('val', '1');
+        // LineChart with dateAx wants '0'
+        $objWriter->writeAttribute('val', ($axisType === Axis::AXIS_TYPE_DATE) ? '0' : '1');
         $objWriter->endElement();
 
         $objWriter->startElement('c:lblAlgn');
@@ -665,6 +667,30 @@ class Chart extends WriterPart
         $objWriter->writeAttribute('val', '100');
         $objWriter->endElement();
 
+        if ($axisType === Axis::AXIS_TYPE_DATE) {
+            $property = 'baseTimeUnit';
+            $propertyVal = $yAxis->getAxisOptionsProperty($property);
+            if (!empty($propertyVal)) {
+                $objWriter->startElement("c:$property");
+                $objWriter->writeAttribute('val', $propertyVal);
+                $objWriter->endElement();
+            }
+            $property = 'majorTimeUnit';
+            $propertyVal = $yAxis->getAxisOptionsProperty($property);
+            if (!empty($propertyVal)) {
+                $objWriter->startElement("c:$property");
+                $objWriter->writeAttribute('val', $propertyVal);
+                $objWriter->endElement();
+            }
+            $property = 'minorTimeUnit';
+            $propertyVal = $yAxis->getAxisOptionsProperty($property);
+            if (!empty($propertyVal)) {
+                $objWriter->startElement("c:$property");
+                $objWriter->writeAttribute('val', $propertyVal);
+                $objWriter->endElement();
+            }
+        }
+
         if ($isMultiLevelSeries) {
             $objWriter->startElement('c:noMultiLvlLbl');
             $objWriter->writeAttribute('val', '0');
@@ -683,7 +709,7 @@ class Chart extends WriterPart
      */
     private function writeValueAxis(XMLWriter $objWriter, ?Title $yAxisLabel, $groupType, $id1, $id2, $isMultiLevelSeries, Axis $xAxis): void
     {
-        $objWriter->startElement('c:valAx');
+        $objWriter->startElement('c:' . Axis::AXIS_TYPE_VALUE);
         $majorGridlines = $xAxis->getMajorGridlines();
         $minorGridlines = $xAxis->getMinorGridlines();
 
@@ -1079,7 +1105,7 @@ class Chart extends WriterPart
                         $objWriter->endElement(); // a:ln
                     }
                 }
-                $nofill = $groupType == DataSeries::TYPE_STOCKCHART || ($groupType === DataSeries::TYPE_SCATTERCHART && !$plotSeriesValues->getScatterLines());
+                $nofill = $groupType === DataSeries::TYPE_STOCKCHART || (($groupType === DataSeries::TYPE_SCATTERCHART || $groupType === DataSeries::TYPE_LINECHART) && !$plotSeriesValues->getScatterLines());
                 if ($callLineStyles) {
                     $this->writeLineStyles($objWriter, $plotSeriesValues, $nofill);
                     $this->writeEffects($objWriter, $plotSeriesValues);
diff --git a/tests/PhpSpreadsheetTests/Chart/AxisPropertiesTest.php b/tests/PhpSpreadsheetTests/Chart/AxisPropertiesTest.php
index 91df25cb..0bfc2966 100644
--- a/tests/PhpSpreadsheetTests/Chart/AxisPropertiesTest.php
+++ b/tests/PhpSpreadsheetTests/Chart/AxisPropertiesTest.php
@@ -109,7 +109,9 @@ class AxisPropertiesTest extends AbstractFunctional
             '8', //minimum
             '68', //maximum
             '20', //majorUnit
-            '5' //minorUnit
+            '5', //minorUnit
+            '6', //textRotation
+            '0', //hidden
         );
         self::assertSame(Properties::AXIS_LABELS_HIGH, $xAxis->getAxisOptionsProperty('axis_labels'));
         self::assertNull($xAxis->getAxisOptionsProperty('horizontal_crosses_value'));
@@ -121,6 +123,8 @@ class AxisPropertiesTest extends AbstractFunctional
         self::assertSame('68', $xAxis->getAxisOptionsProperty('maximum'));
         self::assertSame('20', $xAxis->getAxisOptionsProperty('major_unit'));
         self::assertSame('5', $xAxis->getAxisOptionsProperty('minor_unit'));
+        self::assertSame('6', $xAxis->getAxisOptionsProperty('textRotation'));
+        self::assertSame('0', $xAxis->getAxisOptionsProperty('hidden'));
 
         $yAxis = new Axis();
         $yAxis->setFillParameters('accent1', 30, 'schemeClr');
@@ -158,6 +162,8 @@ class AxisPropertiesTest extends AbstractFunctional
         self::assertSame('68', $xAxis2->getAxisOptionsProperty('maximum'));
         self::assertSame('20', $xAxis2->getAxisOptionsProperty('major_unit'));
         self::assertSame('5', $xAxis2->getAxisOptionsProperty('minor_unit'));
+        self::assertSame('6', $xAxis2->getAxisOptionsProperty('textRotation'));
+        self::assertSame('0', $xAxis2->getAxisOptionsProperty('hidden'));
 
         $yAxis2 = $chart->getChartAxisY();
         self::assertSame('accent1', $yAxis2->getFillProperty('value'));
@@ -198,6 +204,8 @@ class AxisPropertiesTest extends AbstractFunctional
         self::assertSame('68', $xAxis3->getAxisOptionsProperty('maximum'));
         self::assertSame('20', $xAxis3->getAxisOptionsProperty('major_unit'));
         self::assertSame('5', $xAxis3->getAxisOptionsProperty('minor_unit'));
+        self::assertSame('6', $xAxis3->getAxisOptionsProperty('textRotation'));
+        self::assertSame('0', $xAxis3->getAxisOptionsProperty('hidden'));
 
         $yAxis3 = $chart2->getChartAxisY();
         self::assertSame('accent1', $yAxis3->getFillProperty('value'));
diff --git a/tests/PhpSpreadsheetTests/Chart/Charts32CatAxValAxTest.php b/tests/PhpSpreadsheetTests/Chart/Charts32CatAxValAxTest.php
index 268ee094..1f046af9 100644
--- a/tests/PhpSpreadsheetTests/Chart/Charts32CatAxValAxTest.php
+++ b/tests/PhpSpreadsheetTests/Chart/Charts32CatAxValAxTest.php
@@ -23,6 +23,8 @@ class Charts32CatAxValAxTest extends TestCase
     /** @var string */
     private $outputFileName = '';
 
+    private const FORMAT_CODE_DATE_ISO8601_SLASH = 'yyyy/mm/dd'; // not automatically treated as numeric
+
     protected function tearDown(): void
     {
         if ($this->outputFileName !== '') {
@@ -48,7 +50,7 @@ class Charts32CatAxValAxTest extends TestCase
                 ['=DATEVALUE("2021-01-10")', 30.2, 32.2, 0.2],
             ]
         );
-        $worksheet->getStyle('A2:A5')->getNumberFormat()->setFormatCode(Properties::FORMAT_CODE_DATE_ISO8601);
+        $worksheet->getStyle('A2:A5')->getNumberFormat()->setFormatCode(self::FORMAT_CODE_DATE_ISO8601_SLASH);
         $worksheet->getColumnDimension('A')->setAutoSize(true);
         $worksheet->setSelectedCells('A1');
 
@@ -91,9 +93,9 @@ class Charts32CatAxValAxTest extends TestCase
         $xAxis = new Axis();
         //$xAxis->setAxisNumberProperties(Properties::FORMAT_CODE_DATE );
         if (is_bool($numeric)) {
-            $xAxis->setAxisNumberProperties(Properties::FORMAT_CODE_DATE_ISO8601, $numeric);
+            $xAxis->setAxisNumberProperties(self::FORMAT_CODE_DATE_ISO8601_SLASH, $numeric);
         } else {
-            $xAxis->setAxisNumberProperties(Properties::FORMAT_CODE_DATE_ISO8601);
+            $xAxis->setAxisNumberProperties(self::FORMAT_CODE_DATE_ISO8601_SLASH);
         }
 
         // Build the dataseries
diff --git a/tests/PhpSpreadsheetTests/Chart/Charts32XmlTest.php b/tests/PhpSpreadsheetTests/Chart/Charts32XmlTest.php
index 6a4673fd..4cc62360 100644
--- a/tests/PhpSpreadsheetTests/Chart/Charts32XmlTest.php
+++ b/tests/PhpSpreadsheetTests/Chart/Charts32XmlTest.php
@@ -177,4 +177,45 @@ class Charts32XmlTest extends TestCase
             )
         );
     }
+
+    public function testDateAx(): void
+    {
+        $file = self::DIRECTORY . '32readwriteLineDateAxisChart1.xlsx';
+        $reader = new XlsxReader();
+        $reader->setIncludeCharts(true);
+        $spreadsheet = $reader->load($file);
+        $sheet = $spreadsheet->getActiveSheet();
+        $charts = $sheet->getChartCollection();
+        self::assertCount(2, $charts);
+        $chart = $charts[1];
+        self::assertNotNull($chart);
+
+        $writer = new XlsxWriter($spreadsheet);
+        $writer->setIncludeCharts(true);
+        $writerChart = new XlsxWriter\Chart($writer);
+        $data = $writerChart->writeChart($chart);
+        $spreadsheet->disconnectWorksheets();
+
+        self::assertSame(
+            1,
+            substr_count(
+                $data,
+                '<c:baseTimeUnit val="days"/><c:majorTimeUnit val="months"/><c:minorTimeUnit val="months"/>'
+            )
+        );
+        self::assertSame(
+            1,
+            substr_count(
+                $data,
+                '<c:dateAx>'
+            )
+        );
+        self::assertSame(
+            1,
+            substr_count(
+                $data,
+                '<c:valAx>'
+            )
+        );
+    }
 }

From 131708409b7a48949838e13bf528f1dca7947fc7 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Thu, 25 Aug 2022 23:22:59 -0700
Subject: [PATCH 38/69] Correct Very Minor Error / Php8.2 Deprecation (#3021)

When Reader/Xlsx/WorkbookView was split off from Reader/Xlsx.php, one statement accidentally brought `!empty($this->loadSheetsOnly)` with it. That property does not exist in WorkbookView, so the test is useless (it is always empty); and, in fact, the caller passes its own version of loadSheetsOnly as a parameter, so it isn't needed even it did exist. In Php8.2, this might be a deprecation, although it hasn't shown up in the GitHub 8.2 tests. Fix it anyhow.
---
 src/PhpSpreadsheet/Reader/Xlsx/WorkbookView.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpSpreadsheet/Reader/Xlsx/WorkbookView.php b/src/PhpSpreadsheet/Reader/Xlsx/WorkbookView.php
index 9d61e3d3..4743afbf 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx/WorkbookView.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx/WorkbookView.php
@@ -29,7 +29,7 @@ class WorkbookView
         $this->spreadsheet->setActiveSheetIndex(0);
 
         $workbookView = $xmlWorkbook->children($mainNS)->bookViews->workbookView;
-        if (($readDataOnly !== true || !empty($this->loadSheetsOnly)) && !empty($workbookView)) {
+        if ($readDataOnly !== true && !empty($workbookView)) {
             $workbookViewAttributes = self::testSimpleXml(self::getAttributes($workbookView));
             // active sheet index
             $activeTab = (int) $workbookViewAttributes->activeTab; // refers to old sheet index

From f7a35349289532a2ee3912f2464d9722826152a8 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Sat, 27 Aug 2022 16:23:55 +0200
Subject: [PATCH 39/69] Implementation of the `VALUETOTEXT()` Excel Function

---
 CHANGELOG.md                                  |  2 +-
 .../Calculation/Calculation.php               |  4 +--
 .../Calculation/Engineering/ConvertUOM.php    |  1 +
 .../Calculation/TextData/Format.php           | 34 +++++++++++++++++++
 .../Functions/TextData/ValueToTextTest.php    | 28 +++++++++++++++
 .../data/Calculation/TextData/VALUETOTEXT.php | 27 +++++++++++++++
 6 files changed, 93 insertions(+), 3 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ValueToTextTest.php
 create mode 100644 tests/data/Calculation/TextData/VALUETOTEXT.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da29bc8f..dc17d852 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 ### Added
 
 - Implementation of the new `TEXTBEFORE()`, `TEXTAFTER()` and `TEXTSPLIT()` Excel Functions
-- Implementation of the `ARRAYTOTEXT()` Excel Function
+- Implementation of the `ARRAYTOTEXT()` and `VALUETOTEXT()` Excel Functions
 - Support for [mitoteam/jpgraph](https://packagist.org/packages/mitoteam/jpgraph) implementation of
   JpGraph library to render charts added.
 - Charts: Add Gradients, Transparency, Hidden Axes, Rounded Corners, Trendlines.
diff --git a/src/PhpSpreadsheet/Calculation/Calculation.php b/src/PhpSpreadsheet/Calculation/Calculation.php
index d9485ad9..b5a26f62 100644
--- a/src/PhpSpreadsheet/Calculation/Calculation.php
+++ b/src/PhpSpreadsheet/Calculation/Calculation.php
@@ -2659,8 +2659,8 @@ class Calculation
         ],
         'VALUETOTEXT' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
-            'functionCall' => [Functions::class, 'DUMMY'],
-            'argumentCount' => '?',
+            'functionCall' => [TextData\Format::class, 'valueToText'],
+            'argumentCount' => '1,2',
         ],
         'VAR' => [
             'category' => Category::CATEGORY_STATISTICAL,
diff --git a/src/PhpSpreadsheet/Calculation/Engineering/ConvertUOM.php b/src/PhpSpreadsheet/Calculation/Engineering/ConvertUOM.php
index 677fb0fb..b7c298db 100644
--- a/src/PhpSpreadsheet/Calculation/Engineering/ConvertUOM.php
+++ b/src/PhpSpreadsheet/Calculation/Engineering/ConvertUOM.php
@@ -106,6 +106,7 @@ class ConvertUOM
         'W' => ['Group' => self::CATEGORY_POWER, 'Unit Name' => 'Watt', 'AllowPrefix' => true],
         'w' => ['Group' => self::CATEGORY_POWER, 'Unit Name' => 'Watt', 'AllowPrefix' => true],
         'PS' => ['Group' => self::CATEGORY_POWER, 'Unit Name' => 'Pferdestärke', 'AllowPrefix' => false],
+        // Magnetism
         'T' => ['Group' => self::CATEGORY_MAGNETISM, 'Unit Name' => 'Tesla', 'AllowPrefix' => true],
         'ga' => ['Group' => self::CATEGORY_MAGNETISM, 'Unit Name' => 'Gauss', 'AllowPrefix' => true],
         // Temperature
diff --git a/src/PhpSpreadsheet/Calculation/TextData/Format.php b/src/PhpSpreadsheet/Calculation/TextData/Format.php
index bec11496..03e75d1d 100644
--- a/src/PhpSpreadsheet/Calculation/TextData/Format.php
+++ b/src/PhpSpreadsheet/Calculation/TextData/Format.php
@@ -4,11 +4,13 @@ namespace PhpOffice\PhpSpreadsheet\Calculation\TextData;
 
 use DateTimeInterface;
 use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Calculation\DateTimeExcel;
 use PhpOffice\PhpSpreadsheet\Calculation\Exception as CalcExp;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Calculation\MathTrig;
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
@@ -208,6 +210,38 @@ class Format
         return (float) $value;
     }
 
+    /**
+     * TEXT.
+     *
+     * @param mixed $value The value to format
+     *                         Or can be an array of values
+     * @param mixed $format
+     *
+     * @return array|string
+     *         If an array of values is passed for either of the arguments, then the returned result
+     *            will also be an array with matching dimensions
+     */
+    public static function valueToText($value, $format = false)
+    {
+        if (is_array($value) || is_array($format)) {
+            return self::evaluateArrayArguments([self::class, __FUNCTION__], $value, $format);
+        }
+
+        $format = (bool) $format;
+
+        if (is_object($value) && $value instanceof RichText) {
+            $value = $value->getPlainText();
+        }
+        if (is_string($value)) {
+            $value = ($format === true) ? Calculation::wrapResult($value) : $value;
+            $value = str_replace("\n", '', $value);
+        } elseif (is_bool($value)) {
+            $value = Calculation::$localeBoolean[$value === true ? 'TRUE' : 'FALSE'];
+        }
+
+        return (string) $value;
+    }
+
     /**
      * @param mixed $decimalSeparator
      */
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ValueToTextTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ValueToTextTest.php
new file mode 100644
index 00000000..574d4f56
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ValueToTextTest.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\TextData;
+
+class ValueToTextTest extends AllSetupTeardown
+{
+    /**
+     * @dataProvider providerVALUE
+     *
+     * @param mixed $expectedResult
+     * @param mixed $value
+     * @param mixed $format
+     */
+    public function testVALUETOTEXT($expectedResult, $value, $format): void
+    {
+        $sheet = $this->getSheet();
+        $this->setCell('A1', $value);
+        $sheet->getCell('B1')->setValue("=VALUETOTEXT(A1, {$format})");
+
+        $result = $sheet->getCell('B1')->getCalculatedValue();
+        self::assertSame($expectedResult, $result);
+    }
+
+    public function providerVALUE(): array
+    {
+        return require 'tests/data/Calculation/TextData/VALUETOTEXT.php';
+    }
+}
diff --git a/tests/data/Calculation/TextData/VALUETOTEXT.php b/tests/data/Calculation/TextData/VALUETOTEXT.php
new file mode 100644
index 00000000..13df19ab
--- /dev/null
+++ b/tests/data/Calculation/TextData/VALUETOTEXT.php
@@ -0,0 +1,27 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\RichText\RichText;
+
+$richText1 = new RichText();
+$richText1->createTextRun('Hello');
+$richText1->createText(' World');
+
+$richText2 = new RichText();
+$richText2->createTextRun('Hello');
+$richText2->createText("\nWorld");
+
+return [
+    ['1', 1, 0],
+    ['1.23', 1.23, 0],
+    ['-123.456', -123.456, 0],
+    ['TRUE', true, 0],
+    ['FALSE', false, 0],
+    ['Hello World', 'Hello World', 0],
+    ['HelloWorld', "Hello\nWorld", 0],
+    ['"Hello World"', 'Hello World', 1],
+    ['"HelloWorld"', "Hello\nWorld", 1],
+    ['Hello World', $richText1, 0],
+    ['HelloWorld', $richText2, 0],
+    ['"Hello World"', $richText1, 1],
+    ['"HelloWorld"', $richText2, 1],
+];

From 389ca80e00e833031e1c6ff2adff5c9de08668c8 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Sat, 27 Aug 2022 22:59:35 -0700
Subject: [PATCH 40/69] Additional Properties for Trendlines (#3028)

Fix #3011. Some properties for Trendlines were omitted in the original request for this feature. Also, the trendlines sample spreadsheet included two charts. The rendering script 35_Chart_render handles this, but overlays the first output file with the second. It is changed to produce files with different names.
---
 .../33_Chart_create_scatter5_trendlines.php   |   2 +-
 samples/Chart/35_Chart_render.php             |   3 +
 .../32readwriteScatterChartTrendlines1.xlsx   | Bin 15275 -> 15334 bytes
 src/PhpSpreadsheet/Chart/TrendLine.php        | 108 +++++++++++++++++-
 src/PhpSpreadsheet/Reader/Xlsx/Chart.php      |  20 +++-
 src/PhpSpreadsheet/Writer/Xlsx/Chart.php      |  24 ++++
 .../Chart/TrendLineTest.php                   |  12 ++
 7 files changed, 163 insertions(+), 6 deletions(-)

diff --git a/samples/Chart/33_Chart_create_scatter5_trendlines.php b/samples/Chart/33_Chart_create_scatter5_trendlines.php
index a640f735..5beb82cd 100644
--- a/samples/Chart/33_Chart_create_scatter5_trendlines.php
+++ b/samples/Chart/33_Chart_create_scatter5_trendlines.php
@@ -193,7 +193,7 @@ $dataSeriesValues = [
 // 3- moving Avg (period=2) single-arrow trendline, w=1.5, same color as marker fill; no dispRSqr, no dispEq
 $trendLines = [
     new TrendLine(TrendLine::TRENDLINE_LINEAR, null, null, false, false),
-    new TrendLine(TrendLine::TRENDLINE_POLYNOMIAL, 3, null, true, true),
+    new TrendLine(TrendLine::TRENDLINE_POLYNOMIAL, 3, null, true, true, 20.0, 28.0, 44104.5, 'metric3 polynomial fit'),
     new TrendLine(TrendLine::TRENDLINE_MOVING_AVG, null, 2, true),
 ];
 $dataSeriesValues[0]->setTrendLines($trendLines);
diff --git a/samples/Chart/35_Chart_render.php b/samples/Chart/35_Chart_render.php
index 2376008c..891cd27c 100644
--- a/samples/Chart/35_Chart_render.php
+++ b/samples/Chart/35_Chart_render.php
@@ -73,6 +73,9 @@ foreach ($inputFileNames as $inputFileName) {
                 $helper->log('    ' . $chartName . ' - ' . $caption);
 
                 $jpegFile = $helper->getFilename('35-' . $inputFileNameShort, 'png');
+                if ($i !== 0) {
+                    $jpegFile = substr($jpegFile, 0, -3) . "$i.png";
+                }
                 if (file_exists($jpegFile)) {
                     unlink($jpegFile);
                 }
diff --git a/samples/templates/32readwriteScatterChartTrendlines1.xlsx b/samples/templates/32readwriteScatterChartTrendlines1.xlsx
index f48366fe0a3705bfaa1c91671a26c72b054b72e1..c8411d4daf83f0d6095c3d8721efaa54423bc5cb 100644
GIT binary patch
delta 3291
zcmV<13?%cbcjkAn0S5_Qj)8(b0{{RllL`kUf3Ybc4Jw@yQnX6#RIOS25~*^)30A>o
zwrNsL`|mpgNt<PwvJNFSw$GoxyZg?Zf7(=~^URdyQpAXyVB|27$()N-jK0lM_Y67O
zP?6J83KpXmrqQR1j~~w0QavrCd~yIl=ol5o)RE`utY8(@C$eS&R+ds#)WA@!JY6eB
ze{)?hW~$QjF%G?oa)CO8NF9SAmrI_psmz*+3DbcnR#F4>b-`=BMXR!7;3}$~n%d1|
zRRhF=m)yLxpvbAR=xQaTqKgvT-jIQ_QSb}lPcSt8_9R$3II7~Al3Fg!2|#-t=>z`>
z_6XSv!R9aq#~}rtV$a;>aK}o8?_?G3f3U(=FoORZjexXTtwa#KccKk;+<bI#zT_pl
z@1*O{y8c2do2e2xCDrCK=Z57m8p2Sn+3Q4r9M#m5hL^DF4+4LPyo;TjZ<Pb;XC2n8
z;QFE0xitb!j7!6mpoS$<7?5D^(*Me>#ZC$d;&#5W?+sTBY6_$UZbD15h%WRke>H{E
zs4_-LG+%KuH;Re8<br8`u4z@5OwSF29{B0`8-dcpYWN3<(#$&Vf%hH5?)~>j08tff
zWq50p1MgSUYe>Z%eTKw9`t!bSuORZ|^igCgB9A|kWSn3!@ZDjG12-7q#2t}g=q5vg
z)8Ql?<8b&BoKazvN!pmA&$)$;e^CGlK3KY;o9zn0QN#0B8b5IVxVHbT*{=Px4%^%9
zp0l-nRfioqn+Gm(xsH)btfpV~hwFCnf#;?GCr5z~Cf(d;##aR}Cb*rXnc>fDMi($+
zUGOc>813<!cKlL!T-)sN^WG3_Z&e`L_Ks*PVM+~!%iG?!ZNNeIkv&0Of91sb_ty3<
zqXvZSBn4IG%_g|zcANZG1>2J{T4uIbpli`b1p6av!8Ybvo3;nBa`0#}IGf<pk?#g6
zN!@^qusfNAfjgL{r-LDxCYOWMCfI&RqK!pdzVm)K^V;2vng$BU)=oQ)Y@7D8yUArY
z(MM~q9-^;P>q@`-Z-#g9E}<;hk;du$k%q~ao7v5gw%3=l$A|P-<MGX8I_~YgKSsxc
z1VV*x)97tK^cTOAFd!APX9`#y3Z)=rjQ|G#0GSk%PaqYO-X{oubK5oyf8X8y2ThlU
z?ZLKWOa8jpJAcHx-O@D|r+wJ<g_dYr3neNP<=E@>e;+_nvSi0?+H3ugh$ILC_yHim
z>)-b=vvyQu5l=?8+jMM;CIJtlWHYkgJuDi1+sY(KLc(}LNA`hc_V44Lf4UBa!IlWQ
zOi4g3V3K6RU}SH9rA&vdRu*h&OtL0VX##6&E@C2KC^oH7kY`{XvsT-2x-G@THVnu&
zFo;Q%6#K<%_Ve{R3h0~%c}x?jr4W=62^Pq<QJNLp0=FyLXB^`w5Io~+*$jBx(##5_
zfSK#JO0C9Vq>xDJ4jj+g5jL_NyM>dCBpW?Jlg7KHo)kQPPeK~bxJUqw3Vj?5Crnb2
z0IL~KBuH)S6~D^jF%ge>+5mA=P;wQqNFJ2h_V^lj&$b-wVcpZGJQ6e;*@5dFP2hd4
z0i0f|-)b9NL0Q)uX7a$OR>*bQsBNn}SBbD7jIBuUh_<N^m!!va+<0mX+@;(IKV&2s
zRUdo&E23b3JH95v6%P-00!}7FmdPawqy{O@q;~@Ug>-$dXj<izniqG%Lc~UPi53~k
z@dM4IwG4;^Xsj8=g4M93ph?K0gk}~vy%kdl5_C}aoMzX+Sc39o2z>Dn_*;kwA5uxo
zAs87sRPe{8LMxI>{(yryWmM9z=2j`=av~_vE_UF5xm4bkX&IG>%EEfAjG*^tG3Rpo
z2K<By?TkAj4l~Yp%@F|{3X%uIDBRZ$<{|_eR6Shll1Xt-*SKRno)bxaxtd?OsI!`b
z)fs_Af$OQ9f%{A2BwB`4T5u2s4N~mJ#+bN&r!1GEG0|fRK6;>zEbW;YbXkHJCwvhx
zh8_rijsP>bLlFc+3=^$hc8FITvLZ$-;0Mq%szu78|BNH|%!J{daTbNh8V||DW;J8R
zAPe|8D(>OP8kv@;z7z8%E%%ZjfMEAj#MCyQN)Kur#V>tOfnBO^J&){e$46_P2%@s}
zD^4ZDEhXVi5?b<*!d;L_N|@Z*$T_B=Z7~XecL;u|*peh-M`9ube^#VyQ>Q$KqSW94
z&e1qvOcCRpVU(r!%cr`>;pENJN!S$8s1ibTkdT-b4rQgB9TFZ#grPsEB}_y$%ej8P
z=fBc)oi76hAzg@b)Dh*-ZdC~=#S9{bi)SKCytn(B40C2>*4!=;ToEFm5I)L-UC(oW
zoTjgL)J^9eCkxY=sZzSz6}U7QC65=e#GD2f`HY8v{vQ<XDZ-#U;5i(38zql4G*=u(
zU!kAkP@Omf<HXVf=haTCZ-^6j{;qx(^Bq(xlikMTBq}0apzunQ8d!d`N%!wb0o6&;
zom{ntSCgwjnRx-tGV>lG9UtKLp%KS_9~xn(XiK!uQnYcv(-iG_?x0ss(3snG9(PS1
z_q=xhB2l{}>h$`TICV-QujgDM@=7AV+rC7EA&u9G=XL#yMBS38=XEY|>Xk(Oj(>JX
z9W9O-CXb6dssQb95xhBqH~%ttCLF&Fx3=3<_ww;xJ%_E|ZC<ocfm(NPnWg}L&ACic
zK-Tq}&Y=49zJ%Z4Gr|?{`TpgT3-tUmJ{m6*E_Lt<&~*7!tAFTT-eypq1Vi|;auJQ}
zkF!pv@62Xi!=HC=8lE$lHKsS6cH^ekp0@|Rj^CNhK2@5JuWmiOO4Z#R=1KIF(?3nJ
z`snCir{OI8LBnfL`i;Iboi?U_eRt6v^!@40V)98{TuNqD8Wmb#m846f5VCou>WVFY
zzNH(ecK@Q)VihQ11-!Xt4xF12`8V9UXY)%cUYx(fOROjfO%6pq(|omJbXitny0(H&
zs}POs3#DDx@jCsk-_@DAzTkPjr%Nl4`J_aK;Y3yA7kR-BC`mSG3N9jlkW=-KTDdq%
z-jKbqWrZ+QHG9nfWPis^ueZ`dzHrl4^YV+=EmnX3a`6xak66U(6B6jxHA|4^@}h)I
zV7XF^1VDe_dLwqa*~HZPXw1@P&~f1!v^lEAz_#QcD$F(<)hc<mViUGW^jsiK83(g(
z*XxWHb&9T%AwBXpIg`<U?T&$5^@6U%1x|elpo)CoA0VcU@+}?a=lV#9m7H3?UOoQy
z9s0x9*J-BE`!SAltmv@SI`&v+4poWH&p4D?no{{psd1u}9+((2-T(*HT40r)R5Pr;
zN*6C2@VwQ=CR{%TeCff!5>mbATzEKuym&_hf%k;dr-QQZ*C&C0%&e3XrGFn~Zxd!x
zYNbG*!V|<}HZcLWA*uF8%!qT$d~f010J6?Wyx_BhD&7Qi1xqR=<SdoHv6G`>0ewFe
z>XjfR8w$x|6D66of-=4d?T&>iHhZ=O4{PebEEe>39Cd8y3XqE)l)T`uJhdvhab%}l
zNI@cLP)qAFfhCRwFN)*;0h2Kx6q86g5VO%P%>o6lQ|qypv!gL20e^&&TTk3D5QX0>
z^*=;@&pH>{g0&l@Qt<>T61!@}o3V#ocjJrfp&|bs$Jq@Vgv66IbB;e9&v<$HqTB30
z_@Jy=k#bRx42-Z+neB>f*4Ozt$pUgCd20=<NDqNrHebIig=4~cxbxP5M+G5^Boml$
zE3!j$jM5->pm|tChkuFUll7WoEd7=`F7|v2v?_}4R0DF!k<$T~yNO5+NGT?yd-iPt
zNI{_m4F&@(7bSi3B6uA>ypWU=r&idz_@+bLQ??YNIJsYfnv7l7ExJ0zi1|zU_x9#K
zJvCQmn3Vw1ETv$mu!Ux0(kZih=Yh+x1HdJn<iQx8AOC^CCV#c3A_^kjK<gu8Z)|6>
ztFcbLqc&_}4}E9743RLaB0@qCUO9~W9r?3HbhkX<ZCv=10{OFVes^H98&Hp$n?!r3
z$GmBdV>XakoD3W1cvSw>SHITRq^XLk%8MU)U9QWTon5f<;$etByFW~7Z0JLXPl@Mw
zb+)c5_N`!bbreE80-E$WIl|WZejJIISF?}XyaKaPG+qM<UXFo+Jp%v$ER(o5P61t$
z2RKIor;|@OMFOS}lTbJnldCu{0YsDAI6wjDlN>oZ0os#SIY9!n9h1x*8k6=p5R*k9
z5DNeR0000000000JColzCmW?8WsLv_005a3000yK000000000000000wUZ$_K?3J4
zlg}<CliE5ElbJdi0_880%`YXB+Bzx$>XQXKBO9+%>#>&s000F8000pH0000000000
Z00000#FIliJ^_-Gf;%GyU^f5&004C^C3^q>

delta 3230
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
Q0auf~J0k`qHvj+t0D=4oYybcN

diff --git a/src/PhpSpreadsheet/Chart/TrendLine.php b/src/PhpSpreadsheet/Chart/TrendLine.php
index e177f819..75a5896c 100644
--- a/src/PhpSpreadsheet/Chart/TrendLine.php
+++ b/src/PhpSpreadsheet/Chart/TrendLine.php
@@ -34,13 +34,44 @@ class TrendLine extends Properties
     /** @var bool */
     private $dispEq = false;
 
+    /** @var string */
+    private $name = '';
+
+    /** @var float */
+    private $backward = 0.0;
+
+    /** @var float */
+    private $forward = 0.0;
+
+    /** @var float */
+    private $intercept = 0.0;
+
     /**
      * Create a new TrendLine object.
      */
-    public function __construct(string $trendLineType = '', ?int $order = null, ?int $period = null, bool $dispRSqr = false, bool $dispEq = false)
-    {
+    public function __construct(
+        string $trendLineType = '',
+        ?int $order = null,
+        ?int $period = null,
+        bool $dispRSqr = false,
+        bool $dispEq = false,
+        ?float $backward = null,
+        ?float $forward = null,
+        ?float $intercept = null,
+        ?string $name = null
+    ) {
         parent::__construct();
-        $this->setTrendLineProperties($trendLineType, $order, $period, $dispRSqr, $dispEq);
+        $this->setTrendLineProperties(
+            $trendLineType,
+            $order,
+            $period,
+            $dispRSqr,
+            $dispEq,
+            $backward,
+            $forward,
+            $intercept,
+            $name
+        );
     }
 
     public function getTrendLineType(): string
@@ -103,8 +134,65 @@ class TrendLine extends Properties
         return $this;
     }
 
-    public function setTrendLineProperties(?string $trendLineType = null, ?int $order = 0, ?int $period = 0, ?bool $dispRSqr = false, ?bool $dispEq = false): self
+    public function getName(): string
     {
+        return $this->name;
+    }
+
+    public function setName(string $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    public function getBackward(): float
+    {
+        return $this->backward;
+    }
+
+    public function setBackward(float $backward): self
+    {
+        $this->backward = $backward;
+
+        return $this;
+    }
+
+    public function getForward(): float
+    {
+        return $this->forward;
+    }
+
+    public function setForward(float $forward): self
+    {
+        $this->forward = $forward;
+
+        return $this;
+    }
+
+    public function getIntercept(): float
+    {
+        return $this->intercept;
+    }
+
+    public function setIntercept(float $intercept): self
+    {
+        $this->intercept = $intercept;
+
+        return $this;
+    }
+
+    public function setTrendLineProperties(
+        ?string $trendLineType = null,
+        ?int $order = 0,
+        ?int $period = 0,
+        ?bool $dispRSqr = false,
+        ?bool $dispEq = false,
+        ?float $backward = null,
+        ?float $forward = null,
+        ?float $intercept = null,
+        ?string $name = null
+    ): self {
         if (!empty($trendLineType)) {
             $this->setTrendLineType($trendLineType);
         }
@@ -120,6 +208,18 @@ class TrendLine extends Properties
         if ($dispEq !== null) {
             $this->setDispEq($dispEq);
         }
+        if ($backward !== null) {
+            $this->setBackward($backward);
+        }
+        if ($forward !== null) {
+            $this->setForward($forward);
+        }
+        if ($intercept !== null) {
+            $this->setIntercept($intercept);
+        }
+        if ($name !== null) {
+            $this->setName($name);
+        }
 
         return $this;
     }
diff --git a/src/PhpSpreadsheet/Reader/Xlsx/Chart.php b/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
index 76316db9..9eb30256 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
@@ -531,7 +531,25 @@ class Chart
                                 $order = self::getAttribute($seriesDetail->order, 'val', 'integer');
                                 /** @var ?int */
                                 $period = self::getAttribute($seriesDetail->period, 'val', 'integer');
-                                $trendLine->setTrendLineProperties($trendLineType, $order, $period, $dispRSqr, $dispEq);
+                                /** @var ?float */
+                                $forward = self::getAttribute($seriesDetail->forward, 'val', 'float');
+                                /** @var ?float */
+                                $backward = self::getAttribute($seriesDetail->backward, 'val', 'float');
+                                /** @var ?float */
+                                $intercept = self::getAttribute($seriesDetail->intercept, 'val', 'float');
+                                /** @var ?string */
+                                $name = (string) $seriesDetail->name;
+                                $trendLine->setTrendLineProperties(
+                                    $trendLineType,
+                                    $order,
+                                    $period,
+                                    $dispRSqr,
+                                    $dispEq,
+                                    $backward,
+                                    $forward,
+                                    $intercept,
+                                    $name
+                                );
                                 $trendLines[] = $trendLine;
 
                                 break;
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Chart.php b/src/PhpSpreadsheet/Writer/Xlsx/Chart.php
index 48f7d255..8dab9529 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/Chart.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/Chart.php
@@ -1158,10 +1158,19 @@ class Chart extends WriterPart
                     $period = $trendLine->getPeriod();
                     $dispRSqr = $trendLine->getDispRSqr();
                     $dispEq = $trendLine->getDispEq();
+                    $forward = $trendLine->getForward();
+                    $backward = $trendLine->getBackward();
+                    $intercept = $trendLine->getIntercept();
+                    $name = $trendLine->getName();
                     $trendLineColor = $trendLine->getLineColor(); // ChartColor
                     $trendLineWidth = $trendLine->getLineStyleProperty('width');
 
                     $objWriter->startElement('c:trendline'); // N.B. lowercase 'ell'
+                    if ($name !== '') {
+                        $objWriter->startElement('c:name');
+                        $objWriter->writeRawData($name);
+                        $objWriter->endElement(); // c:name
+                    }
                     $objWriter->startElement('c:spPr');
 
                     if (!$trendLineColor->isUsable()) {
@@ -1181,6 +1190,21 @@ class Chart extends WriterPart
                     $objWriter->startElement('c:trendlineType'); // N.B lowercase 'ell'
                     $objWriter->writeAttribute('val', $trendLineType);
                     $objWriter->endElement(); // trendlineType
+                    if ($backward !== 0.0) {
+                        $objWriter->startElement('c:backward');
+                        $objWriter->writeAttribute('val', "$backward");
+                        $objWriter->endElement(); // c:backward
+                    }
+                    if ($forward !== 0.0) {
+                        $objWriter->startElement('c:forward');
+                        $objWriter->writeAttribute('val', "$forward");
+                        $objWriter->endElement(); // c:forward
+                    }
+                    if ($intercept !== 0.0) {
+                        $objWriter->startElement('c:intercept');
+                        $objWriter->writeAttribute('val', "$intercept");
+                        $objWriter->endElement(); // c:intercept
+                    }
                     if ($trendLineType == TrendLine::TRENDLINE_POLYNOMIAL) {
                         $objWriter->startElement('c:order');
                         $objWriter->writeAttribute('val', $order);
diff --git a/tests/PhpSpreadsheetTests/Chart/TrendLineTest.php b/tests/PhpSpreadsheetTests/Chart/TrendLineTest.php
index c8550d83..954a7336 100644
--- a/tests/PhpSpreadsheetTests/Chart/TrendLineTest.php
+++ b/tests/PhpSpreadsheetTests/Chart/TrendLineTest.php
@@ -73,6 +73,10 @@ class TrendLineTest extends AbstractFunctional
         self::assertSame('accent4', $lineColor->getValue());
         self::assertSame('stealth', $trendLine->getLineStyleProperty(['arrow', 'head', 'type']));
         self::assertEquals(0.5, $trendLine->getLineStyleProperty('width'));
+        self::assertSame('', $trendLine->getName());
+        self::assertSame(0.0, $trendLine->getBackward());
+        self::assertSame(0.0, $trendLine->getForward());
+        self::assertSame(0.0, $trendLine->getIntercept());
 
         $trendLine = $trendLines[1];
         self::assertSame('poly', $trendLine->getTrendLineType());
@@ -82,6 +86,10 @@ class TrendLineTest extends AbstractFunctional
         self::assertSame('accent3', $lineColor->getValue());
         self::assertNull($trendLine->getLineStyleProperty(['arrow', 'head', 'type']));
         self::assertEquals(1.25, $trendLine->getLineStyleProperty('width'));
+        self::assertSame('metric3 polynomial', $trendLine->getName());
+        self::assertSame(20.0, $trendLine->getBackward());
+        self::assertSame(28.0, $trendLine->getForward());
+        self::assertSame(14400.5, $trendLine->getIntercept());
 
         $trendLine = $trendLines[2];
         self::assertSame('movingAvg', $trendLine->getTrendLineType());
@@ -91,6 +99,10 @@ class TrendLineTest extends AbstractFunctional
         self::assertSame('accent2', $lineColor->getValue());
         self::assertNull($trendLine->getLineStyleProperty(['arrow', 'head', 'type']));
         self::assertEquals(1.5, $trendLine->getLineStyleProperty('width'));
+        self::assertSame('', $trendLine->getName());
+        self::assertSame(0.0, $trendLine->getBackward());
+        self::assertSame(0.0, $trendLine->getForward());
+        self::assertSame(0.0, $trendLine->getIntercept());
 
         $reloadedSpreadsheet->disconnectWorksheets();
     }

From ca90379dc421c6a05059890961cbc0cde5af40ac Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Sat, 27 Aug 2022 23:15:16 -0700
Subject: [PATCH 41/69] 2 Minor Phpstan-related Fixes (#3030)

For one of the Phpstan upgrades, some message text had changed so drastically that the only practical solution at the time was to move the messages from phpstan-baseline.neon to phpstan.neon.dist. This was not ideal, but it allowed us time to move on and study the errors, which I have now done. At one point, Parser is expecting a variable to be an array, and that was not clear from the code. If not an array, the code will error out (which was Phpstan's concern); I have changed it to throw an exception instead. This satisfies Phpstan, and I can get the message out of neon.dist (without needing to restore it to baseline). Unsurprisingly, the exception was never thrown in the existing test suite, although I added a couple of tests to exercise that code.

In Helper/Dimension, Phpstan flagged a statement inappropriately. I suppressed the message using an annotation and filed a bug report https://github.com/phpstan/phpstan/issues/7563. A fix for the problem was merged yesterday, which is good, but it puts us in a tenuous position. The annotation is needed now, but, when the fix is inevitably pushed to the version we use, the no-longer-needed annotation will trigger a different message. Recode so that neither the current nor the future versions will issue a message, eliminating the annotation in the process.
---
 phpstan.neon.dist                             |  5 --
 src/PhpSpreadsheet/Helper/Dimension.php       | 14 ++++-
 src/PhpSpreadsheet/Writer/Xls/Parser.php      |  7 ++-
 .../Writer/Xls/ParserTest.php                 | 56 +++++++++++++++++++
 4 files changed, 73 insertions(+), 9 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Writer/Xls/ParserTest.php

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 5cac36a1..64b325c6 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -21,8 +21,3 @@ parameters:
         # Accept a bit anything for assert methods
         - '~^Parameter \#2 .* of static method PHPUnit\\Framework\\Assert\:\:assert\w+\(\) expects .*, .* given\.$~'
         - '~^Method PhpOffice\\PhpSpreadsheetTests\\.*\:\:test.*\(\) has parameter \$args with no type specified\.$~'
-
-        # Some issues in Xls/Parser between 1.6.3 and 1.7.7
-        -
-            message: "#^Offset '(left|right|value)' does not exist on (non-empty-array\\|string|array\\|null)\\.$#"
-            path: src/PhpSpreadsheet/Writer/Xls/Parser.php
diff --git a/src/PhpSpreadsheet/Helper/Dimension.php b/src/PhpSpreadsheet/Helper/Dimension.php
index 425c9a61..ff07ce5b 100644
--- a/src/PhpSpreadsheet/Helper/Dimension.php
+++ b/src/PhpSpreadsheet/Helper/Dimension.php
@@ -55,10 +55,20 @@ class Dimension
      */
     protected $unit;
 
+    /**
+     * Phpstan bug has been fixed; this function allows us to
+     * pass Phpstan whether fixed or not.
+     *
+     * @param mixed $value
+     */
+    private static function stanBugFixed($value): array
+    {
+        return is_array($value) ? $value : [null, null];
+    }
+
     public function __construct(string $dimension)
     {
-        // @phpstan-ignore-next-line
-        [$size, $unit] = sscanf($dimension, '%[1234567890.]%s');
+        [$size, $unit] = self::stanBugFixed(sscanf($dimension, '%[1234567890.]%s'));
         $unit = strtolower(trim($unit ?? ''));
         $size = (float) $size;
 
diff --git a/src/PhpSpreadsheet/Writer/Xls/Parser.php b/src/PhpSpreadsheet/Writer/Xls/Parser.php
index ca9b67b5..ca407d2a 100644
--- a/src/PhpSpreadsheet/Writer/Xls/Parser.php
+++ b/src/PhpSpreadsheet/Writer/Xls/Parser.php
@@ -78,7 +78,7 @@ class Parser
     /**
      * The parse tree to be generated.
      *
-     * @var string
+     * @var array|string
      */
     public $parseTree;
 
@@ -1445,6 +1445,9 @@ class Parser
         if (empty($tree)) { // If it's the first call use parseTree
             $tree = $this->parseTree;
         }
+        if (!is_array($tree) || !isset($tree['left'], $tree['right'], $tree['value'])) {
+            throw new WriterException('Unexpected non-array');
+        }
 
         if (is_array($tree['left'])) {
             $converted_tree = $this->toReversePolish($tree['left']);
@@ -1475,7 +1478,7 @@ class Parser
                 $left_tree = '';
             }
 
-            // add it's left subtree and return.
+            // add its left subtree and return.
             return $left_tree . $this->convertFunction($tree['value'], $tree['right']);
         }
         $converted_tree = $this->convert($tree['value']);
diff --git a/tests/PhpSpreadsheetTests/Writer/Xls/ParserTest.php b/tests/PhpSpreadsheetTests/Writer/Xls/ParserTest.php
new file mode 100644
index 00000000..38fd29d3
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Writer/Xls/ParserTest.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Writer\Xls;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Exception as WriterException;
+use PhpOffice\PhpSpreadsheet\Writer\Xls\Parser;
+use PHPUnit\Framework\TestCase;
+
+class ParserTest extends TestCase
+{
+    /** @var ?Spreadsheet */
+    private $spreadsheet;
+
+    protected function tearDown(): void
+    {
+        if ($this->spreadsheet !== null) {
+            $this->spreadsheet->disconnectWorksheets();
+            $this->spreadsheet = null;
+        }
+    }
+
+    public function testNonArray(): void
+    {
+        $this->expectException(WriterException::class);
+        $this->expectExceptionMessage('Unexpected non-array');
+        $this->spreadsheet = new Spreadsheet();
+        $parser = new Parser($this->spreadsheet);
+        $parser->toReversePolish();
+    }
+
+    public function testMissingIndex(): void
+    {
+        $this->expectException(WriterException::class);
+        $this->expectExceptionMessage('Unexpected non-array');
+        $this->spreadsheet = new Spreadsheet();
+        $parser = new Parser($this->spreadsheet);
+        $parser->toReversePolish(['left' => 0]);
+    }
+
+    public function testParseError(): void
+    {
+        $this->expectException(WriterException::class);
+        $this->expectExceptionMessage('Unknown token +');
+        $this->spreadsheet = new Spreadsheet();
+        $parser = new Parser($this->spreadsheet);
+        $parser->toReversePolish(['left' => 1, 'right' => 2, 'value' => '+']);
+    }
+
+    public function testGoodParse(): void
+    {
+        $this->spreadsheet = new Spreadsheet();
+        $parser = new Parser($this->spreadsheet);
+        self::assertSame('1e01001e02001e0300', bin2hex($parser->toReversePolish(['left' => 1, 'right' => 2, 'value' => 3])));
+    }
+}

From 026f699a6503f352d8c359dc3e867bc14f8f5e3b Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Mon, 29 Aug 2022 17:14:03 +0200
Subject: [PATCH 42/69] Minor documentation updates

---
 docs/topics/calculation-engine.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/docs/topics/calculation-engine.md b/docs/topics/calculation-engine.md
index 4fd300e8..7dc838f7 100644
--- a/docs/topics/calculation-engine.md
+++ b/docs/topics/calculation-engine.md
@@ -22,6 +22,13 @@ with PhpSpreadsheet, it evaluates to the value "64":
 
 ![09-command-line-calculation.png](./images/09-command-line-calculation.png)
 
+When writing a formula to a cell, formulae should always be set as they would appear in an English version of Microsoft Office Excel, and PhpSpreadsheet handles all formulae internally in this format. This means that the following rules hold:
+
+ - Decimal separator is `.` (period)
+ - Function argument separator is `,` (comma)
+ - Matrix row separator is `;` (semicolon)
+ - English function names must be used
+
 Another nice feature of PhpSpreadsheet's formula parser, is that it can
 automatically adjust a formula when inserting/removing rows/columns.
 Here's an example:
@@ -43,6 +50,11 @@ inserted 2 new rows), changed to "SUM(E4:E11)". Also, the inserted cells
 duplicate style information of the previous cell, just like Excel's
 behaviour. Note that you can both insert rows and columns.
 
+If you want to "anchor" a specific cell for a formula, then you prefix the column and/or the row with a `$` symbol, exactly as you would in MS Excel itself.
+So if a formula contains "SUM(E$4:E9)", and you insert 2 new rows after row 1, the formula will be adjusted to read "SUM(E$4:E11)", with the `$` fixing row 4 as the start of the range.
+
+
+
 ## Calculation Cache
 
 Once the Calculation engine has evaluated the formula in a cell, the result

From 9eb5e7e976d1fa59742008ce39c704a334355ac4 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Mon, 29 Aug 2022 22:15:50 -0700
Subject: [PATCH 43/69] Phpstan Baseline < 4000 Lines Part 1 (#3023)

A lot of easily fixed problems throughout Writer/Xlsx/*, mostly supplying int rather than string as input to WriteAttribute/WriteElement. There are, in fact, so many opportunities, that I will split it over 2 or 3 PRs. But this first one will get Phpstan baseline down to the goal on its own.

Some of the other problems are also easily fixed. In particular, the docBlocks in Style/ConditionalFormatting/ConditionalDataBar do not allow for null values, and should.
---
 phpstan-baseline.neon                         | 91 -------------------
 .../ConditionalDataBar.php                    | 21 ++---
 src/PhpSpreadsheet/Writer/Xlsx/Comments.php   |  6 +-
 src/PhpSpreadsheet/Writer/Xlsx/DocProps.php   |  6 +-
 src/PhpSpreadsheet/Writer/Xlsx/Workbook.php   | 14 +--
 src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php  | 78 ++++++++--------
 .../ConditionalFormattingDataBarXlsxTest.php  | 24 +++--
 7 files changed, 71 insertions(+), 169 deletions(-)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 7c0070d7..f78c4fae 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -3810,31 +3810,11 @@ parameters:
 			count: 1
 			path: src/PhpSpreadsheet/Writer/Xlsx.php
 
-		-
-			message: "#^Parameter \\#1 \\$string of function substr expects string, int given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Comments.php
-
-		-
-			message: "#^Parameter \\#2 \\$content of method XMLWriter\\:\\:writeElement\\(\\) expects string\\|null, int given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xlsx/Comments.php
-
 		-
 			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
 			count: 1
 			path: src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php
 
-		-
-			message: "#^Parameter \\#2 \\$content of method XMLWriter\\:\\:writeElement\\(\\) expects string\\|null, int given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/DocProps.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xlsx/DocProps.php
-
 		-
 			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Rels\\:\\:writeUnparsedRelationship\\(\\) has parameter \\$relationship with no type specified\\.$#"
 			count: 1
@@ -3999,74 +3979,3 @@ parameters:
 			message: "#^Result of \\|\\| is always true\\.$#"
 			count: 1
 			path: src/PhpSpreadsheet/Writer/Xlsx/Style.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int given\\.$#"
-			count: 7
-			path: src/PhpSpreadsheet/Writer/Xlsx/Workbook.php
-
-		-
-			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
-
-		-
-			message: "#^If condition is always true\\.$#"
-			count: 6
-			path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Worksheet\\:\\:writeAttributeIf\\(\\) has parameter \\$condition with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Worksheet\\:\\:writeDataBarElements\\(\\) has parameter \\$dataBar with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Worksheet\\:\\:writeElementIf\\(\\) has parameter \\$condition with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
-
-		-
-			message: "#^Parameter \\#2 \\$content of method XMLWriter\\:\\:writeElement\\(\\) expects string\\|null, int\\|string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int given\\.$#"
-			count: 15
-			path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int\\<0, max\\> given\\.$#"
-			count: 3
-			path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int\\<1, max\\> given\\.$#"
-			count: 9
-			path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
-
-		-
-			message: "#^Parameter \\#3 \\$stringTable of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Worksheet\\:\\:writeSheetData\\(\\) expects array\\<string\\>, array\\<string\\>\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
-
-		-
-			message: "#^Parameter \\#4 \\$val of static method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Worksheet\\:\\:writeAttributeIf\\(\\) expects string, int given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
-
diff --git a/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBar.php b/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBar.php
index 54513670..f7a2eee1 100644
--- a/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBar.php
+++ b/src/PhpSpreadsheet/Style/ConditionalFormatting/ConditionalDataBar.php
@@ -11,10 +11,10 @@ class ConditionalDataBar
 
     /** <dataBar> children */
 
-    /** @var ConditionalFormatValueObject */
+    /** @var ?ConditionalFormatValueObject */
     private $minimumConditionalFormatValueObject;
 
-    /** @var ConditionalFormatValueObject */
+    /** @var ?ConditionalFormatValueObject */
     private $maximumConditionalFormatValueObject;
 
     /** @var string */
@@ -22,7 +22,7 @@ class ConditionalDataBar
 
     /** <extLst> */
 
-    /** @var ConditionalFormattingRuleExtension */
+    /** @var ?ConditionalFormattingRuleExtension */
     private $conditionalFormattingRuleExt;
 
     /**
@@ -43,10 +43,7 @@ class ConditionalDataBar
         return $this;
     }
 
-    /**
-     * @return ConditionalFormatValueObject
-     */
-    public function getMinimumConditionalFormatValueObject()
+    public function getMinimumConditionalFormatValueObject(): ?ConditionalFormatValueObject
     {
         return $this->minimumConditionalFormatValueObject;
     }
@@ -58,10 +55,7 @@ class ConditionalDataBar
         return $this;
     }
 
-    /**
-     * @return ConditionalFormatValueObject
-     */
-    public function getMaximumConditionalFormatValueObject()
+    public function getMaximumConditionalFormatValueObject(): ?ConditionalFormatValueObject
     {
         return $this->maximumConditionalFormatValueObject;
     }
@@ -85,10 +79,7 @@ class ConditionalDataBar
         return $this;
     }
 
-    /**
-     * @return ConditionalFormattingRuleExtension
-     */
-    public function getConditionalFormattingRuleExt()
+    public function getConditionalFormattingRuleExt(): ?ConditionalFormattingRuleExtension
     {
         return $this->conditionalFormattingRuleExt;
     }
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Comments.php b/src/PhpSpreadsheet/Writer/Xlsx/Comments.php
index ea0f1faa..5045e8f3 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/Comments.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/Comments.php
@@ -165,7 +165,7 @@ class Comments extends WriterPart
         // Metadata
         [$column, $row] = Coordinate::indexesFromString($cellReference);
         $id = 1024 + $column + $row;
-        $id = substr($id, 0, 4);
+        $id = substr("$id", 0, 4);
 
         // v:shape
         $objWriter->startElement('v:shape');
@@ -223,10 +223,10 @@ class Comments extends WriterPart
         $objWriter->writeElement('x:AutoFill', 'False');
 
         // x:Row
-        $objWriter->writeElement('x:Row', ($row - 1));
+        $objWriter->writeElement('x:Row', (string) ($row - 1));
 
         // x:Column
-        $objWriter->writeElement('x:Column', ($column - 1));
+        $objWriter->writeElement('x:Column', (string) ($column - 1));
 
         $objWriter->endElement();
 
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/DocProps.php b/src/PhpSpreadsheet/Writer/Xlsx/DocProps.php
index 43ce442f..cb8758c2 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/DocProps.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/DocProps.php
@@ -56,7 +56,7 @@ class DocProps extends WriterPart
 
         // Variant
         $objWriter->startElement('vt:variant');
-        $objWriter->writeElement('vt:i4', $spreadsheet->getSheetCount());
+        $objWriter->writeElement('vt:i4', (string) $spreadsheet->getSheetCount());
         $objWriter->endElement();
 
         $objWriter->endElement();
@@ -68,7 +68,7 @@ class DocProps extends WriterPart
 
         // Vector
         $objWriter->startElement('vt:vector');
-        $objWriter->writeAttribute('size', $spreadsheet->getSheetCount());
+        $objWriter->writeAttribute('size', (string) $spreadsheet->getSheetCount());
         $objWriter->writeAttribute('baseType', 'lpstr');
 
         $sheetCount = $spreadsheet->getSheetCount();
@@ -207,7 +207,7 @@ class DocProps extends WriterPart
 
             $objWriter->startElement('property');
             $objWriter->writeAttribute('fmtid', '{D5CDD505-2E9C-101B-9397-08002B2CF9AE}');
-            $objWriter->writeAttribute('pid', $key + 2);
+            $objWriter->writeAttribute('pid', (string) ($key + 2));
             $objWriter->writeAttribute('name', $customProperty);
 
             switch ($propertyType) {
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php b/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php
index f9d7197d..7d08388d 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php
@@ -104,14 +104,14 @@ class Workbook extends WriterPart
         // workbookView
         $objWriter->startElement('workbookView');
 
-        $objWriter->writeAttribute('activeTab', $spreadsheet->getActiveSheetIndex());
+        $objWriter->writeAttribute('activeTab', (string) $spreadsheet->getActiveSheetIndex());
         $objWriter->writeAttribute('autoFilterDateGrouping', ($spreadsheet->getAutoFilterDateGrouping() ? 'true' : 'false'));
-        $objWriter->writeAttribute('firstSheet', $spreadsheet->getFirstSheetIndex());
+        $objWriter->writeAttribute('firstSheet', (string) $spreadsheet->getFirstSheetIndex());
         $objWriter->writeAttribute('minimized', ($spreadsheet->getMinimized() ? 'true' : 'false'));
         $objWriter->writeAttribute('showHorizontalScroll', ($spreadsheet->getShowHorizontalScroll() ? 'true' : 'false'));
         $objWriter->writeAttribute('showSheetTabs', ($spreadsheet->getShowSheetTabs() ? 'true' : 'false'));
         $objWriter->writeAttribute('showVerticalScroll', ($spreadsheet->getShowVerticalScroll() ? 'true' : 'false'));
-        $objWriter->writeAttribute('tabRatio', $spreadsheet->getTabRatio());
+        $objWriter->writeAttribute('tabRatio', (string) $spreadsheet->getTabRatio());
         $objWriter->writeAttribute('visibility', $spreadsheet->getVisibility());
 
         $objWriter->endElement();
@@ -157,9 +157,9 @@ class Workbook extends WriterPart
         $objWriter->writeAttribute('calcId', '999999');
         $objWriter->writeAttribute('calcMode', 'auto');
         //    fullCalcOnLoad isn't needed if we've recalculating for the save
-        $objWriter->writeAttribute('calcCompleted', ($recalcRequired) ? 1 : 0);
-        $objWriter->writeAttribute('fullCalcOnLoad', ($recalcRequired) ? 0 : 1);
-        $objWriter->writeAttribute('forceFullCalc', ($recalcRequired) ? 0 : 1);
+        $objWriter->writeAttribute('calcCompleted', ($recalcRequired) ? '1' : '0');
+        $objWriter->writeAttribute('fullCalcOnLoad', ($recalcRequired) ? '0' : '1');
+        $objWriter->writeAttribute('forceFullCalc', ($recalcRequired) ? '0' : '1');
 
         $objWriter->endElement();
     }
@@ -200,7 +200,7 @@ class Workbook extends WriterPart
             // Write sheet
             $objWriter->startElement('sheet');
             $objWriter->writeAttribute('name', $worksheetName);
-            $objWriter->writeAttribute('sheetId', $worksheetId);
+            $objWriter->writeAttribute('sheetId', (string) $worksheetId);
             if ($sheetState !== 'visible' && $sheetState != '') {
                 $objWriter->writeAttribute('state', $sheetState);
             }
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php b/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
index 4b0cb632..5680281f 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
@@ -28,7 +28,7 @@ class Worksheet extends WriterPart
      *
      * @return string XML Output
      */
-    public function writeWorksheet(PhpspreadsheetWorksheet $worksheet, $stringTable = null, $includeCharts = false)
+    public function writeWorksheet(PhpspreadsheetWorksheet $worksheet, $stringTable = [], $includeCharts = false)
     {
         // Create XML writer
         $objWriter = null;
@@ -149,7 +149,7 @@ class Worksheet extends WriterPart
         }
         $autoFilterRange = $worksheet->getAutoFilter()->getRange();
         if (!empty($autoFilterRange)) {
-            $objWriter->writeAttribute('filterMode', 1);
+            $objWriter->writeAttribute('filterMode', '1');
             if (!$worksheet->getAutoFilter()->getEvaluated()) {
                 $worksheet->getAutoFilter()->showHideRows();
             }
@@ -158,7 +158,7 @@ class Worksheet extends WriterPart
         // tabColor
         if ($worksheet->isTabColorSet()) {
             $objWriter->startElement('tabColor');
-            $objWriter->writeAttribute('rgb', $worksheet->getTabColor()->getARGB());
+            $objWriter->writeAttribute('rgb', $worksheet->getTabColor()->getARGB() ?? '');
             $objWriter->endElement();
         }
 
@@ -218,7 +218,7 @@ class Worksheet extends WriterPart
 
         // Show zeros (Excel also writes this attribute only if set to false)
         if ($worksheet->getSheetView()->getShowZeros() === false) {
-            $objWriter->writeAttribute('showZeros', 0);
+            $objWriter->writeAttribute('showZeros', '0');
         }
 
         // View Layout Type
@@ -252,7 +252,7 @@ class Worksheet extends WriterPart
         // Pane
         $pane = '';
         if ($worksheet->getFreezePane()) {
-            [$xSplit, $ySplit] = Coordinate::coordinateFromString($worksheet->getFreezePane() ?? '');
+            [$xSplit, $ySplit] = Coordinate::coordinateFromString($worksheet->getFreezePane());
             $xSplit = Coordinate::columnIndexFromString($xSplit);
             --$xSplit;
             --$ySplit;
@@ -261,7 +261,7 @@ class Worksheet extends WriterPart
             $pane = 'topRight';
             $objWriter->startElement('pane');
             if ($xSplit > 0) {
-                $objWriter->writeAttribute('xSplit', $xSplit);
+                $objWriter->writeAttribute('xSplit', "$xSplit");
             }
             if ($ySplit > 0) {
                 $objWriter->writeAttribute('ySplit', $ySplit);
@@ -334,7 +334,7 @@ class Worksheet extends WriterPart
                 $outlineLevelRow = $dimension->getOutlineLevel();
             }
         }
-        $objWriter->writeAttribute('outlineLevelRow', (int) $outlineLevelRow);
+        $objWriter->writeAttribute('outlineLevelRow', (string) (int) $outlineLevelRow);
 
         // Outline level - column
         $outlineLevelCol = 0;
@@ -343,7 +343,7 @@ class Worksheet extends WriterPart
                 $outlineLevelCol = $dimension->getOutlineLevel();
             }
         }
-        $objWriter->writeAttribute('outlineLevelCol', (int) $outlineLevelCol);
+        $objWriter->writeAttribute('outlineLevelCol', (string) (int) $outlineLevelCol);
 
         $objWriter->endElement();
     }
@@ -363,8 +363,8 @@ class Worksheet extends WriterPart
             foreach ($worksheet->getColumnDimensions() as $colDimension) {
                 // col
                 $objWriter->startElement('col');
-                $objWriter->writeAttribute('min', Coordinate::columnIndexFromString($colDimension->getColumnIndex()));
-                $objWriter->writeAttribute('max', Coordinate::columnIndexFromString($colDimension->getColumnIndex()));
+                $objWriter->writeAttribute('min', (string) Coordinate::columnIndexFromString($colDimension->getColumnIndex()));
+                $objWriter->writeAttribute('max', (string) Coordinate::columnIndexFromString($colDimension->getColumnIndex()));
 
                 if ($colDimension->getWidth() < 0) {
                     // No width set, apply default of 10
@@ -396,11 +396,11 @@ class Worksheet extends WriterPart
 
                 // Outline level
                 if ($colDimension->getOutlineLevel() > 0) {
-                    $objWriter->writeAttribute('outlineLevel', $colDimension->getOutlineLevel());
+                    $objWriter->writeAttribute('outlineLevel', (string) $colDimension->getOutlineLevel());
                 }
 
                 // Style
-                $objWriter->writeAttribute('style', $colDimension->getXfIndex());
+                $objWriter->writeAttribute('style', (string) $colDimension->getXfIndex());
 
                 $objWriter->endElement();
             }
@@ -423,7 +423,7 @@ class Worksheet extends WriterPart
             $objWriter->writeAttribute('algorithmName', $protection->getAlgorithm());
             $objWriter->writeAttribute('hashValue', $protection->getPassword());
             $objWriter->writeAttribute('saltValue', $protection->getSalt());
-            $objWriter->writeAttribute('spinCount', $protection->getSpinCount());
+            $objWriter->writeAttribute('spinCount', (string) $protection->getSpinCount());
         } elseif ($protection->getPassword() !== '') {
             $objWriter->writeAttribute('password', $protection->getPassword());
         }
@@ -447,7 +447,7 @@ class Worksheet extends WriterPart
         $objWriter->endElement();
     }
 
-    private static function writeAttributeIf(XMLWriter $objWriter, $condition, string $attr, string $val): void
+    private static function writeAttributeIf(XMLWriter $objWriter, ?bool $condition, string $attr, string $val): void
     {
         if ($condition) {
             $objWriter->writeAttribute($attr, $val);
@@ -461,7 +461,7 @@ class Worksheet extends WriterPart
         }
     }
 
-    private static function writeElementIf(XMLWriter $objWriter, $condition, string $attr, string $val): void
+    private static function writeElementIf(XMLWriter $objWriter, bool $condition, string $attr, string $val): void
     {
         if ($condition) {
             $objWriter->writeElement($attr, $val);
@@ -568,7 +568,7 @@ class Worksheet extends WriterPart
             $objWriter->writeAttribute($attrKey, $val);
         }
         $minCfvo = $dataBar->getMinimumConditionalFormatValueObject();
-        if ($minCfvo) {
+        if ($minCfvo !== null) {
             $objWriter->startElementNs($prefix, 'cfvo', null);
             $objWriter->writeAttribute('type', $minCfvo->getType());
             if ($minCfvo->getCellFormula()) {
@@ -578,7 +578,7 @@ class Worksheet extends WriterPart
         }
 
         $maxCfvo = $dataBar->getMaximumConditionalFormatValueObject();
-        if ($maxCfvo) {
+        if ($maxCfvo !== null) {
             $objWriter->startElementNs($prefix, 'cfvo', null);
             $objWriter->writeAttribute('type', $maxCfvo->getType());
             if ($maxCfvo->getCellFormula()) {
@@ -600,9 +600,8 @@ class Worksheet extends WriterPart
         $objWriter->endElement(); //end conditionalFormatting
     }
 
-    private static function writeDataBarElements(XMLWriter $objWriter, $dataBar): void
+    private static function writeDataBarElements(XMLWriter $objWriter, ?ConditionalDataBar $dataBar): void
     {
-        /** @var ConditionalDataBar $dataBar */
         if ($dataBar) {
             $objWriter->startElement('dataBar');
             self::writeAttributeIf($objWriter, null !== $dataBar->getShowValue(), 'showValue', $dataBar->getShowValue() ? '1' : '0');
@@ -669,7 +668,7 @@ class Worksheet extends WriterPart
                     'dxfId',
                     (string) $this->getParentWriter()->getStylesConditionalHashTable()->getIndexForHashCode($conditional->getHashCode())
                 );
-                $objWriter->writeAttribute('priority', $id++);
+                $objWriter->writeAttribute('priority', (string) $id++);
 
                 self::writeAttributeif(
                     $objWriter,
@@ -724,7 +723,7 @@ class Worksheet extends WriterPart
         if (!empty($dataValidationCollection)) {
             $dataValidationCollection = Coordinate::mergeRangesInCollection($dataValidationCollection);
             $objWriter->startElement('dataValidations');
-            $objWriter->writeAttribute('count', count($dataValidationCollection));
+            $objWriter->writeAttribute('count', (string) count($dataValidationCollection));
 
             foreach ($dataValidationCollection as $coordinate => $dv) {
                 $objWriter->startElement('dataValidation');
@@ -922,11 +921,11 @@ class Worksheet extends WriterPart
                     $rules = $column->getRules();
                     if (count($rules) > 0) {
                         $objWriter->startElement('filterColumn');
-                        $objWriter->writeAttribute('colId', $worksheet->getAutoFilter()->getColumnOffset($columnID));
+                        $objWriter->writeAttribute('colId', (string) $worksheet->getAutoFilter()->getColumnOffset($columnID));
 
                         $objWriter->startElement($column->getFilterType());
                         if ($column->getJoin() == Column::AUTOFILTER_COLUMN_JOIN_AND) {
-                            $objWriter->writeAttribute('and', 1);
+                            $objWriter->writeAttribute('and', '1');
                         }
 
                         foreach ($rules as $rule) {
@@ -936,7 +935,7 @@ class Worksheet extends WriterPart
                                 ($rule->getValue() === '')
                             ) {
                                 //    Filter rule for Blanks
-                                $objWriter->writeAttribute('blank', 1);
+                                $objWriter->writeAttribute('blank', '1');
                             } elseif ($rule->getRuleType() === Rule::AUTOFILTER_RULETYPE_DYNAMICFILTER) {
                                 //    Dynamic Filter Rule
                                 $objWriter->writeAttribute('type', $rule->getGrouping());
@@ -1019,24 +1018,24 @@ class Worksheet extends WriterPart
     {
         // pageSetup
         $objWriter->startElement('pageSetup');
-        $objWriter->writeAttribute('paperSize', $worksheet->getPageSetup()->getPaperSize());
+        $objWriter->writeAttribute('paperSize', (string) $worksheet->getPageSetup()->getPaperSize());
         $objWriter->writeAttribute('orientation', $worksheet->getPageSetup()->getOrientation());
 
         if ($worksheet->getPageSetup()->getScale() !== null) {
-            $objWriter->writeAttribute('scale', $worksheet->getPageSetup()->getScale());
+            $objWriter->writeAttribute('scale', (string) $worksheet->getPageSetup()->getScale());
         }
         if ($worksheet->getPageSetup()->getFitToHeight() !== null) {
-            $objWriter->writeAttribute('fitToHeight', $worksheet->getPageSetup()->getFitToHeight());
+            $objWriter->writeAttribute('fitToHeight', (string) $worksheet->getPageSetup()->getFitToHeight());
         } else {
             $objWriter->writeAttribute('fitToHeight', '0');
         }
         if ($worksheet->getPageSetup()->getFitToWidth() !== null) {
-            $objWriter->writeAttribute('fitToWidth', $worksheet->getPageSetup()->getFitToWidth());
+            $objWriter->writeAttribute('fitToWidth', (string) $worksheet->getPageSetup()->getFitToWidth());
         } else {
             $objWriter->writeAttribute('fitToWidth', '0');
         }
         if ($worksheet->getPageSetup()->getFirstPageNumber() !== null) {
-            $objWriter->writeAttribute('firstPageNumber', $worksheet->getPageSetup()->getFirstPageNumber());
+            $objWriter->writeAttribute('firstPageNumber', (string) $worksheet->getPageSetup()->getFirstPageNumber());
             $objWriter->writeAttribute('useFirstPageNumber', '1');
         }
         $objWriter->writeAttribute('pageOrder', $worksheet->getPageSetup()->getPageOrder());
@@ -1089,8 +1088,8 @@ class Worksheet extends WriterPart
         // rowBreaks
         if (!empty($aRowBreaks)) {
             $objWriter->startElement('rowBreaks');
-            $objWriter->writeAttribute('count', count($aRowBreaks));
-            $objWriter->writeAttribute('manualBreakCount', count($aRowBreaks));
+            $objWriter->writeAttribute('count', (string) count($aRowBreaks));
+            $objWriter->writeAttribute('manualBreakCount', (string) count($aRowBreaks));
 
             foreach ($aRowBreaks as $cell) {
                 $coords = Coordinate::coordinateFromString($cell);
@@ -1107,14 +1106,14 @@ class Worksheet extends WriterPart
         // Second, write column breaks
         if (!empty($aColumnBreaks)) {
             $objWriter->startElement('colBreaks');
-            $objWriter->writeAttribute('count', count($aColumnBreaks));
-            $objWriter->writeAttribute('manualBreakCount', count($aColumnBreaks));
+            $objWriter->writeAttribute('count', (string) count($aColumnBreaks));
+            $objWriter->writeAttribute('manualBreakCount', (string) count($aColumnBreaks));
 
             foreach ($aColumnBreaks as $cell) {
                 $coords = Coordinate::coordinateFromString($cell);
 
                 $objWriter->startElement('brk');
-                $objWriter->writeAttribute('id', Coordinate::columnIndexFromString($coords[0]) - 1);
+                $objWriter->writeAttribute('id', (string) (Coordinate::columnIndexFromString($coords[0]) - 1));
                 $objWriter->writeAttribute('man', '1');
                 $objWriter->endElement();
             }
@@ -1166,7 +1165,7 @@ class Worksheet extends WriterPart
                 if ($writeCurrentRow) {
                     // Start a new row
                     $objWriter->startElement('row');
-                    $objWriter->writeAttribute('r', $currentRow);
+                    $objWriter->writeAttribute('r', "$currentRow");
                     $objWriter->writeAttribute('spans', '1:' . $colCount);
 
                     // Row dimensions
@@ -1187,12 +1186,12 @@ class Worksheet extends WriterPart
 
                     // Outline level
                     if ($rowDimension->getOutlineLevel() > 0) {
-                        $objWriter->writeAttribute('outlineLevel', $rowDimension->getOutlineLevel());
+                        $objWriter->writeAttribute('outlineLevel', (string) $rowDimension->getOutlineLevel());
                     }
 
                     // Style
                     if ($rowDimension->getXfIndex() !== null) {
-                        $objWriter->writeAttribute('s', $rowDimension->getXfIndex());
+                        $objWriter->writeAttribute('s', (string) $rowDimension->getXfIndex());
                         $objWriter->writeAttribute('customFormat', '1');
                     }
 
@@ -1263,7 +1262,7 @@ class Worksheet extends WriterPart
                 $cellValue = $cellValue . '.0';
             }
         }
-        $objWriter->writeElement('v', $cellValue);
+        $objWriter->writeElement('v', "$cellValue");
     }
 
     private function writeCellBoolean(XMLWriter $objWriter, string $mappedType, bool $cellValue): void
@@ -1332,7 +1331,7 @@ class Worksheet extends WriterPart
 
         // Sheet styles
         $xfi = $pCell->getXfIndex();
-        self::writeAttributeIf($objWriter, $xfi, 's', $xfi);
+        self::writeAttributeIf($objWriter, (bool) $xfi, 's', "$xfi");
 
         // If cell value is supplied, write cell value
         $cellValue = $pCell->getValue();
@@ -1449,7 +1448,6 @@ class Worksheet extends WriterPart
             /** @var Conditional $conditional */
             foreach ($conditionalStyles as $conditional) {
                 $dataBar = $conditional->getDataBar();
-                // @phpstan-ignore-next-line
                 if ($dataBar && $dataBar->getConditionalFormattingRuleExt()) {
                     $conditionalFormattingRuleExtList[] = $dataBar->getConditionalFormattingRuleExt();
                 }
diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/ConditionalFormattingDataBarXlsxTest.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/ConditionalFormattingDataBarXlsxTest.php
index 4b051dd0..0ec25d8e 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xlsx/ConditionalFormattingDataBarXlsxTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/ConditionalFormattingDataBarXlsxTest.php
@@ -86,8 +86,8 @@ class ConditionalFormattingDataBarXlsxTest extends TestCase
 
         $dataBar = $conditionalRule->getDataBar();
         self::assertNotNull($dataBar);
-        self::assertNotEmpty($dataBar->getMinimumConditionalFormatValueObject());
-        self::assertNotEmpty($dataBar->getMaximumConditionalFormatValueObject());
+        self::assertNotNull($dataBar->getMinimumConditionalFormatValueObject());
+        self::assertNotNull($dataBar->getMaximumConditionalFormatValueObject());
         self::assertEquals('min', $dataBar->getMinimumConditionalFormatValueObject()->getType());
         self::assertEquals('max', $dataBar->getMaximumConditionalFormatValueObject()->getType());
         self::assertEquals(Color::COLOR_GREEN, $dataBar->getColor());
@@ -109,8 +109,8 @@ class ConditionalFormattingDataBarXlsxTest extends TestCase
         self::assertNotEmpty($dataBar);
         self::assertEquals(Conditional::CONDITION_DATABAR, $conditionalRule->getConditionType());
         self::assertNotNull($dataBar);
-        self::assertNotEmpty($dataBar->getMinimumConditionalFormatValueObject());
-        self::assertNotEmpty($dataBar->getMaximumConditionalFormatValueObject());
+        self::assertNotNull($dataBar->getMinimumConditionalFormatValueObject());
+        self::assertNotNull($dataBar->getMaximumConditionalFormatValueObject());
         self::assertEquals('min', $dataBar->getMinimumConditionalFormatValueObject()->getType());
         self::assertEquals('max', $dataBar->getMaximumConditionalFormatValueObject()->getType());
 
@@ -118,6 +118,7 @@ class ConditionalFormattingDataBarXlsxTest extends TestCase
         self::assertNotEmpty($dataBar->getConditionalFormattingRuleExt());
         //ext
         $rule1ext = $dataBar->getConditionalFormattingRuleExt();
+        self::assertNotNull($rule1ext);
         self::assertEquals('{72C64AE0-5CD9-164F-83D1-AB720F263E79}', $rule1ext->getId());
         self::assertEquals('dataBar', $rule1ext->getCfRule());
         self::assertEquals('A3:A23', $rule1ext->getSqref());
@@ -165,8 +166,8 @@ class ConditionalFormattingDataBarXlsxTest extends TestCase
         self::assertNotEmpty($dataBar);
         self::assertEquals(Conditional::CONDITION_DATABAR, $conditionalRule->getConditionType());
         self::assertNotNull($dataBar);
-        self::assertNotEmpty($dataBar->getMinimumConditionalFormatValueObject());
-        self::assertNotEmpty($dataBar->getMaximumConditionalFormatValueObject());
+        self::assertNotNull($dataBar->getMinimumConditionalFormatValueObject());
+        self::assertNotNull($dataBar->getMaximumConditionalFormatValueObject());
         self::assertEquals('num', $dataBar->getMinimumConditionalFormatValueObject()->getType());
         self::assertEquals('num', $dataBar->getMaximumConditionalFormatValueObject()->getType());
         self::assertEquals('-5', $dataBar->getMinimumConditionalFormatValueObject()->getValue());
@@ -175,6 +176,7 @@ class ConditionalFormattingDataBarXlsxTest extends TestCase
         self::assertNotEmpty($dataBar->getConditionalFormattingRuleExt());
         //ext
         $rule1ext = $dataBar->getConditionalFormattingRuleExt();
+        self::assertNotNull($rule1ext);
         self::assertEquals('{98904F60-57F0-DF47-B480-691B20D325E3}', $rule1ext->getId());
         self::assertEquals('dataBar', $rule1ext->getCfRule());
         self::assertEquals('B3:B23', $rule1ext->getSqref());
@@ -224,8 +226,8 @@ class ConditionalFormattingDataBarXlsxTest extends TestCase
         self::assertNotEmpty($dataBar);
         self::assertEquals(Conditional::CONDITION_DATABAR, $conditionalRule->getConditionType());
         self::assertNotNull($dataBar);
-        self::assertNotEmpty($dataBar->getMinimumConditionalFormatValueObject());
-        self::assertNotEmpty($dataBar->getMaximumConditionalFormatValueObject());
+        self::assertNotNull($dataBar->getMinimumConditionalFormatValueObject());
+        self::assertNotNull($dataBar->getMaximumConditionalFormatValueObject());
         self::assertEquals('min', $dataBar->getMinimumConditionalFormatValueObject()->getType());
         self::assertEquals('max', $dataBar->getMaximumConditionalFormatValueObject()->getType());
         self::assertEmpty($dataBar->getMinimumConditionalFormatValueObject()->getValue());
@@ -235,6 +237,7 @@ class ConditionalFormattingDataBarXlsxTest extends TestCase
 
         //ext
         $rule1ext = $dataBar->getConditionalFormattingRuleExt();
+        self::assertNotNull($rule1ext);
         self::assertEquals('{453C04BA-7ABD-8548-8A17-D9CFD2BDABE9}', $rule1ext->getId());
         self::assertEquals('dataBar', $rule1ext->getCfRule());
         self::assertEquals('C3:C23', $rule1ext->getSqref());
@@ -286,8 +289,8 @@ class ConditionalFormattingDataBarXlsxTest extends TestCase
 
         self::assertNotNull($dataBar);
         self::assertTrue($dataBar->getShowValue());
-        self::assertNotEmpty($dataBar->getMinimumConditionalFormatValueObject());
-        self::assertNotEmpty($dataBar->getMaximumConditionalFormatValueObject());
+        self::assertNotNull($dataBar->getMinimumConditionalFormatValueObject());
+        self::assertNotNull($dataBar->getMaximumConditionalFormatValueObject());
         self::assertEquals('formula', $dataBar->getMinimumConditionalFormatValueObject()->getType());
         self::assertEquals('formula', $dataBar->getMaximumConditionalFormatValueObject()->getType());
         self::assertEquals('3+2', $dataBar->getMinimumConditionalFormatValueObject()->getValue());
@@ -297,6 +300,7 @@ class ConditionalFormattingDataBarXlsxTest extends TestCase
 
         //ext
         $rule1ext = $dataBar->getConditionalFormattingRuleExt();
+        self::assertNotNull($rule1ext);
         self::assertEquals('{6C1E066A-E240-3D4A-98F8-8CC218B0DFD2}', $rule1ext->getId());
         self::assertEquals('dataBar', $rule1ext->getCfRule());
         self::assertEquals('D3:D23', $rule1ext->getSqref());

From 4f8aa806bc8b95e9d2633e91aeb0a822f12eb89a Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Tue, 30 Aug 2022 22:34:20 -0700
Subject: [PATCH 44/69] Phpstan Baseline < 4000 Lines Part 2 Html (#3037)

Continue to reduce the size of Phpstan Baseline by fixing problems reported for Writer/Html.
---
 phpstan-baseline.neon              | 310 -----------------------------
 phpstan.neon.dist                  |   2 +-
 src/PhpSpreadsheet/Writer/Html.php | 102 +++++-----
 3 files changed, 54 insertions(+), 360 deletions(-)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index f78c4fae..cfaed694 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -3155,316 +3155,6 @@ parameters:
 			count: 2
 			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
 
-		-
-			message: "#^Call to function array_key_exists\\(\\) with int and array\\{none\\: 'none', dashDot\\: '1px dashed', dashDotDot\\: '1px dotted', dashed\\: '1px dashed', dotted\\: '1px dotted', double\\: '3px double', hair\\: '1px solid', medium\\: '2px solid', \\.\\.\\.\\} will always evaluate to false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Cannot access offset 'mime' on array\\|false\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Cannot access offset 0 on array\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Cannot access offset 1 on array\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Cannot call method getSubscript\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Cannot call method getSuperscript\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:calculateSpansOmitRows\\(\\) has parameter \\$candidateSpannedRow with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:calculateSpansOmitRows\\(\\) has parameter \\$sheet with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:calculateSpansOmitRows\\(\\) has parameter \\$sheetIndex with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateHTMLFooter\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateMeta\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateMeta\\(\\) has parameter \\$desc with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateMeta\\(\\) has parameter \\$val with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowCellCss\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowCellCss\\(\\) has parameter \\$cellAddress with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowCellCss\\(\\) has parameter \\$columnNumber with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowCellCss\\(\\) has parameter \\$row with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowCellData\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowCellData\\(\\) has parameter \\$cell with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowCellData\\(\\) has parameter \\$cellType with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowCellData\\(\\) has parameter \\$cssClass with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowCellDataValue\\(\\) has parameter \\$cell with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowCellDataValue\\(\\) has parameter \\$cellData with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowCellDataValueRich\\(\\) has parameter \\$cell with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowCellDataValueRich\\(\\) has parameter \\$cellData with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowIncludeCharts\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowIncludeCharts\\(\\) has parameter \\$coordinate with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowSpans\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowSpans\\(\\) has parameter \\$colSpan with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowSpans\\(\\) has parameter \\$html with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowSpans\\(\\) has parameter \\$rowSpan with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowWriteCell\\(\\) has parameter \\$cellData with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowWriteCell\\(\\) has parameter \\$cellType with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowWriteCell\\(\\) has parameter \\$colNum with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowWriteCell\\(\\) has parameter \\$colSpan with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowWriteCell\\(\\) has parameter \\$coordinate with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowWriteCell\\(\\) has parameter \\$cssClass with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowWriteCell\\(\\) has parameter \\$html with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowWriteCell\\(\\) has parameter \\$row with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowWriteCell\\(\\) has parameter \\$rowSpan with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateRowWriteCell\\(\\) has parameter \\$sheetIndex with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateSheetPrep\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateSheetStarts\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateSheetStarts\\(\\) has parameter \\$rowMin with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateSheetStarts\\(\\) has parameter \\$sheet with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateSheetTags\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateSheetTags\\(\\) has parameter \\$row with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateSheetTags\\(\\) has parameter \\$tbodyStart with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateSheetTags\\(\\) has parameter \\$theadEnd with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateSheetTags\\(\\) has parameter \\$theadStart with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateTableFooter\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateTableTag\\(\\) has parameter \\$html with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateTableTag\\(\\) has parameter \\$id with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateTableTag\\(\\) has parameter \\$sheetIndex with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateTableTagInline\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:generateTableTagInline\\(\\) has parameter \\$id with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Parameter \\#1 \\$borderStyle of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:mapBorderStyle\\(\\) expects int, string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Parameter \\#1 \\$font of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:createCSSStyleFont\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font, PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Parameter \\#1 \\$hAlign of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:mapHAlign\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Parameter \\#1 \\$vAlign of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Html\\:\\:mapVAlign\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Parameter \\#2 \\$length of function fread expects int\\<0, max\\>, int\\<0, max\\>\\|false given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
-		-
-			message: "#^Parameter \\#3 \\$use_include_path of function fopen expects bool, int given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Html.php
-
 		-
 			message: "#^Negated boolean expression is always false\\.$#"
 			count: 1
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 64b325c6..30bd6c2f 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -16,7 +16,7 @@ parameters:
         processTimeout: 300.0
     checkMissingIterableValueType: false
     ignoreErrors:
-        - '~^Parameter \#1 \$im(age)? of function (imagedestroy|imageistruecolor|imagealphablending|imagesavealpha|imagecolortransparent|imagecolorsforindex|imagesavealpha|imagesx|imagesy) expects (GdImage|resource), GdImage\|resource given\.$~'
+        - '~^Parameter \#1 \$im(age)? of function (imagedestroy|imageistruecolor|imagealphablending|imagesavealpha|imagecolortransparent|imagecolorsforindex|imagesavealpha|imagesx|imagesy|imagepng) expects (GdImage|resource), GdImage\|resource given\.$~'
         - '~^Parameter \#2 \$src_im(age)? of function imagecopy expects (GdImage|resource), GdImage\|resource given\.$~'
         # Accept a bit anything for assert methods
         - '~^Parameter \#2 .* of static method PHPUnit\\Framework\\Assert\:\:assert\w+\(\) expects .*, .* given\.$~'
diff --git a/src/PhpSpreadsheet/Writer/Html.php b/src/PhpSpreadsheet/Writer/Html.php
index 68e200f5..6a400673 100644
--- a/src/PhpSpreadsheet/Writer/Html.php
+++ b/src/PhpSpreadsheet/Writer/Html.php
@@ -287,7 +287,7 @@ class Html extends BaseWriter
     /**
      * Map border style.
      *
-     * @param int $borderStyle Sheet index
+     * @param int|string $borderStyle Sheet index
      *
      * @return string
      */
@@ -354,7 +354,7 @@ class Html extends BaseWriter
         return $this;
     }
 
-    private static function generateMeta($val, $desc)
+    private static function generateMeta(?string $val, string $desc): string
     {
         return $val
             ? ('      <meta name="' . $desc . '" content="' . htmlspecialchars($val, Settings::htmlEntityFlags()) . '" />' . PHP_EOL)
@@ -398,7 +398,7 @@ class Html extends BaseWriter
         return $html;
     }
 
-    private function generateSheetPrep()
+    private function generateSheetPrep(): array
     {
         // Ensure that Spans have been calculated?
         $this->calculateSpans();
@@ -413,7 +413,7 @@ class Html extends BaseWriter
         return $sheets;
     }
 
-    private function generateSheetStarts($sheet, $rowMin)
+    private function generateSheetStarts(Worksheet $sheet, int $rowMin): array
     {
         // calculate start of <tbody>, <thead>
         $tbodyStart = $rowMin;
@@ -432,7 +432,7 @@ class Html extends BaseWriter
         return [$theadStart, $theadEnd, $tbodyStart];
     }
 
-    private function generateSheetTags($row, $theadStart, $theadEnd, $tbodyStart)
+    private function generateSheetTags(int $row, int $theadStart, int $theadEnd, int $tbodyStart): array
     {
         // <thead> ?
         $startTag = ($row == $theadStart) ? ('        <thead>' . PHP_EOL) : '';
@@ -682,7 +682,7 @@ class Html extends BaseWriter
                 if ($this->embedImages || substr($imageData, 0, 6) === 'zip://') {
                     $picture = @file_get_contents($filename);
                     if ($picture !== false) {
-                        $imageDetails = getimagesize($filename);
+                        $imageDetails = getimagesize($filename) ?: [];
                         // base64 encode the binary data
                         $base64 = base64_encode($picture);
                         $imageData = 'data:' . $imageDetails['mime'] . ';base64,' . $base64;
@@ -697,12 +697,10 @@ class Html extends BaseWriter
                 $imageResource = $drawing->getImageResource();
                 if ($imageResource) {
                     ob_start(); //  Let's start output buffering.
-                    // @phpstan-ignore-next-line
                     imagepng($imageResource); //  This will normally output the image, but because of ob_start(), it won't.
-                    $contents = ob_get_contents(); //  Instead, output above is saved to $contents
+                    $contents = (string) ob_get_contents(); //  Instead, output above is saved to $contents
                     ob_end_clean(); //  End the output buffer.
 
-                    /** @phpstan-ignore-next-line */
                     $dataUri = 'data:image/png;base64,' . base64_encode($contents);
 
                     //  Because of the nature of tables, width is more important than height.
@@ -738,21 +736,18 @@ class Html extends BaseWriter
                     }
 
                     $html .= PHP_EOL;
-                    $imageDetails = getimagesize($chartFileName);
+                    $imageDetails = getimagesize($chartFileName) ?: [];
                     $filedesc = $chart->getTitle();
                     $filedesc = $filedesc ? $filedesc->getCaptionText() : '';
                     $filedesc = $filedesc ? htmlspecialchars($filedesc, ENT_QUOTES) : 'Embedded chart';
-                    if ($fp = fopen($chartFileName, 'rb', 0)) {
-                        $picture = fread($fp, filesize($chartFileName));
-                        fclose($fp);
-                        /** @phpstan-ignore-next-line */
+                    $picture = file_get_contents($chartFileName);
+                    if ($picture !== false) {
                         $base64 = base64_encode($picture);
                         $imageData = 'data:' . $imageDetails['mime'] . ';base64,' . $base64;
 
                         $html .= '<img style="position: absolute; z-index: 1; left: ' . $chartCoordinates['xOffset'] . 'px; top: ' . $chartCoordinates['yOffset'] . 'px; width: ' . $imageDetails[0] . 'px; height: ' . $imageDetails[1] . 'px;" src="' . $imageData . '" alt="' . $filedesc . '" />' . PHP_EOL;
-
-                        unlink($chartFileName);
                     }
+                    unlink($chartFileName);
                 }
             }
         }
@@ -993,8 +988,8 @@ class Html extends BaseWriter
         $css = [];
 
         // Create CSS
-        $css['vertical-align'] = $this->mapVAlign($alignment->getVertical());
-        $textAlign = $this->mapHAlign($alignment->getHorizontal());
+        $css['vertical-align'] = $this->mapVAlign($alignment->getVertical() ?? '');
+        $textAlign = $this->mapHAlign($alignment->getHorizontal() ?? '');
         if ($textAlign) {
             $css['text-align'] = $textAlign;
             if (in_array($textAlign, ['left', 'right'])) {
@@ -1070,10 +1065,8 @@ class Html extends BaseWriter
      * Create CSS style.
      *
      * @param Border $border Border
-     *
-     * @return string
      */
-    private function createCSSStyleBorder(Border $border)
+    private function createCSSStyleBorder(Border $border): string
     {
         //    Create CSS - add !important to non-none border styles for merged cells
         $borderStyle = $this->mapBorderStyle($border->getBorderStyle());
@@ -1095,7 +1088,8 @@ class Html extends BaseWriter
 
         // Create CSS
         if ($fill->getFillType() !== Fill::FILL_NONE) {
-            $value = '#' . $fill->getStartColor()->getRGB();
+            $value = $fill->getFillType() == Fill::FILL_NONE ?
+                'white' : '#' . $fill->getStartColor()->getRGB();
             $css['background-color'] = $value;
         }
 
@@ -1105,7 +1099,7 @@ class Html extends BaseWriter
     /**
      * Generate HTML footer.
      */
-    public function generateHTMLFooter()
+    public function generateHTMLFooter(): string
     {
         // Construct HTML
         $html = '';
@@ -1115,7 +1109,7 @@ class Html extends BaseWriter
         return $html;
     }
 
-    private function generateTableTagInline(Worksheet $worksheet, $id)
+    private function generateTableTagInline(Worksheet $worksheet, string $id): string
     {
         $style = isset($this->cssStyles['table']) ?
             $this->assembleCSS($this->cssStyles['table']) : '';
@@ -1135,7 +1129,7 @@ class Html extends BaseWriter
         return $html;
     }
 
-    private function generateTableTag(Worksheet $worksheet, $id, &$html, $sheetIndex): void
+    private function generateTableTag(Worksheet $worksheet, string $id, string &$html, int $sheetIndex): void
     {
         if (!$this->useInlineCss) {
             $gridlines = $worksheet->getShowGridlines() ? ' gridlines' : '';
@@ -1188,7 +1182,7 @@ class Html extends BaseWriter
     /**
      * Generate table footer.
      */
-    private function generateTableFooter()
+    private function generateTableFooter(): string
     {
         return '    </tbody></table>' . PHP_EOL . '</div>' . PHP_EOL;
     }
@@ -1234,7 +1228,7 @@ class Html extends BaseWriter
         return $html;
     }
 
-    private function generateRowCellCss(Worksheet $worksheet, $cellAddress, $row, $columnNumber)
+    private function generateRowCellCss(Worksheet $worksheet, string $cellAddress, int $row, int $columnNumber): array
     {
         $cell = ($cellAddress > '') ? $worksheet->getCellCollection()->get($cellAddress) : '';
         $coordinate = Coordinate::stringFromColumnIndex($columnNumber + 1) . ($row + 1);
@@ -1260,22 +1254,24 @@ class Html extends BaseWriter
         return [$cell, $cssClass, $coordinate];
     }
 
-    private function generateRowCellDataValueRich($cell, &$cellData): void
+    private function generateRowCellDataValueRich(Cell $cell, string &$cellData): void
     {
         // Loop through rich text elements
         $elements = $cell->getValue()->getRichTextElements();
         foreach ($elements as $element) {
             // Rich text start?
             if ($element instanceof Run) {
-                $cellData .= '<span style="' . $this->assembleCSS($this->createCSSStyleFont($element->getFont())) . '">';
-
                 $cellEnd = '';
-                if ($element->getFont()->getSuperscript()) {
-                    $cellData .= '<sup>';
-                    $cellEnd = '</sup>';
-                } elseif ($element->getFont()->getSubscript()) {
-                    $cellData .= '<sub>';
-                    $cellEnd = '</sub>';
+                if ($element->getFont() !== null) {
+                    $cellData .= '<span style="' . $this->assembleCSS($this->createCSSStyleFont($element->getFont())) . '">';
+
+                    if ($element->getFont()->getSuperscript()) {
+                        $cellData .= '<sup>';
+                        $cellEnd = '</sup>';
+                    } elseif ($element->getFont()->getSubscript()) {
+                        $cellData .= '<sub>';
+                        $cellEnd = '</sub>';
+                    }
                 }
 
                 // Convert UTF8 data to PCDATA
@@ -1293,7 +1289,7 @@ class Html extends BaseWriter
         }
     }
 
-    private function generateRowCellDataValue(Worksheet $worksheet, $cell, &$cellData): void
+    private function generateRowCellDataValue(Worksheet $worksheet, Cell $cell, ?string &$cellData): void
     {
         if ($cell->getValue() instanceof RichText) {
             $this->generateRowCellDataValueRich($cell, $cellData);
@@ -1319,7 +1315,11 @@ class Html extends BaseWriter
         }
     }
 
-    private function generateRowCellData(Worksheet $worksheet, $cell, &$cssClass, $cellType)
+    /**
+     * @param null|Cell|string $cell
+     * @param array|string $cssClass
+     */
+    private function generateRowCellData(Worksheet $worksheet, $cell, &$cssClass, string $cellType): string
     {
         $cellData = '&nbsp;';
         if ($cell instanceof Cell) {
@@ -1339,10 +1339,10 @@ class Html extends BaseWriter
             $cellData = nl2br($cellData);
 
             // Extend CSS class?
-            if (!$this->useInlineCss) {
+            if (!$this->useInlineCss && is_string($cssClass)) {
                 $cssClass .= ' style' . $cell->getXfIndex();
                 $cssClass .= ' ' . $cell->getDataType();
-            } else {
+            } elseif (is_array($cssClass)) {
                 if ($cellType == 'th') {
                     if (isset($this->cssStyles['th.style' . $cell->getXfIndex()])) {
                         $cssClass = array_merge($cssClass, $this->cssStyles['th.style' . $cell->getXfIndex()]);
@@ -1372,12 +1372,12 @@ class Html extends BaseWriter
         return $cellData;
     }
 
-    private function generateRowIncludeCharts(Worksheet $worksheet, $coordinate)
+    private function generateRowIncludeCharts(Worksheet $worksheet, string $coordinate): string
     {
         return $this->includeCharts ? $this->writeChartInCell($worksheet, $coordinate) : '';
     }
 
-    private function generateRowSpans($html, $rowSpan, $colSpan)
+    private function generateRowSpans(string $html, int $rowSpan, int $colSpan): string
     {
         $html .= ($colSpan > 1) ? (' colspan="' . $colSpan . '"') : '';
         $html .= ($rowSpan > 1) ? (' rowspan="' . $rowSpan . '"') : '';
@@ -1385,7 +1385,10 @@ class Html extends BaseWriter
         return $html;
     }
 
-    private function generateRowWriteCell(&$html, Worksheet $worksheet, $coordinate, $cellType, $cellData, $colSpan, $rowSpan, $cssClass, $colNum, $sheetIndex, $row): void
+    /**
+     * @param array|string $cssClass
+     */
+    private function generateRowWriteCell(string &$html, Worksheet $worksheet, string $coordinate, string $cellType, string $cellData, int $colSpan, int $rowSpan, $cssClass, int $colNum, int $sheetIndex, int $row): void
     {
         // Image?
         $htmlx = $this->writeImageInCell($worksheet, $coordinate);
@@ -1393,7 +1396,7 @@ class Html extends BaseWriter
         $htmlx .= $this->generateRowIncludeCharts($worksheet, $coordinate);
         // Column start
         $html .= '            <' . $cellType;
-        if (!$this->useInlineCss && !$this->isPdf) {
+        if (!$this->useInlineCss && !$this->isPdf && is_string($cssClass)) {
             $html .= ' class="' . $cssClass . '"';
             if ($htmlx) {
                 $html .= " style='position: relative;'";
@@ -1403,9 +1406,11 @@ class Html extends BaseWriter
             // We must explicitly write the width of the <td> element because TCPDF
             // does not recognize e.g. <col style="width:42pt">
             if ($this->useInlineCss) {
-                $xcssClass = $cssClass;
+                $xcssClass = is_array($cssClass) ? $cssClass : [];
             } else {
-                $html .= ' class="' . $cssClass . '"';
+                if (is_string($cssClass)) {
+                    $html .= ' class="' . $cssClass . '"';
+                }
                 $xcssClass = [];
             }
             $width = 0;
@@ -1416,8 +1421,7 @@ class Html extends BaseWriter
                     $width += $this->columnWidths[$sheetIndex][$i];
                 }
             }
-            $xcssClass['width'] = $width . 'pt';
-
+            $xcssClass['width'] = (string) $width . 'pt';
             // We must also explicitly write the height of the <td> element because TCPDF
             // does not recognize e.g. <tr style="height:50pt">
             if (isset($this->cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $row]['height'])) {
@@ -1736,7 +1740,7 @@ class Html extends BaseWriter
         $this->spansAreCalculated = true;
     }
 
-    private function calculateSpansOmitRows($sheet, $sheetIndex, $candidateSpannedRow): void
+    private function calculateSpansOmitRows(Worksheet $sheet, int $sheetIndex, array $candidateSpannedRow): void
     {
         // Identify which rows should be omitted in HTML. These are the rows where all the cells
         //   participate in a merge and the where base cells are somewhere above.

From ad2d3df2f7ab48ca9aa7b92cfc2cdc38a4e78cb9 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Sat, 3 Sep 2022 12:58:23 +0200
Subject: [PATCH 45/69] Update Excel function samples for Database functions

---
 samples/Calculations/Database/DAVERAGE.php |  18 +--
 samples/Calculations/Database/DCOUNT.php   |  33 ++---
 samples/Calculations/Database/DCOUNTA.php  |  58 +++++++++
 samples/Calculations/Database/DGET.php     |  24 ++--
 samples/Calculations/Database/DMAX.php     |  16 +--
 samples/Calculations/Database/DMIN.php     |  16 +--
 samples/Calculations/Database/DPRODUCT.php |  24 ++--
 samples/Calculations/Database/DSTDEV.php   |  18 +--
 samples/Calculations/Database/DSTDEVP.php  |  19 +--
 samples/Calculations/Database/DSUM.php     |  58 +++++++++
 samples/Calculations/Database/DVAR.php     |  19 +--
 samples/Calculations/Database/DVARP.php    |  18 +--
 src/PhpSpreadsheet/Helper/Sample.php       |  28 +++++
 src/PhpSpreadsheet/Helper/TextGrid.php     | 139 +++++++++++++++++++++
 14 files changed, 401 insertions(+), 87 deletions(-)
 create mode 100644 samples/Calculations/Database/DCOUNTA.php
 create mode 100644 samples/Calculations/Database/DSUM.php
 create mode 100644 src/PhpSpreadsheet/Helper/TextGrid.php

diff --git a/samples/Calculations/Database/DAVERAGE.php b/samples/Calculations/Database/DAVERAGE.php
index 92d84014..fa388c8b 100644
--- a/samples/Calculations/Database/DAVERAGE.php
+++ b/samples/Calculations/Database/DAVERAGE.php
@@ -4,7 +4,11 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
 require __DIR__ . '/../../Header.php';
 
-$helper->log('Returns the average of selected database entries.');
+$category = 'Database';
+$functionName = 'DAVERAGE';
+$description = 'Returns the average of selected database entries that match criteria';
+
+$helper->titles($category, $functionName, $description);
 
 // Create new PhpSpreadsheet object
 $spreadsheet = new Spreadsheet();
@@ -36,21 +40,19 @@ $worksheet->setCellValue('B13', '=DAVERAGE(A4:E10,3,A1:A3)');
 $helper->log('Database');
 
 $databaseData = $worksheet->rangeToArray('A4:E10', null, true, true, true);
-var_dump($databaseData);
+$helper->displayGrid($databaseData);
 
 // Test the formulae
 $helper->log('Criteria');
 
 $criteriaData = $worksheet->rangeToArray('A1:B2', null, true, true, true);
-var_dump($criteriaData);
+$helper->displayGrid($criteriaData);
 
-$helper->log($worksheet->getCell('A12')->getValue());
-$helper->log('DAVERAGE() Result is ' . $worksheet->getCell('B12')->getCalculatedValue());
+$helper->logCalculationResult($worksheet, $functionName, 'B12', 'A12');
 
 $helper->log('Criteria');
 
 $criteriaData = $worksheet->rangeToArray('A1:A3', null, true, true, true);
-var_dump($criteriaData);
+$helper->displayGrid($criteriaData);
 
-$helper->log($worksheet->getCell('A13')->getValue());
-$helper->log('DAVERAGE() Result is ' . $worksheet->getCell('B13')->getCalculatedValue());
+$helper->logCalculationResult($worksheet, $functionName, 'B13', 'A13');
diff --git a/samples/Calculations/Database/DCOUNT.php b/samples/Calculations/Database/DCOUNT.php
index d869a4bc..68d6be18 100644
--- a/samples/Calculations/Database/DCOUNT.php
+++ b/samples/Calculations/Database/DCOUNT.php
@@ -3,7 +3,12 @@
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
 require __DIR__ . '/../../Header.php';
-$helper->log('Counts the cells that contain numbers in a database.');
+
+$category = 'Database';
+$functionName = 'DCOUNT';
+$description = 'Counts the cells that contain numbers in a set of database records that match criteria';
+
+$helper->titles($category, $functionName, $description);
 
 // Create new PhpSpreadsheet object
 $spreadsheet = new Spreadsheet();
@@ -14,9 +19,9 @@ $database = [['Tree', 'Height', 'Age', 'Yield', 'Profit'],
     ['Apple', 18, 20, 14, 105.00],
     ['Pear', 12, 12, 10, 96.00],
     ['Cherry', 13, 14, 9, 105.00],
-    ['Apple', 14, 15, 10, 75.00],
-    ['Pear', 9, 8, 8, 76.80],
-    ['Apple', 8, 9, 6, 45.00],
+    ['Apple', 14, 'N/A', 10, 75.00],
+    ['Pear', 9, 8, 8, 77.00],
+    ['Apple', 12, 11, 6, 45.00],
 ];
 $criteria = [['Tree', 'Height', 'Age', 'Yield', 'Profit', 'Height'],
     ['="=Apple"', '>10', null, null, null, '<16'],
@@ -26,30 +31,28 @@ $criteria = [['Tree', 'Height', 'Age', 'Yield', 'Profit', 'Height'],
 $worksheet->fromArray($criteria, null, 'A1');
 $worksheet->fromArray($database, null, 'A4');
 
-$worksheet->setCellValue('A12', 'The Number of Apple trees over 10\' in height');
-$worksheet->setCellValue('B12', '=DCOUNT(A4:E10,"Yield",A1:B2)');
+$worksheet->setCellValue('A12', 'The Number of Apple trees between 10\' and 16\' in height whose age is known');
+$worksheet->setCellValue('B12', '=DCOUNT(A4:E10,"Age",A1:F2)');
 
-$worksheet->setCellValue('A13', 'The Number of Apple and Pear trees in the orchard');
+$worksheet->setCellValue('A13', 'The Number of Apple and Pear trees in the orchard with a numeric value in column 3 ("Age")');
 $worksheet->setCellValue('B13', '=DCOUNT(A4:E10,3,A1:A3)');
 
 $helper->log('Database');
 
 $databaseData = $worksheet->rangeToArray('A4:E10', null, true, true, true);
-var_dump($databaseData);
+$helper->displayGrid($databaseData);
 
 // Test the formulae
 $helper->log('Criteria');
 
-$criteriaData = $worksheet->rangeToArray('A1:B2', null, true, true, true);
-var_dump($criteriaData);
+$criteriaData = $worksheet->rangeToArray('A1:F2', null, true, true, true);
+$helper->displayGrid($criteriaData);
 
-$helper->log($worksheet->getCell('A12')->getValue());
-$helper->log('DCOUNT() Result is ' . $worksheet->getCell('B12')->getCalculatedValue());
+$helper->logCalculationResult($worksheet, $functionName, 'B12', 'A12');
 
 $helper->log('Criteria');
 
 $criteriaData = $worksheet->rangeToArray('A1:A3', null, true, true, true);
-var_dump($criteriaData);
+$helper->displayGrid($criteriaData);
 
-$helper->log($worksheet->getCell('A13')->getValue());
-$helper->log('DCOUNT() Result is ' . $worksheet->getCell('B13')->getCalculatedValue());
+$helper->logCalculationResult($worksheet, $functionName, 'B13', 'A13');
diff --git a/samples/Calculations/Database/DCOUNTA.php b/samples/Calculations/Database/DCOUNTA.php
new file mode 100644
index 00000000..3b4cc16e
--- /dev/null
+++ b/samples/Calculations/Database/DCOUNTA.php
@@ -0,0 +1,58 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Database';
+$functionName = 'DCOUNTA';
+$description = 'Counts the cells in a set of database records that match criteria';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$database = [['Tree', 'Height', 'Age', 'Yield', 'Profit'],
+    ['Apple', 18, 20, 14, 105.00],
+    ['Pear', 12, 12, 10, 96.00],
+    ['Cherry', 13, 14, 9, 105.00],
+    ['Apple', 14, 'N/A', 10, 75.00],
+    ['Pear', 9, 8, 8, 77.00],
+    ['Apple', 12, 11, 6, 45.00],
+];
+$criteria = [['Tree', 'Height', 'Age', 'Yield', 'Profit', 'Height'],
+    ['="=Apple"', '>10', null, null, null, '<16'],
+    ['="=Pear"', null, null, null, null, null],
+];
+
+$worksheet->fromArray($criteria, null, 'A1');
+$worksheet->fromArray($database, null, 'A4');
+
+$worksheet->setCellValue('A12', 'The Number of Apple trees between 10\' and 16\' in height');
+$worksheet->setCellValue('B12', '=DCOUNTA(A4:E10,"Age",A1:F2)');
+
+$worksheet->setCellValue('A13', 'The Number of Apple and Pear trees in the orchard');
+$worksheet->setCellValue('B13', '=DCOUNTA(A4:E10,3,A1:A3)');
+
+$helper->log('Database');
+
+$databaseData = $worksheet->rangeToArray('A4:E10', null, true, true, true);
+$helper->displayGrid($databaseData);
+
+// Test the formulae
+$helper->log('Criteria');
+
+$criteriaData = $worksheet->rangeToArray('A1:F2', null, true, true, true);
+$helper->displayGrid($criteriaData);
+
+$helper->logCalculationResult($worksheet, $functionName, 'B12', 'A12');
+
+$helper->log('Criteria');
+
+$criteriaData = $worksheet->rangeToArray('A1:A3', null, true, true, true);
+$helper->displayGrid($criteriaData);
+
+$helper->logCalculationResult($worksheet, $functionName, 'B13', 'A13');
diff --git a/samples/Calculations/Database/DGET.php b/samples/Calculations/Database/DGET.php
index 9f543c91..1b41b777 100644
--- a/samples/Calculations/Database/DGET.php
+++ b/samples/Calculations/Database/DGET.php
@@ -4,7 +4,11 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
 require __DIR__ . '/../../Header.php';
 
-$helper->log('Extracts a single value from a column of a list or database that matches conditions that you specify.');
+$category = 'Database';
+$functionName = 'DGET';
+$description = 'Extracts a single value from a column of a list or database that matches criteria that you specify';
+
+$helper->titles($category, $functionName, $description);
 
 // Create new PhpSpreadsheet object
 $spreadsheet = new Spreadsheet();
@@ -21,7 +25,7 @@ $database = [['Tree', 'Height', 'Age', 'Yield', 'Profit'],
 ];
 $criteria = [['Tree', 'Height', 'Age', 'Yield', 'Profit', 'Height'],
     ['="=Apple"', '>10', null, null, null, '<16'],
-    ['="=Pear"', null, null, null, null, null],
+    ['="=Pear"', '>12', null, null, null, null],
 ];
 
 $worksheet->fromArray($criteria, null, 'A1');
@@ -30,23 +34,25 @@ $worksheet->fromArray($database, null, 'A4');
 $worksheet->setCellValue('A12', 'The height of the Apple tree between 10\' and 16\' tall');
 $worksheet->setCellValue('B12', '=DGET(A4:E10,"Height",A1:F2)');
 
+$worksheet->setCellValue('A13', 'The height of the Apple tree (will return an Excel error, because there is more than one apple tree)');
+$worksheet->setCellValue('B13', '=DGET(A4:E10,"Height",A1:A2)');
+
 $helper->log('Database');
 
 $databaseData = $worksheet->rangeToArray('A4:E10', null, true, true, true);
-var_dump($databaseData);
+$helper->displayGrid($databaseData);
 
 // Test the formulae
 $helper->log('Criteria');
 
-$helper->log('ALL');
+$criteriaData = $worksheet->rangeToArray('A1:F2', null, true, true, true);
+$helper->displayGrid($criteriaData);
 
-$helper->log($worksheet->getCell('A12')->getValue());
-$helper->log('DMAX() Result is ' . $worksheet->getCell('B12')->getCalculatedValue());
+$helper->logCalculationResult($worksheet, $functionName, 'B12', 'A12');
 
 $helper->log('Criteria');
 
 $criteriaData = $worksheet->rangeToArray('A1:A2', null, true, true, true);
-var_dump($criteriaData);
+$helper->displayGrid($criteriaData);
 
-$helper->log($worksheet->getCell('A13')->getValue());
-$helper->log('DMAX() Result is ' . $worksheet->getCell('B13')->getCalculatedValue());
+$helper->logCalculationResult($worksheet, $functionName, 'B13', 'A13');
diff --git a/samples/Calculations/Database/DMAX.php b/samples/Calculations/Database/DMAX.php
index c48928d4..0998904b 100644
--- a/samples/Calculations/Database/DMAX.php
+++ b/samples/Calculations/Database/DMAX.php
@@ -4,7 +4,11 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
 require __DIR__ . '/../../Header.php';
 
-$helper->log('Returns the maximum value from selected database entries.');
+$category = 'Database';
+$functionName = 'DMAX';
+$description = 'Returns the maximum value from selected database entries';
+
+$helper->titles($category, $functionName, $description);
 
 // Create new PhpSpreadsheet object
 $spreadsheet = new Spreadsheet();
@@ -36,20 +40,18 @@ $worksheet->setCellValue('B13', '=DMAX(A4:E10,3,A1:A2)');
 $helper->log('Database');
 
 $databaseData = $worksheet->rangeToArray('A4:E10', null, true, true, true);
-var_dump($databaseData);
+$helper->displayGrid($databaseData);
 
 // Test the formulae
 $helper->log('Criteria');
 
 $helper->log('ALL');
 
-$helper->log($worksheet->getCell('A12')->getValue());
-$helper->log('DMAX() Result is ' . $worksheet->getCell('B12')->getCalculatedValue());
+$helper->logCalculationResult($worksheet, $functionName, 'B12', 'A12');
 
 $helper->log('Criteria');
 
 $criteriaData = $worksheet->rangeToArray('A1:A2', null, true, true, true);
-var_dump($criteriaData);
+$helper->displayGrid($criteriaData);
 
-$helper->log($worksheet->getCell('A13')->getValue());
-$helper->log('DMAX() Result is ' . $worksheet->getCell('B13')->getCalculatedValue());
+$helper->logCalculationResult($worksheet, $functionName, 'B13', 'A13');
diff --git a/samples/Calculations/Database/DMIN.php b/samples/Calculations/Database/DMIN.php
index 7bcaa206..c0e0a8d8 100644
--- a/samples/Calculations/Database/DMIN.php
+++ b/samples/Calculations/Database/DMIN.php
@@ -4,7 +4,11 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
 require __DIR__ . '/../../Header.php';
 
-$helper->log('Returns the minimum value from selected database entries.');
+$category = 'Database';
+$functionName = 'DMIN';
+$description = 'Returns the minimum value from selected database entries';
+
+$helper->titles($category, $functionName, $description);
 
 // Create new PhpSpreadsheet object
 $spreadsheet = new Spreadsheet();
@@ -36,20 +40,18 @@ $worksheet->setCellValue('B13', '=DMIN(A4:E10,3,A1:A2)');
 $helper->log('Database');
 
 $databaseData = $worksheet->rangeToArray('A4:E10', null, true, true, true);
-var_dump($databaseData);
+$helper->displayGrid($databaseData);
 
 // Test the formulae
 $helper->log('Criteria');
 
 $helper->log('ALL');
 
-$helper->log($worksheet->getCell('A12')->getValue());
-$helper->log('DMIN() Result is ' . $worksheet->getCell('B12')->getCalculatedValue());
+$helper->logCalculationResult($worksheet, $functionName, 'B12', 'A12');
 
 $helper->log('Criteria');
 
 $criteriaData = $worksheet->rangeToArray('A1:A2', null, true, true, true);
-var_dump($criteriaData);
+$helper->displayGrid($criteriaData);
 
-$helper->log($worksheet->getCell('A13')->getValue());
-$helper->log('DMIN() Result is ' . $worksheet->getCell('B13')->getCalculatedValue());
+$helper->logCalculationResult($worksheet, $functionName, 'B13', 'A13');
diff --git a/samples/Calculations/Database/DPRODUCT.php b/samples/Calculations/Database/DPRODUCT.php
index 7c14ded6..fa666ffe 100644
--- a/samples/Calculations/Database/DPRODUCT.php
+++ b/samples/Calculations/Database/DPRODUCT.php
@@ -4,7 +4,11 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
 require __DIR__ . '/../../Header.php';
 
-$helper->log('Multiplies the values in a column of a list or database that match conditions that you specify.');
+$category = 'Database';
+$functionName = 'DPRODUCT';
+$description = 'Multiplies the values in a column of a list or database that match conditions that you specify';
+
+$helper->titles($category, $functionName, $description);
 
 // Create new PhpSpreadsheet object
 $spreadsheet = new Spreadsheet();
@@ -16,7 +20,7 @@ $database = [['Tree', 'Height', 'Age', 'Yield', 'Profit'],
     ['Pear', 12, 12, 10, 96.00],
     ['Cherry', 13, 14, 9, 105.00],
     ['Apple', 14, 15, 10, 75.00],
-    ['Pear', 9, 8, 8, 76.80],
+    ['Pear', 9, 8, 8, 77.00],
     ['Apple', 8, 9, 6, 45.00],
 ];
 $criteria = [['Tree', 'Height', 'Age', 'Yield', 'Profit', 'Height'],
@@ -30,23 +34,25 @@ $worksheet->fromArray($database, null, 'A4');
 $worksheet->setCellValue('A12', 'The product of the yields of all Apple trees over 10\' in the orchard');
 $worksheet->setCellValue('B12', '=DPRODUCT(A4:E10,"Yield",A1:B2)');
 
+$worksheet->setCellValue('A13', 'The product of the yields of all Apple trees in the orchard');
+$worksheet->setCellValue('B13', '=DPRODUCT(A4:E10,"Yield",A1:A2)');
+
 $helper->log('Database');
 
 $databaseData = $worksheet->rangeToArray('A4:E10', null, true, true, true);
-var_dump($databaseData);
+$helper->displayGrid($databaseData);
 
 // Test the formulae
 $helper->log('Criteria');
 
-$helper->log('ALL');
+$criteriaData = $worksheet->rangeToArray('A1:B2', null, true, true, true);
+$helper->displayGrid($criteriaData);
 
-$helper->log($worksheet->getCell('A12')->getValue());
-$helper->log('DMAX() Result is ' . $worksheet->getCell('B12')->getCalculatedValue());
+$helper->logCalculationResult($worksheet, $functionName, 'B12', 'A12');
 
 $helper->log('Criteria');
 
 $criteriaData = $worksheet->rangeToArray('A1:A2', null, true, true, true);
-var_dump($criteriaData);
+$helper->displayGrid($criteriaData);
 
-$helper->log($worksheet->getCell('A13')->getValue());
-$helper->log('DMAX() Result is ' . $worksheet->getCell('B13')->getCalculatedValue());
+$helper->logCalculationResult($worksheet, $functionName, 'B13', 'A13');
diff --git a/samples/Calculations/Database/DSTDEV.php b/samples/Calculations/Database/DSTDEV.php
index 7f09fa59..b6499741 100644
--- a/samples/Calculations/Database/DSTDEV.php
+++ b/samples/Calculations/Database/DSTDEV.php
@@ -4,7 +4,11 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
 require __DIR__ . '/../../Header.php';
 
-$helper->log('Estimates the standard deviation based on a sample of selected database entries.');
+$category = 'Database';
+$functionName = 'DSTDEV';
+$description = 'Estimates the standard deviation based on a sample of selected database entries';
+
+$helper->titles($category, $functionName, $description);
 
 // Create new PhpSpreadsheet object
 $spreadsheet = new Spreadsheet();
@@ -36,21 +40,19 @@ $worksheet->setCellValue('B13', '=DSTDEV(A4:E10,2,A1:A3)');
 $helper->log('Database');
 
 $databaseData = $worksheet->rangeToArray('A4:E10', null, true, true, true);
-var_dump($databaseData);
+$helper->displayGrid($databaseData);
 
 // Test the formulae
 $helper->log('Criteria');
 
 $criteriaData = $worksheet->rangeToArray('A1:A3', null, true, true, true);
-var_dump($criteriaData);
+$helper->displayGrid($criteriaData);
 
-$helper->log($worksheet->getCell('A12')->getValue());
-$helper->log('DSTDEV() Result is ' . $worksheet->getCell('B12')->getCalculatedValue());
+$helper->logCalculationResult($worksheet, $functionName, 'B12', 'A12');
 
 $helper->log('Criteria');
 
 $criteriaData = $worksheet->rangeToArray('A1:A3', null, true, true, true);
-var_dump($criteriaData);
+$helper->displayGrid($criteriaData);
 
-$helper->log($worksheet->getCell('A13')->getValue());
-$helper->log('DSTDEV() Result is ' . $worksheet->getCell('B13')->getCalculatedValue());
+$helper->logCalculationResult($worksheet, $functionName, 'B13', 'A13');
diff --git a/samples/Calculations/Database/DSTDEVP.php b/samples/Calculations/Database/DSTDEVP.php
index 9e999a80..d8bcec4b 100644
--- a/samples/Calculations/Database/DSTDEVP.php
+++ b/samples/Calculations/Database/DSTDEVP.php
@@ -3,7 +3,12 @@
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
 require __DIR__ . '/../../Header.php';
-$helper->log('Calculates the standard deviation based on the entire population of selected database entries.');
+
+$category = 'Database';
+$functionName = 'DSTDEVP';
+$description = 'Calculates the standard deviation based on the entire population of selected database entries';
+
+$helper->titles($category, $functionName, $description);
 
 // Create new PhpSpreadsheet object
 $spreadsheet = new Spreadsheet();
@@ -35,21 +40,19 @@ $worksheet->setCellValue('B13', '=DSTDEVP(A4:E10,2,A1:A3)');
 $helper->log('Database');
 
 $databaseData = $worksheet->rangeToArray('A4:E10', null, true, true, true);
-var_dump($databaseData);
+$helper->displayGrid($databaseData);
 
 // Test the formulae
 $helper->log('Criteria');
 
 $criteriaData = $worksheet->rangeToArray('A1:A3', null, true, true, true);
-var_dump($criteriaData);
+$helper->displayGrid($criteriaData);
 
-$helper->log($worksheet->getCell('A12')->getValue());
-$helper->log('DSTDEVP() Result is ' . $worksheet->getCell('B12')->getCalculatedValue());
+$helper->logCalculationResult($worksheet, $functionName, 'B12', 'A12');
 
 $helper->log('Criteria');
 
 $criteriaData = $worksheet->rangeToArray('A1:A3', null, true, true, true);
-var_dump($criteriaData);
+$helper->displayGrid($criteriaData);
 
-$helper->log($worksheet->getCell('A13')->getValue());
-$helper->log('DSTDEVP() Result is ' . $worksheet->getCell('B13')->getCalculatedValue());
+$helper->logCalculationResult($worksheet, $functionName, 'B13', 'A13');
diff --git a/samples/Calculations/Database/DSUM.php b/samples/Calculations/Database/DSUM.php
new file mode 100644
index 00000000..d2d773c9
--- /dev/null
+++ b/samples/Calculations/Database/DSUM.php
@@ -0,0 +1,58 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Database';
+$functionName = 'DSUM';
+$description = 'Returns the sum of selected database entries';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$database = [['Tree', 'Height', 'Age', 'Yield', 'Profit'],
+    ['Apple', 18, 20, 14, 105.00],
+    ['Pear', 12, 12, 10, 96.00],
+    ['Cherry', 13, 14, 9, 105.00],
+    ['Apple', 14, 15, 10, 75.00],
+    ['Pear', 9, 8, 8, 76.80],
+    ['Apple', 8, 9, 6, 45.00],
+];
+$criteria = [['Tree', 'Height', 'Age', 'Yield', 'Profit', 'Height'],
+    ['="=Apple"', '>10', null, null, null, '<16'],
+    ['="=Pear"', null, null, null, null, null],
+];
+
+$worksheet->fromArray($criteria, null, 'A1');
+$worksheet->fromArray($database, null, 'A4');
+
+$worksheet->setCellValue('A12', 'The total profit from apple trees');
+$worksheet->setCellValue('B12', '=DSUM(A4:E10,"Profit",A1:A2)');
+
+$worksheet->setCellValue('A13', 'Total profit from apple trees with a height between 10 and 16 feet, and all pear trees');
+$worksheet->setCellValue('B13', '=DSUM(A4:E10,"Profit",A1:F3)');
+
+$helper->log('Database');
+
+$databaseData = $worksheet->rangeToArray('A4:E10', null, true, true, true);
+$helper->displayGrid($databaseData);
+
+// Test the formulae
+$helper->log('Criteria');
+
+$criteriaData = $worksheet->rangeToArray('A1:A2', null, true, true, true);
+$helper->displayGrid($criteriaData);
+
+$helper->logCalculationResult($worksheet, $functionName, 'B12', 'A12');
+
+$helper->log('Criteria');
+
+$criteriaData = $worksheet->rangeToArray('A1:F3', null, true, true, true);
+$helper->displayGrid($criteriaData);
+
+$helper->logCalculationResult($worksheet, $functionName, 'B13', 'A13');
diff --git a/samples/Calculations/Database/DVAR.php b/samples/Calculations/Database/DVAR.php
index 2a5f8749..4165d076 100644
--- a/samples/Calculations/Database/DVAR.php
+++ b/samples/Calculations/Database/DVAR.php
@@ -3,7 +3,12 @@
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
 require __DIR__ . '/../../Header.php';
-$helper->log('Estimates variance based on a sample from selected database entries.');
+
+$category = 'Database';
+$functionName = 'DVAR';
+$description = 'Estimates variance based on a sample from selected database entries';
+
+$helper->titles($category, $functionName, $description);
 
 // Create new PhpSpreadsheet object
 $spreadsheet = new Spreadsheet();
@@ -35,21 +40,19 @@ $worksheet->setCellValue('B13', '=DVAR(A4:E10,2,A1:A3)');
 $helper->log('Database');
 
 $databaseData = $worksheet->rangeToArray('A4:E10', null, true, true, true);
-var_dump($databaseData);
+$helper->displayGrid($databaseData);
 
 // Test the formulae
 $helper->log('Criteria');
 
 $criteriaData = $worksheet->rangeToArray('A1:A3', null, true, true, true);
-var_dump($criteriaData);
+$helper->displayGrid($criteriaData);
 
-$helper->log($worksheet->getCell('A12')->getValue());
-$helper->log('DVAR() Result is ' . $worksheet->getCell('B12')->getCalculatedValue());
+$helper->logCalculationResult($worksheet, $functionName, 'B12', 'A12');
 
 $helper->log('Criteria');
 
 $criteriaData = $worksheet->rangeToArray('A1:A3', null, true, true, true);
-var_dump($criteriaData);
+$helper->displayGrid($criteriaData);
 
-$helper->log($worksheet->getCell('A13')->getValue());
-$helper->log('DVAR() Result is ' . $worksheet->getCell('B13')->getCalculatedValue());
+$helper->logCalculationResult($worksheet, $functionName, 'B13', 'A13');
diff --git a/samples/Calculations/Database/DVARP.php b/samples/Calculations/Database/DVARP.php
index 4f57113b..5a17415e 100644
--- a/samples/Calculations/Database/DVARP.php
+++ b/samples/Calculations/Database/DVARP.php
@@ -4,7 +4,11 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
 require __DIR__ . '/../../Header.php';
 
-$helper->log('Calculates variance based on the entire population of selected database entries,');
+$category = 'Database';
+$functionName = 'DVARP';
+$description = 'Calculates variance based on the entire population of selected database entries';
+
+$helper->titles($category, $functionName, $description);
 
 // Create new PhpSpreadsheet object
 $spreadsheet = new Spreadsheet();
@@ -36,21 +40,19 @@ $worksheet->setCellValue('B13', '=DVARP(A4:E10,2,A1:A3)');
 $helper->log('Database');
 
 $databaseData = $worksheet->rangeToArray('A4:E10', null, true, true, true);
-var_dump($databaseData);
+$helper->displayGrid($databaseData);
 
 // Test the formulae
 $helper->log('Criteria');
 
 $criteriaData = $worksheet->rangeToArray('A1:A3', null, true, true, true);
-var_dump($criteriaData);
+$helper->displayGrid($criteriaData);
 
-$helper->log($worksheet->getCell('A12')->getValue());
-$helper->log('DVARP() Result is ' . $worksheet->getCell('B12')->getCalculatedValue());
+$helper->logCalculationResult($worksheet, $functionName, 'B12', 'A12');
 
 $helper->log('Criteria');
 
 $criteriaData = $worksheet->rangeToArray('A1:A3', null, true, true, true);
-var_dump($criteriaData);
+$helper->displayGrid($criteriaData);
 
-$helper->log($worksheet->getCell('A13')->getValue());
-$helper->log('DVARP() Result is ' . $worksheet->getCell('B13')->getCalculatedValue());
+$helper->logCalculationResult($worksheet, $functionName, 'B13', 'A13');
diff --git a/src/PhpSpreadsheet/Helper/Sample.php b/src/PhpSpreadsheet/Helper/Sample.php
index 8ce37003..aeb2bea6 100644
--- a/src/PhpSpreadsheet/Helper/Sample.php
+++ b/src/PhpSpreadsheet/Helper/Sample.php
@@ -4,6 +4,7 @@ namespace PhpOffice\PhpSpreadsheet\Helper;
 
 use PhpOffice\PhpSpreadsheet\IOFactory;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use PhpOffice\PhpSpreadsheet\Writer\IWriter;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
@@ -182,6 +183,33 @@ class Sample
         echo date('H:i:s ') . $message . $eol;
     }
 
+    public function titles(string $category, string $functionName, ?string $description = null): void
+    {
+        $this->log(sprintf('%s Functions:', $category));
+        $description === null
+            ? $this->log(sprintf('%s()', rtrim($functionName, '()')))
+            : $this->log(sprintf('%s() - %s.', rtrim($functionName, '()'), rtrim($description, '.')));
+    }
+
+    public function displayGrid(array $matrix): void
+    {
+        $renderer = new TextGrid($matrix, $this->isCli());
+        echo $renderer->render();
+    }
+
+    public function logCalculationResult(
+        Worksheet $worksheet,
+        string $functionName,
+        string $formulaCell,
+        ?string $descriptionCell = null
+    ): void {
+        if ($descriptionCell !== null) {
+            $this->log($worksheet->getCell($descriptionCell)->getValue());
+        }
+        $this->log($worksheet->getCell($formulaCell)->getValue());
+        $this->log(sprintf('%s() Result is ', $functionName) . $worksheet->getCell($formulaCell)->getCalculatedValue());
+    }
+
     /**
      * Log ending notes.
      */
diff --git a/src/PhpSpreadsheet/Helper/TextGrid.php b/src/PhpSpreadsheet/Helper/TextGrid.php
new file mode 100644
index 00000000..acb9ae60
--- /dev/null
+++ b/src/PhpSpreadsheet/Helper/TextGrid.php
@@ -0,0 +1,139 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Helper;
+
+class TextGrid
+{
+    /**
+     * @var bool
+     */
+    private $isCli = true;
+
+    /**
+     * @var array
+     */
+    protected $matrix;
+
+    /**
+     * @var array
+     */
+    protected $rows;
+
+    /**
+     * @var array
+     */
+    protected $columns;
+
+    /**
+     * @var string
+     */
+    private $gridDisplay;
+
+    public function __construct(array $matrix, bool $isCli = true)
+    {
+        $this->rows = array_keys($matrix);
+        $this->columns = array_keys($matrix[$this->rows[0]]);
+
+        $matrix = array_values($matrix);
+        array_walk(
+            $matrix,
+            function (&$row): void {
+                $row = array_values($row);
+            }
+        );
+
+        $this->matrix = $matrix;
+        $this->isCli = $isCli;
+    }
+
+    public function render(): string
+    {
+        $this->gridDisplay = $this->isCli ? '' : '<code>';
+
+        $maxRow = max($this->rows);
+        $maxRowLength = strlen((string) $maxRow) + 1;
+        $columnWidths = $this->getColumnWidths($this->matrix);
+
+        $this->renderColumnHeader($maxRowLength, $columnWidths);
+        $this->renderRows($maxRowLength, $columnWidths);
+        $this->renderFooter($maxRowLength, $columnWidths);
+
+        $this->gridDisplay .= $this->isCli ? '' : '</code>';
+
+        return $this->gridDisplay;
+    }
+
+    private function renderRows(int $maxRowLength, array $columnWidths): void
+    {
+        foreach ($this->matrix as $row => $rowData) {
+            $this->gridDisplay .= '|' . str_pad((string) $this->rows[$row], $maxRowLength, ' ', STR_PAD_LEFT) . ' ';
+            $this->renderCells($rowData, $columnWidths);
+            $this->gridDisplay .= '|' . PHP_EOL;
+        }
+    }
+
+    private function renderCells(array $rowData, array $columnWidths): void
+    {
+        foreach ($rowData as $column => $cell) {
+            $cell = ($this->isCli) ? (string) $cell : htmlentities((string) $cell);
+            $this->gridDisplay .= '| ';
+            $this->gridDisplay .= str_pad($cell, $columnWidths[$column] + 1, ' ');
+        }
+    }
+
+    private function renderColumnHeader(int $maxRowLength, array $columnWidths): void
+    {
+        $this->gridDisplay .= str_repeat(' ', $maxRowLength + 2);
+        foreach ($this->columns as $column => $reference) {
+            $this->gridDisplay .= '+-' . str_repeat('-', $columnWidths[$column] + 1);
+        }
+        $this->gridDisplay .= '+' . PHP_EOL;
+
+        $this->gridDisplay .= str_repeat(' ', $maxRowLength + 2);
+        foreach ($this->columns as $column => $reference) {
+            $this->gridDisplay .= '| ' . str_pad((string) $reference, $columnWidths[$column] + 1, ' ');
+        }
+        $this->gridDisplay .= '|' . PHP_EOL;
+
+        $this->renderFooter($maxRowLength, $columnWidths);
+    }
+
+    private function renderFooter(int $maxRowLength, array $columnWidths): void
+    {
+        $this->gridDisplay .= '+' . str_repeat('-', $maxRowLength + 1);
+        foreach ($this->columns as $column => $reference) {
+            $this->gridDisplay .= '+-';
+            $this->gridDisplay .= str_pad((string) '', $columnWidths[$column] + 1, '-');
+        }
+        $this->gridDisplay .= '+' . PHP_EOL;
+    }
+
+    private function getColumnWidths(array $matrix): array
+    {
+        $columnCount = count($this->matrix, COUNT_RECURSIVE) / count($this->matrix);
+        $columnWidths = [];
+        for ($column = 0; $column < $columnCount; ++$column) {
+            $columnWidths[] = $this->getColumnWidth(array_column($this->matrix, $column));
+        }
+
+        return $columnWidths;
+    }
+
+    private function getColumnWidth(array $columnData): int
+    {
+        $columnWidth = 0;
+        $columnData = array_values($columnData);
+
+        foreach ($columnData as $columnValue) {
+            if (is_string($columnValue)) {
+                $columnWidth = max($columnWidth, strlen($columnValue));
+            } elseif (is_bool($columnValue)) {
+                $columnWidth = max($columnWidth, strlen($columnValue ? 'TRUE' : 'FALSE'));
+            }
+
+            $columnWidth = max($columnWidth, strlen((string) $columnWidth));
+        }
+
+        return $columnWidth;
+    }
+}

From 5f33ec0eeafed69bc19e1d0c25b1995650964979 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Sat, 3 Sep 2022 19:00:01 -0700
Subject: [PATCH 46/69] Phpstan Baseline < 4000 Lines Part 3 (#3041)

The last of these changes for now. No remaining Phpstan complaints in any Writer/Xlsx. Number of lines remaining in Phpstan baseline is now below 3500.
---
 phpstan-baseline.neon                         | 195 ------------------
 src/PhpSpreadsheet/Writer/Xlsx.php            |   8 +-
 .../Writer/Xlsx/DefinedNames.php              |   2 +-
 src/PhpSpreadsheet/Writer/Xlsx/Rels.php       |   7 +-
 .../Writer/Xlsx/StringTable.php               |  54 +++--
 src/PhpSpreadsheet/Writer/Xlsx/Style.php      | 118 ++++++-----
 6 files changed, 111 insertions(+), 273 deletions(-)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index cfaed694..53fa9057 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -3474,198 +3474,3 @@ parameters:
 			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xls\\\\Xf\\:\\:\\$diag is never read, only written\\.$#"
 			count: 1
 			path: src/PhpSpreadsheet/Writer/Xls/Xf.php
-
-		-
-			message: "#^Argument of an invalid type array\\|null supplied for foreach, only iterables are supported\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx.php
-
-		-
-			message: "#^Parameter \\#1 \\$path of function basename expects string, array\\|string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx.php
-
-		-
-			message: "#^Parameter \\#1 \\$path of function dirname expects string, array\\|string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx.php
-
-		-
-			message: "#^Possibly invalid array key type array\\|string\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\:\\:\\$pathNames has no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx.php
-
-		-
-			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Rels\\:\\:writeUnparsedRelationship\\(\\) has parameter \\$relationship with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Rels.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Rels\\:\\:writeUnparsedRelationship\\(\\) has parameter \\$type with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Rels.php
-
-		-
-			message: "#^Parameter \\#2 \\$id of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Rels\\:\\:writeRelationship\\(\\) expects int, string given\\.$#"
-			count: 5
-			path: src/PhpSpreadsheet/Writer/Xlsx/Rels.php
-
-		-
-			message: "#^Parameter \\#4 \\$target of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Rels\\:\\:writeRelationship\\(\\) expects string, array\\|string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Rels.php
-
-		-
-			message: "#^Cannot call method getBold\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Cannot call method getColor\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Cannot call method getItalic\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Cannot call method getName\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Cannot call method getSize\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Cannot call method getStrikethrough\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Cannot call method getSubscript\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Cannot call method getSuperscript\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Cannot call method getUnderline\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Instanceof between \\*NEVER\\* and PhpOffice\\\\PhpSpreadsheet\\\\RichText\\\\RichText will always evaluate to false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Instanceof between string and PhpOffice\\\\PhpSpreadsheet\\\\RichText\\\\RichText will always evaluate to false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Parameter \\#1 \\$text of method PhpOffice\\\\PhpSpreadsheet\\\\RichText\\\\RichText\\:\\:createTextRun\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, float\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int\\<0, max\\> given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, string\\|null given\\.$#"
-			count: 4
-			path: src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
-
-		-
-			message: "#^Cannot call method getStyle\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Conditional\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Style.php
-
-		-
-			message: "#^Comparison operation \"\\<\" between int\\<min, \\-1\\> and 0 is always true\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xlsx/Style.php
-
-		-
-			message: "#^Parameter \\#2 \\$borders of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Style\\:\\:writeBorder\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Borders, PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Borders\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Style.php
-
-		-
-			message: "#^Parameter \\#2 \\$fill of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Style\\:\\:writeFill\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Fill, PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Fill\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Style.php
-
-		-
-			message: "#^Parameter \\#2 \\$font of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Style\\:\\:writeFont\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font, PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Style.php
-
-		-
-			message: "#^Parameter \\#2 \\$numberFormat of method PhpOffice\\\\PhpSpreadsheet\\\\Writer\\\\Xlsx\\\\Style\\:\\:writeNumFmt\\(\\) expects PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat, PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\NumberFormat\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Style.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, float given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Style.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int given\\.$#"
-			count: 22
-			path: src/PhpSpreadsheet/Writer/Xlsx/Style.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int\\<0, max\\> given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Style.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int\\<1, max\\> given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Writer/Xlsx/Style.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, int\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Style.php
-
-		-
-			message: "#^Parameter \\#2 \\$value of method XMLWriter\\:\\:writeAttribute\\(\\) expects string, string\\|null given\\.$#"
-			count: 7
-			path: src/PhpSpreadsheet/Writer/Xlsx/Style.php
-
-		-
-			message: "#^Result of \\|\\| is always true\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Writer/Xlsx/Style.php
diff --git a/src/PhpSpreadsheet/Writer/Xlsx.php b/src/PhpSpreadsheet/Writer/Xlsx.php
index 5aca5117..c9446e70 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx.php
@@ -349,12 +349,15 @@ class Xlsx extends BaseWriter
         //a custom UI in this workbook ? add it ("base" xml and additional objects (pictures) and rels)
         if ($this->spreadSheet->hasRibbon()) {
             $tmpRibbonTarget = $this->spreadSheet->getRibbonXMLData('target');
+            $tmpRibbonTarget = is_string($tmpRibbonTarget) ? $tmpRibbonTarget : '';
             $zipContent[$tmpRibbonTarget] = $this->spreadSheet->getRibbonXMLData('data');
             if ($this->spreadSheet->hasRibbonBinObjects()) {
                 $tmpRootPath = dirname($tmpRibbonTarget) . '/';
                 $ribbonBinObjects = $this->spreadSheet->getRibbonBinObjects('data'); //the files to write
-                foreach ($ribbonBinObjects as $aPath => $aContent) {
-                    $zipContent[$tmpRootPath . $aPath] = $aContent;
+                if (is_array($ribbonBinObjects)) {
+                    foreach ($ribbonBinObjects as $aPath => $aContent) {
+                        $zipContent[$tmpRootPath . $aPath] = $aContent;
+                    }
                 }
                 //the rels for files
                 $zipContent[$tmpRootPath . '_rels/' . basename($tmpRibbonTarget) . '.rels'] = $this->getWriterPartRelsRibbon()->writeRibbonRelationships($this->spreadSheet);
@@ -684,6 +687,7 @@ class Xlsx extends BaseWriter
         return $this;
     }
 
+    /** @var array */
     private $pathNames = [];
 
     private function addZipFile(string $path, string $content): void
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php b/src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php
index b8285fcb..b3338c07 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php
@@ -118,7 +118,7 @@ class DefinedNames
             $range[1] = Coordinate::absoluteCoordinate($range[1]);
             $range = implode(':', $range);
 
-            $this->objWriter->writeRawData('\'' . str_replace("'", "''", $worksheet->getTitle() ?? '') . '\'!' . $range);
+            $this->objWriter->writeRawData('\'' . str_replace("'", "''", $worksheet->getTitle()) . '\'!' . $range);
 
             $this->objWriter->endElement();
         }
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Rels.php b/src/PhpSpreadsheet/Writer/Xlsx/Rels.php
index 238fb5bf..99fa2d34 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/Rels.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/Rels.php
@@ -67,12 +67,13 @@ class Rels extends WriterPart
             'xl/workbook.xml'
         );
         // a custom UI in workbook ?
+        $target = $spreadsheet->getRibbonXMLData('target');
         if ($spreadsheet->hasRibbon()) {
             $this->writeRelationShip(
                 $objWriter,
                 5,
                 'http://schemas.microsoft.com/office/2006/relationships/ui/extensibility',
-                $spreadsheet->getRibbonXMLData('target')
+                is_string($target) ? $target : ''
             );
         }
 
@@ -284,7 +285,7 @@ class Rels extends WriterPart
         return $objWriter->getData();
     }
 
-    private function writeUnparsedRelationship(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet, XMLWriter $objWriter, $relationship, $type): void
+    private function writeUnparsedRelationship(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet, XMLWriter $objWriter, string $relationship, string $type): void
     {
         $unparsedLoadedData = $worksheet->getParent()->getUnparsedLoadedData();
         if (!isset($unparsedLoadedData['sheets'][$worksheet->getCodeName()][$relationship])) {
@@ -448,7 +449,7 @@ class Rels extends WriterPart
     /**
      * Write Override content type.
      *
-     * @param int $id Relationship ID. rId will be prepended!
+     * @param int|string $id Relationship ID. rId will be prepended!
      * @param string $type Relationship type
      * @param string $target Relationship target
      * @param string $targetMode Relationship target mode
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/StringTable.php b/src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
index 8b293bc1..078f940a 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
@@ -66,7 +66,7 @@ class StringTable extends WriterPart
     /**
      * Write string table to XML format.
      *
-     * @param string[] $stringTable
+     * @param (string|RichText)[] $stringTable
      *
      * @return string XML Output
      */
@@ -86,13 +86,13 @@ class StringTable extends WriterPart
         // String table
         $objWriter->startElement('sst');
         $objWriter->writeAttribute('xmlns', 'http://schemas.openxmlformats.org/spreadsheetml/2006/main');
-        $objWriter->writeAttribute('uniqueCount', count($stringTable));
+        $objWriter->writeAttribute('uniqueCount', (string) count($stringTable));
 
         // Loop through string table
         foreach ($stringTable as $textElement) {
             $objWriter->startElement('si');
 
-            if (!$textElement instanceof RichText) {
+            if (!($textElement instanceof RichText)) {
                 $textToWrite = StringHelper::controlCharacterPHP2OOXML($textElement);
                 $objWriter->startElement('t');
                 if ($textToWrite !== trim($textToWrite)) {
@@ -100,7 +100,7 @@ class StringTable extends WriterPart
                 }
                 $objWriter->writeRawData($textToWrite);
                 $objWriter->endElement();
-            } elseif ($textElement instanceof RichText) {
+            } else {
                 $this->writeRichText($objWriter, $textElement);
             }
 
@@ -130,14 +130,16 @@ class StringTable extends WriterPart
             $objWriter->startElement($prefix . 'r');
 
             // rPr
-            if ($element instanceof Run) {
+            if ($element instanceof Run && $element->getFont() !== null) {
                 // rPr
                 $objWriter->startElement($prefix . 'rPr');
 
                 // rFont
-                $objWriter->startElement($prefix . 'rFont');
-                $objWriter->writeAttribute('val', $element->getFont()->getName());
-                $objWriter->endElement();
+                if ($element->getFont()->getName() !== null) {
+                    $objWriter->startElement($prefix . 'rFont');
+                    $objWriter->writeAttribute('val', $element->getFont()->getName());
+                    $objWriter->endElement();
+                }
 
                 // Bold
                 $objWriter->startElement($prefix . 'b');
@@ -166,19 +168,25 @@ class StringTable extends WriterPart
                 $objWriter->endElement();
 
                 // Color
-                $objWriter->startElement($prefix . 'color');
-                $objWriter->writeAttribute('rgb', $element->getFont()->getColor()->getARGB());
-                $objWriter->endElement();
+                if ($element->getFont()->getColor()->getARGB() !== null) {
+                    $objWriter->startElement($prefix . 'color');
+                    $objWriter->writeAttribute('rgb', $element->getFont()->getColor()->getARGB());
+                    $objWriter->endElement();
+                }
 
                 // Size
-                $objWriter->startElement($prefix . 'sz');
-                $objWriter->writeAttribute('val', $element->getFont()->getSize());
-                $objWriter->endElement();
+                if ($element->getFont()->getSize() !== null) {
+                    $objWriter->startElement($prefix . 'sz');
+                    $objWriter->writeAttribute('val', (string) $element->getFont()->getSize());
+                    $objWriter->endElement();
+                }
 
                 // Underline
-                $objWriter->startElement($prefix . 'u');
-                $objWriter->writeAttribute('val', $element->getFont()->getUnderline());
-                $objWriter->endElement();
+                if ($element->getFont()->getUnderline() !== null) {
+                    $objWriter->startElement($prefix . 'u');
+                    $objWriter->writeAttribute('val', $element->getFont()->getUnderline());
+                    $objWriter->endElement();
+                }
 
                 $objWriter->endElement();
             }
@@ -201,10 +209,10 @@ class StringTable extends WriterPart
      */
     public function writeRichTextForCharts(XMLWriter $objWriter, $richText = null, $prefix = ''): void
     {
-        if (!$richText instanceof RichText) {
+        if (!($richText instanceof RichText)) {
             $textRun = $richText;
             $richText = new RichText();
-            $run = $richText->createTextRun($textRun);
+            $run = $richText->createTextRun($textRun ?? '');
             $run->setFont(null);
         }
 
@@ -226,9 +234,9 @@ class StringTable extends WriterPart
                 }
 
                 // Bold
-                $objWriter->writeAttribute('b', ($element->getFont()->getBold() ? 1 : 0));
+                $objWriter->writeAttribute('b', ($element->getFont()->getBold() ? '1' : '0'));
                 // Italic
-                $objWriter->writeAttribute('i', ($element->getFont()->getItalic() ? 1 : 0));
+                $objWriter->writeAttribute('i', ($element->getFont()->getItalic() ? '1' : '0'));
                 // Underline
                 $underlineType = $element->getFont()->getUnderline();
                 switch ($underlineType) {
@@ -241,7 +249,9 @@ class StringTable extends WriterPart
 
                         break;
                 }
-                $objWriter->writeAttribute('u', $underlineType);
+                if ($underlineType !== null) {
+                    $objWriter->writeAttribute('u', $underlineType);
+                }
                 // Strikethrough
                 $objWriter->writeAttribute('strike', ($element->getFont()->getStriketype() ?: 'noStrike'));
                 // Superscript/subscript
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Style.php b/src/PhpSpreadsheet/Writer/Xlsx/Style.php
index cb2e3850..b24b7533 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/Style.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/Style.php
@@ -40,7 +40,7 @@ class Style extends WriterPart
 
         // numFmts
         $objWriter->startElement('numFmts');
-        $objWriter->writeAttribute('count', $this->getParentWriter()->getNumFmtHashTable()->count());
+        $objWriter->writeAttribute('count', (string) $this->getParentWriter()->getNumFmtHashTable()->count());
 
         // numFmt
         for ($i = 0; $i < $this->getParentWriter()->getNumFmtHashTable()->count(); ++$i) {
@@ -51,54 +51,63 @@ class Style extends WriterPart
 
         // fonts
         $objWriter->startElement('fonts');
-        $objWriter->writeAttribute('count', $this->getParentWriter()->getFontHashTable()->count());
+        $objWriter->writeAttribute('count', (string) $this->getParentWriter()->getFontHashTable()->count());
 
         // font
         for ($i = 0; $i < $this->getParentWriter()->getFontHashTable()->count(); ++$i) {
-            $this->writeFont($objWriter, $this->getParentWriter()->getFontHashTable()->getByIndex($i));
+            $thisfont = $this->getParentWriter()->getFontHashTable()->getByIndex($i);
+            if ($thisfont !== null) {
+                $this->writeFont($objWriter, $thisfont);
+            }
         }
 
         $objWriter->endElement();
 
         // fills
         $objWriter->startElement('fills');
-        $objWriter->writeAttribute('count', $this->getParentWriter()->getFillHashTable()->count());
+        $objWriter->writeAttribute('count', (string) $this->getParentWriter()->getFillHashTable()->count());
 
         // fill
         for ($i = 0; $i < $this->getParentWriter()->getFillHashTable()->count(); ++$i) {
-            $this->writeFill($objWriter, $this->getParentWriter()->getFillHashTable()->getByIndex($i));
+            $thisfill = $this->getParentWriter()->getFillHashTable()->getByIndex($i);
+            if ($thisfill !== null) {
+                $this->writeFill($objWriter, $thisfill);
+            }
         }
 
         $objWriter->endElement();
 
         // borders
         $objWriter->startElement('borders');
-        $objWriter->writeAttribute('count', $this->getParentWriter()->getBordersHashTable()->count());
+        $objWriter->writeAttribute('count', (string) $this->getParentWriter()->getBordersHashTable()->count());
 
         // border
         for ($i = 0; $i < $this->getParentWriter()->getBordersHashTable()->count(); ++$i) {
-            $this->writeBorder($objWriter, $this->getParentWriter()->getBordersHashTable()->getByIndex($i));
+            $thisborder = $this->getParentWriter()->getBordersHashTable()->getByIndex($i);
+            if ($thisborder !== null) {
+                $this->writeBorder($objWriter, $thisborder);
+            }
         }
 
         $objWriter->endElement();
 
         // cellStyleXfs
         $objWriter->startElement('cellStyleXfs');
-        $objWriter->writeAttribute('count', 1);
+        $objWriter->writeAttribute('count', '1');
 
         // xf
         $objWriter->startElement('xf');
-        $objWriter->writeAttribute('numFmtId', 0);
-        $objWriter->writeAttribute('fontId', 0);
-        $objWriter->writeAttribute('fillId', 0);
-        $objWriter->writeAttribute('borderId', 0);
+        $objWriter->writeAttribute('numFmtId', '0');
+        $objWriter->writeAttribute('fontId', '0');
+        $objWriter->writeAttribute('fillId', '0');
+        $objWriter->writeAttribute('borderId', '0');
         $objWriter->endElement();
 
         $objWriter->endElement();
 
         // cellXfs
         $objWriter->startElement('cellXfs');
-        $objWriter->writeAttribute('count', count($spreadsheet->getCellXfCollection()));
+        $objWriter->writeAttribute('count', (string) count($spreadsheet->getCellXfCollection()));
 
         // xf
         foreach ($spreadsheet->getCellXfCollection() as $cellXf) {
@@ -109,24 +118,27 @@ class Style extends WriterPart
 
         // cellStyles
         $objWriter->startElement('cellStyles');
-        $objWriter->writeAttribute('count', 1);
+        $objWriter->writeAttribute('count', '1');
 
         // cellStyle
         $objWriter->startElement('cellStyle');
         $objWriter->writeAttribute('name', 'Normal');
-        $objWriter->writeAttribute('xfId', 0);
-        $objWriter->writeAttribute('builtinId', 0);
+        $objWriter->writeAttribute('xfId', '0');
+        $objWriter->writeAttribute('builtinId', '0');
         $objWriter->endElement();
 
         $objWriter->endElement();
 
         // dxfs
         $objWriter->startElement('dxfs');
-        $objWriter->writeAttribute('count', $this->getParentWriter()->getStylesConditionalHashTable()->count());
+        $objWriter->writeAttribute('count', (string) $this->getParentWriter()->getStylesConditionalHashTable()->count());
 
         // dxf
         for ($i = 0; $i < $this->getParentWriter()->getStylesConditionalHashTable()->count(); ++$i) {
-            $this->writeCellStyleDxf($objWriter, $this->getParentWriter()->getStylesConditionalHashTable()->getByIndex($i)->getStyle());
+            $thisstyle = $this->getParentWriter()->getStylesConditionalHashTable()->getByIndex($i);
+            if ($thisstyle !== null) {
+                $this->writeCellStyleDxf($objWriter, $thisstyle->getStyle());
+            }
         }
 
         $objWriter->endElement();
@@ -171,17 +183,19 @@ class Style extends WriterPart
 
         // gradientFill
         $objWriter->startElement('gradientFill');
-        $objWriter->writeAttribute('type', $fill->getFillType());
-        $objWriter->writeAttribute('degree', $fill->getRotation());
+        $objWriter->writeAttribute('type', (string) $fill->getFillType());
+        $objWriter->writeAttribute('degree', (string) $fill->getRotation());
 
         // stop
         $objWriter->startElement('stop');
         $objWriter->writeAttribute('position', '0');
 
         // color
-        $objWriter->startElement('color');
-        $objWriter->writeAttribute('rgb', $fill->getStartColor()->getARGB());
-        $objWriter->endElement();
+        if ($fill->getStartColor()->getARGB() !== null) {
+            $objWriter->startElement('color');
+            $objWriter->writeAttribute('rgb', $fill->getStartColor()->getARGB());
+            $objWriter->endElement();
+        }
 
         $objWriter->endElement();
 
@@ -190,9 +204,11 @@ class Style extends WriterPart
         $objWriter->writeAttribute('position', '1');
 
         // color
-        $objWriter->startElement('color');
-        $objWriter->writeAttribute('rgb', $fill->getEndColor()->getARGB());
-        $objWriter->endElement();
+        if ($fill->getEndColor()->getARGB() !== null) {
+            $objWriter->startElement('color');
+            $objWriter->writeAttribute('rgb', $fill->getEndColor()->getARGB());
+            $objWriter->endElement();
+        }
 
         $objWriter->endElement();
 
@@ -220,7 +236,7 @@ class Style extends WriterPart
 
         // patternFill
         $objWriter->startElement('patternFill');
-        $objWriter->writeAttribute('patternType', $fill->getFillType());
+        $objWriter->writeAttribute('patternType', (string) $fill->getFillType());
 
         if (self::writePatternColors($fill)) {
             // fgColor
@@ -360,20 +376,20 @@ class Style extends WriterPart
     {
         // xf
         $objWriter->startElement('xf');
-        $objWriter->writeAttribute('xfId', 0);
-        $objWriter->writeAttribute('fontId', (int) $this->getParentWriter()->getFontHashTable()->getIndexForHashCode($style->getFont()->getHashCode()));
+        $objWriter->writeAttribute('xfId', '0');
+        $objWriter->writeAttribute('fontId', (string) (int) $this->getParentWriter()->getFontHashTable()->getIndexForHashCode($style->getFont()->getHashCode()));
         if ($style->getQuotePrefix()) {
-            $objWriter->writeAttribute('quotePrefix', 1);
+            $objWriter->writeAttribute('quotePrefix', '1');
         }
 
         if ($style->getNumberFormat()->getBuiltInFormatCode() === false) {
-            $objWriter->writeAttribute('numFmtId', (int) ($this->getParentWriter()->getNumFmtHashTable()->getIndexForHashCode($style->getNumberFormat()->getHashCode()) + 164));
+            $objWriter->writeAttribute('numFmtId', (string) (int) ($this->getParentWriter()->getNumFmtHashTable()->getIndexForHashCode($style->getNumberFormat()->getHashCode()) + 164));
         } else {
-            $objWriter->writeAttribute('numFmtId', (int) $style->getNumberFormat()->getBuiltInFormatCode());
+            $objWriter->writeAttribute('numFmtId', (string) (int) $style->getNumberFormat()->getBuiltInFormatCode());
         }
 
-        $objWriter->writeAttribute('fillId', (int) $this->getParentWriter()->getFillHashTable()->getIndexForHashCode($style->getFill()->getHashCode()));
-        $objWriter->writeAttribute('borderId', (int) $this->getParentWriter()->getBordersHashTable()->getIndexForHashCode($style->getBorders()->getHashCode()));
+        $objWriter->writeAttribute('fillId', (string) (int) $this->getParentWriter()->getFillHashTable()->getIndexForHashCode($style->getFill()->getHashCode()));
+        $objWriter->writeAttribute('borderId', (string) (int) $this->getParentWriter()->getBordersHashTable()->getIndexForHashCode($style->getBorders()->getHashCode()));
 
         // Apply styles?
         $objWriter->writeAttribute('applyFont', ($spreadsheet->getDefaultStyle()->getFont()->getHashCode() != $style->getFont()->getHashCode()) ? '1' : '0');
@@ -387,25 +403,25 @@ class Style extends WriterPart
 
         // alignment
         $objWriter->startElement('alignment');
-        $objWriter->writeAttribute('horizontal', $style->getAlignment()->getHorizontal());
-        $objWriter->writeAttribute('vertical', $style->getAlignment()->getVertical());
+        $objWriter->writeAttribute('horizontal', (string) $style->getAlignment()->getHorizontal());
+        $objWriter->writeAttribute('vertical', (string) $style->getAlignment()->getVertical());
 
         $textRotation = 0;
         if ($style->getAlignment()->getTextRotation() >= 0) {
             $textRotation = $style->getAlignment()->getTextRotation();
-        } elseif ($style->getAlignment()->getTextRotation() < 0) {
+        } else {
             $textRotation = 90 - $style->getAlignment()->getTextRotation();
         }
-        $objWriter->writeAttribute('textRotation', $textRotation);
+        $objWriter->writeAttribute('textRotation', (string) $textRotation);
 
         $objWriter->writeAttribute('wrapText', ($style->getAlignment()->getWrapText() ? 'true' : 'false'));
         $objWriter->writeAttribute('shrinkToFit', ($style->getAlignment()->getShrinkToFit() ? 'true' : 'false'));
 
         if ($style->getAlignment()->getIndent() > 0) {
-            $objWriter->writeAttribute('indent', $style->getAlignment()->getIndent());
+            $objWriter->writeAttribute('indent', (string) $style->getAlignment()->getIndent());
         }
         if ($style->getAlignment()->getReadOrder() > 0) {
-            $objWriter->writeAttribute('readingOrder', $style->getAlignment()->getReadOrder());
+            $objWriter->writeAttribute('readingOrder', (string) $style->getAlignment()->getReadOrder());
         }
         $objWriter->endElement();
 
@@ -454,10 +470,10 @@ class Style extends WriterPart
             $textRotation = 0;
             if ($style->getAlignment()->getTextRotation() >= 0) {
                 $textRotation = $style->getAlignment()->getTextRotation();
-            } elseif ($style->getAlignment()->getTextRotation() < 0) {
+            } else {
                 $textRotation = 90 - $style->getAlignment()->getTextRotation();
             }
-            $objWriter->writeAttribute('textRotation', $textRotation);
+            $objWriter->writeAttribute('textRotation', (string) $textRotation);
         }
         $objWriter->endElement();
 
@@ -465,7 +481,7 @@ class Style extends WriterPart
         $this->writeBorder($objWriter, $style->getBorders());
 
         // protection
-        if (($style->getProtection()->getLocked() !== null) || ($style->getProtection()->getHidden() !== null)) {
+        if ((!empty($style->getProtection()->getLocked())) || (!empty($style->getProtection()->getHidden()))) {
             if (
                 $style->getProtection()->getLocked() !== Protection::PROTECTION_INHERIT ||
                 $style->getProtection()->getHidden() !== Protection::PROTECTION_INHERIT
@@ -503,11 +519,13 @@ class Style extends WriterPart
             $objWriter->writeAttribute('style', $border->getBorderStyle());
 
             // color
-            $objWriter->startElement('color');
-            $objWriter->writeAttribute('rgb', $border->getColor()->getARGB());
-            $objWriter->endElement();
+            if ($border->getColor()->getARGB() !== null) {
+                $objWriter->startElement('color');
+                $objWriter->writeAttribute('rgb', $border->getColor()->getARGB());
+                $objWriter->endElement();
 
-            $objWriter->endElement();
+                $objWriter->endElement();
+            }
         }
     }
 
@@ -516,15 +534,15 @@ class Style extends WriterPart
      *
      * @param int $id Number Format identifier
      */
-    private function writeNumFmt(XMLWriter $objWriter, NumberFormat $numberFormat, $id = 0): void
+    private function writeNumFmt(XMLWriter $objWriter, ?NumberFormat $numberFormat, $id = 0): void
     {
         // Translate formatcode
-        $formatCode = $numberFormat->getFormatCode();
+        $formatCode = ($numberFormat === null) ? null : $numberFormat->getFormatCode();
 
         // numFmt
         if ($formatCode !== null) {
             $objWriter->startElement('numFmt');
-            $objWriter->writeAttribute('numFmtId', ($id + 164));
+            $objWriter->writeAttribute('numFmtId', (string) ($id + 164));
             $objWriter->writeAttribute('formatCode', $formatCode);
             $objWriter->endElement();
         }

From 57a72037b5c8976e28e305ce72d45bc59369250a Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Sun, 4 Sep 2022 09:45:29 -0700
Subject: [PATCH 47/69] Phpstan and Xlsx Reader (#3044)

Eliminate most Phpstan messages in Xlsx Reader. In combination with similar changes to Xlsx Writer, baseline will shrink to just over 3,000 lines.
---
 phpstan-baseline.neon                         | 450 ------------------
 src/PhpSpreadsheet/Reader/Xlsx.php            |  82 ++--
 src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php |  14 +-
 .../Reader/Xlsx/BaseParserClass.php           |   5 +-
 .../Reader/Xlsx/ColumnAndRowAttributes.php    |  12 +-
 .../Reader/Xlsx/ConditionalStyles.php         |  22 +-
 .../Reader/Xlsx/DataValidations.php           |   4 +-
 src/PhpSpreadsheet/Reader/Xlsx/Hyperlinks.php |   2 +
 src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php  |  17 +-
 .../Reader/Xlsx/SheetViewOptions.php          |  11 +-
 10 files changed, 109 insertions(+), 510 deletions(-)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 53fa9057..cc2eaa3d 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1660,456 +1660,6 @@ parameters:
 			count: 1
 			path: src/PhpSpreadsheet/Reader/Xls/RC4.php
 
-		-
-			message: "#^Argument of an invalid type array\\<int, string\\>\\|false supplied for foreach, only iterables are supported\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot access offset 0 on array\\<int, string\\>\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot access property \\$r on SimpleXMLElement\\|null\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot call method addChart\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot call method setBold\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot call method setColor\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot call method setItalic\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot call method setName\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot call method setSize\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot call method setStrikethrough\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot call method setSubscript\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot call method setSuperscript\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Cannot call method setUnderline\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Style\\\\Font\\|null\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Comparison operation \"\\>\" between SimpleXMLElement\\|null and 0 results in an error\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:boolean\\(\\) has parameter \\$value with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:castToBoolean\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:castToBoolean\\(\\) has parameter \\$c with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:castToError\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:castToError\\(\\) has parameter \\$c with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:castToFormula\\(\\) has parameter \\$c with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:castToFormula\\(\\) has parameter \\$calculatedValue with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:castToFormula\\(\\) has parameter \\$castBaseType with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:castToFormula\\(\\) has parameter \\$cellDataType with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:castToFormula\\(\\) has parameter \\$r with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:castToFormula\\(\\) has parameter \\$sharedFormulas with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:castToFormula\\(\\) has parameter \\$value with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:castToString\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:castToString\\(\\) has parameter \\$c with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:dirAdd\\(\\) has parameter \\$add with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:dirAdd\\(\\) has parameter \\$base with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:getArrayItem\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:getArrayItem\\(\\) has parameter \\$array with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:getArrayItem\\(\\) has parameter \\$key with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:getFromZipArchive\\(\\) should return string but returns string\\|false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:readFormControlProperties\\(\\) has parameter \\$dir with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:readFormControlProperties\\(\\) has parameter \\$docSheet with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:readFormControlProperties\\(\\) has parameter \\$fileWorksheet with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:readPrinterSettings\\(\\) has parameter \\$dir with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:readPrinterSettings\\(\\) has parameter \\$docSheet with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:readPrinterSettings\\(\\) has parameter \\$fileWorksheet with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:stripWhiteSpaceFromStyleString\\(\\) has parameter \\$string with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\:\\:toCSSArray\\(\\) has parameter \\$style with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Negated boolean expression is always true\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Parameter \\#1 \\$fontSizeInPoints of static method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Font\\:\\:fontSizeToPixels\\(\\) expects int, string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Parameter \\#1 \\$haystack of function strpos expects string, int\\|string given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Parameter \\#1 \\$sizeInCm of static method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Font\\:\\:centimeterSizeToPixels\\(\\) expects int, string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Parameter \\#1 \\$sizeInInch of static method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\Font\\:\\:inchSizeToPixels\\(\\) expects int, string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Parameter \\#1 \\$worksheetName of method PhpOffice\\\\PhpSpreadsheet\\\\Spreadsheet\\:\\:getSheetByName\\(\\) expects string, array\\|string given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Parameter \\#3 \\$subject of function str_replace expects array\\|string, int\\|string given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Reader/Xlsx.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\AutoFilter\\:\\:readAutoFilter\\(\\) has parameter \\$autoFilterRange with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\AutoFilter\\:\\:readAutoFilter\\(\\) has parameter \\$xmlSheet with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php
-
-		-
-			message: "#^Parameter \\#1 \\$operator of method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\AutoFilter\\\\Column\\\\Rule\\:\\:setRule\\(\\) expects string, null given\\.$#"
-			count: 2
-			path: src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\AutoFilter\\:\\:\\$worksheet has no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\AutoFilter\\:\\:\\$worksheetXml has no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\BaseParserClass\\:\\:boolean\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/BaseParserClass.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\BaseParserClass\\:\\:boolean\\(\\) has parameter \\$value with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/BaseParserClass.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ColumnAndRowAttributes\\:\\:isFilteredColumn\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ColumnAndRowAttributes\\:\\:isFilteredColumn\\(\\) has parameter \\$columnCoordinate with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ColumnAndRowAttributes\\:\\:isFilteredRow\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ColumnAndRowAttributes\\:\\:isFilteredRow\\(\\) has parameter \\$rowCoordinate with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ColumnAndRowAttributes\\:\\:readColumnAttributes\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ColumnAndRowAttributes\\:\\:readColumnAttributes\\(\\) has parameter \\$readDataOnly with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ColumnAndRowAttributes\\:\\:readColumnRangeAttributes\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ColumnAndRowAttributes\\:\\:readColumnRangeAttributes\\(\\) has parameter \\$readDataOnly with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ColumnAndRowAttributes\\:\\:readRowAttributes\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ColumnAndRowAttributes\\:\\:readRowAttributes\\(\\) has parameter \\$readDataOnly with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ColumnAndRowAttributes\\:\\:\\$worksheet has no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ColumnAndRowAttributes\\:\\:\\$worksheetXml has no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ConditionalStyles\\:\\:readConditionalStyles\\(\\) has parameter \\$xmlSheet with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ConditionalStyles\\:\\:readDataBarExtLstOfConditionalRule\\(\\) has parameter \\$cfRule with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ConditionalStyles\\:\\:readDataBarExtLstOfConditionalRule\\(\\) has parameter \\$conditionalFormattingRuleExtensions with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ConditionalStyles\\:\\:readDataBarOfConditionalRule\\(\\) has parameter \\$cfRule with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ConditionalStyles\\:\\:readDataBarOfConditionalRule\\(\\) has parameter \\$conditionalFormattingRuleExtensions with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ConditionalStyles\\:\\:readStyleRules\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ConditionalStyles\\:\\:readStyleRules\\(\\) has parameter \\$cfRules with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ConditionalStyles\\:\\:readStyleRules\\(\\) has parameter \\$extLst with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ConditionalStyles\\:\\:setConditionalStyles\\(\\) has parameter \\$xmlExtLst with no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ConditionalStyles\\:\\:\\$dxfs has no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ConditionalStyles\\:\\:\\$worksheet has no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\ConditionalStyles\\:\\:\\$worksheetXml has no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\DataValidations\\:\\:\\$worksheet has no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/DataValidations.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\DataValidations\\:\\:\\$worksheetXml has no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/DataValidations.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Hyperlinks\\:\\:\\$hyperlinks has no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Hyperlinks.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\Hyperlinks\\:\\:\\$worksheet has no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/Hyperlinks.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\PageSetup\\:\\:load\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\PageSetup\\:\\:pageSetup\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\PageSetup\\:\\:\\$worksheet has no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\PageSetup\\:\\:\\$worksheetXml has no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\SheetViewOptions\\:\\:\\$worksheet has no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/SheetViewOptions.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Xlsx\\\\SheetViewOptions\\:\\:\\$worksheetXml has no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Xlsx/SheetViewOptions.php
-
 		-
 			message: "#^Parameter \\#1 \\$haystack of function strpos expects string, string\\|false given\\.$#"
 			count: 1
diff --git a/src/PhpSpreadsheet/Reader/Xlsx.php b/src/PhpSpreadsheet/Reader/Xlsx.php
index 630fd1dd..244baddd 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx.php
@@ -31,6 +31,7 @@ use PhpOffice\PhpSpreadsheet\Shared\Font;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Style\Color;
+use PhpOffice\PhpSpreadsheet\Style\Font as StyleFont;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
 use PhpOffice\PhpSpreadsheet\Style\Style;
 use PhpOffice\PhpSpreadsheet\Worksheet\HeaderFooterDrawing;
@@ -293,7 +294,7 @@ class Xlsx extends BaseReader
         return $worksheetInfo;
     }
 
-    private static function castToBoolean($c)
+    private static function castToBoolean(SimpleXMLElement $c): bool
     {
         $value = isset($c->v) ? (string) $c->v : null;
         if ($value == '0') {
@@ -305,17 +306,21 @@ class Xlsx extends BaseReader
         return (bool) $c->v;
     }
 
-    private static function castToError($c)
+    private static function castToError(SimpleXMLElement $c): ?string
     {
         return isset($c->v) ? (string) $c->v : null;
     }
 
-    private static function castToString($c)
+    private static function castToString(SimpleXMLElement $c): ?string
     {
         return isset($c->v) ? (string) $c->v : null;
     }
 
-    private function castToFormula($c, $r, &$cellDataType, &$value, &$calculatedValue, &$sharedFormulas, $castBaseType): void
+    /**
+     * @param mixed $value
+     * @param mixed $calculatedValue
+     */
+    private function castToFormula(SimpleXMLElement $c, string $r, string &$cellDataType, &$value, &$calculatedValue, array &$sharedFormulas, string $castBaseType): void
     {
         $attr = $c->f->attributes();
         $cellDataType = 'f';
@@ -389,7 +394,7 @@ class Xlsx extends BaseReader
             $contents = $archive->getFromName(substr($fileName, 1), 0, ZipArchive::FL_NOCASE);
         }
 
-        return $contents;
+        return ($contents === false) ? '' : $contents;
     }
 
     /**
@@ -1143,7 +1148,7 @@ class Xlsx extends BaseReader
                                 }
 
                                 // Header/footer images
-                                if ($xmlSheet && $xmlSheet->legacyDrawingHF && !$this->readDataOnly) {
+                                if ($xmlSheet && $xmlSheet->legacyDrawingHF) {
                                     if ($zip->locateName(dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')) {
                                         $relsWorksheet = $this->loadZipNoNamespace(dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels', Namespaces::RELATIONSHIPS);
                                         $vmlRelationship = '';
@@ -1550,7 +1555,7 @@ class Xlsx extends BaseReader
 
                                                 break;
                                             case '_xlnm.Print_Area':
-                                                $rangeSets = preg_split("/('?(?:.*?)'?(?:![A-Z0-9]+:[A-Z0-9]+)),?/", $extractedRange, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
+                                                $rangeSets = preg_split("/('?(?:.*?)'?(?:![A-Z0-9]+:[A-Z0-9]+)),?/", $extractedRange, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE) ?: [];
                                                 $newRangeSets = [];
                                                 foreach ($rangeSets as $rangeSet) {
                                                     [, $rangeSet] = Worksheet::extractSheetTitle($rangeSet, true);
@@ -1605,7 +1610,7 @@ class Xlsx extends BaseReader
                                                 if (strpos((string) $definedName, '!') !== false) {
                                                     $range[0] = str_replace("''", "'", $range[0]);
                                                     $range[0] = str_replace("'", '', $range[0]);
-                                                    if ($worksheet = $excel->getSheetByName($range[0])) {
+                                                    if ($worksheet = $excel->getSheetByName($range[0])) { // @phpstan-ignore-line
                                                         $excel->addDefinedName(DefinedName::createInstance((string) $definedName['name'], $worksheet, $extractedRange, true, $scope));
                                                     } else {
                                                         $excel->addDefinedName(DefinedName::createInstance((string) $definedName['name'], $scope, $extractedRange, true, $scope));
@@ -1626,7 +1631,7 @@ class Xlsx extends BaseReader
                                         // Need to split on a comma or a space if not in quotes, and extract the first part.
                                         $definedNameValueParts = preg_split("/[ ,](?=([^']*'[^']*')*[^']*$)/miuU", $definedRange);
                                         // Extract sheet name
-                                        [$extractedSheetName] = Worksheet::extractSheetTitle((string) $definedNameValueParts[0], true);
+                                        [$extractedSheetName] = Worksheet::extractSheetTitle((string) $definedNameValueParts[0], true); // @phpstan-ignore-line
                                         $extractedSheetName = trim($extractedSheetName, "'");
 
                                         // Locate sheet
@@ -1673,7 +1678,7 @@ class Xlsx extends BaseReader
                             if (isset($charts[$chartEntryRef])) {
                                 $chartPositionRef = $charts[$chartEntryRef]['sheet'] . '!' . $charts[$chartEntryRef]['id'];
                                 if (isset($chartDetails[$chartPositionRef])) {
-                                    $excel->getSheetByName($charts[$chartEntryRef]['sheet'])->addChart($objChart);
+                                    $excel->getSheetByName($charts[$chartEntryRef]['sheet'])->addChart($objChart); // @phpstan-ignore-line
                                     $objChart->setWorksheet($excel->getSheetByName($charts[$chartEntryRef]['sheet']));
                                     // For oneCellAnchor or absoluteAnchor positioned charts,
                                     //     toCoordinate is not in the data. Does it need to be calculated?
@@ -1721,28 +1726,29 @@ class Xlsx extends BaseReader
         if (isset($is->t)) {
             $value->createText(StringHelper::controlCharacterOOXML2PHP((string) $is->t));
         } else {
-            if (is_object($is->r)) {
+            if (isset($is->r) && is_object($is->r)) {
                 /** @var SimpleXMLElement $run */
                 foreach ($is->r as $run) {
                     if (!isset($run->rPr)) {
                         $value->createText(StringHelper::controlCharacterOOXML2PHP((string) $run->t));
                     } else {
                         $objText = $value->createTextRun(StringHelper::controlCharacterOOXML2PHP((string) $run->t));
+                        $objFont = $objText->getFont() ?? new StyleFont();
 
                         if (isset($run->rPr->rFont)) {
                             $attr = $run->rPr->rFont->attributes();
                             if (isset($attr['val'])) {
-                                $objText->getFont()->setName((string) $attr['val']);
+                                $objFont->setName((string) $attr['val']);
                             }
                         }
                         if (isset($run->rPr->sz)) {
                             $attr = $run->rPr->sz->attributes();
                             if (isset($attr['val'])) {
-                                $objText->getFont()->setSize((float) $attr['val']);
+                                $objFont->setSize((float) $attr['val']);
                             }
                         }
                         if (isset($run->rPr->color)) {
-                            $objText->getFont()->setColor(new Color($this->styleReader->readColor($run->rPr->color)));
+                            $objFont->setColor(new Color($this->styleReader->readColor($run->rPr->color)));
                         }
                         if (isset($run->rPr->b)) {
                             $attr = $run->rPr->b->attributes();
@@ -1750,7 +1756,7 @@ class Xlsx extends BaseReader
                                 (isset($attr['val']) && self::boolean((string) $attr['val'])) ||
                                 (!isset($attr['val']))
                             ) {
-                                $objText->getFont()->setBold(true);
+                                $objFont->setBold(true);
                             }
                         }
                         if (isset($run->rPr->i)) {
@@ -1759,7 +1765,7 @@ class Xlsx extends BaseReader
                                 (isset($attr['val']) && self::boolean((string) $attr['val'])) ||
                                 (!isset($attr['val']))
                             ) {
-                                $objText->getFont()->setItalic(true);
+                                $objFont->setItalic(true);
                             }
                         }
                         if (isset($run->rPr->vertAlign)) {
@@ -1767,19 +1773,19 @@ class Xlsx extends BaseReader
                             if (isset($attr['val'])) {
                                 $vertAlign = strtolower((string) $attr['val']);
                                 if ($vertAlign == 'superscript') {
-                                    $objText->getFont()->setSuperscript(true);
+                                    $objFont->setSuperscript(true);
                                 }
                                 if ($vertAlign == 'subscript') {
-                                    $objText->getFont()->setSubscript(true);
+                                    $objFont->setSubscript(true);
                                 }
                             }
                         }
                         if (isset($run->rPr->u)) {
                             $attr = $run->rPr->u->attributes();
                             if (!isset($attr['val'])) {
-                                $objText->getFont()->setUnderline(\PhpOffice\PhpSpreadsheet\Style\Font::UNDERLINE_SINGLE);
+                                $objFont->setUnderline(\PhpOffice\PhpSpreadsheet\Style\Font::UNDERLINE_SINGLE);
                             } else {
-                                $objText->getFont()->setUnderline((string) $attr['val']);
+                                $objFont->setUnderline((string) $attr['val']);
                             }
                         }
                         if (isset($run->rPr->strike)) {
@@ -1788,7 +1794,7 @@ class Xlsx extends BaseReader
                                 (isset($attr['val']) && self::boolean((string) $attr['val'])) ||
                                 (!isset($attr['val']))
                             ) {
-                                $objText->getFont()->setStrikethrough(true);
+                                $objFont->setStrikethrough(true);
                             }
                         }
                     }
@@ -1841,17 +1847,30 @@ class Xlsx extends BaseReader
         }
     }
 
+    /**
+     * @param null|array|bool|SimpleXMLElement $array
+     * @param int|string $key
+     *
+     * @return mixed
+     */
     private static function getArrayItem($array, $key = 0)
     {
-        return $array[$key] ?? null;
+        return ($array === null || is_bool($array)) ? null : ($array[$key] ?? null);
     }
 
+    /**
+     * @param null|SimpleXMLElement|string $base
+     * @param null|SimpleXMLElement|string $add
+     */
     private static function dirAdd($base, $add): string
     {
+        $base = (string) $base;
+        $add = (string) $add;
+
         return (string) preg_replace('~[^/]+/\.\./~', '', dirname($base) . "/$add");
     }
 
-    private static function toCSSArray($style): array
+    private static function toCSSArray(string $style): array
     {
         $style = self::stripWhiteSpaceFromStyleString($style);
 
@@ -1865,15 +1884,15 @@ class Xlsx extends BaseReader
             }
             if (strpos($item[1], 'pt') !== false) {
                 $item[1] = str_replace('pt', '', $item[1]);
-                $item[1] = Font::fontSizeToPixels($item[1]);
+                $item[1] = (string) Font::fontSizeToPixels((int) $item[1]);
             }
             if (strpos($item[1], 'in') !== false) {
                 $item[1] = str_replace('in', '', $item[1]);
-                $item[1] = Font::inchSizeToPixels($item[1]);
+                $item[1] = (string) Font::inchSizeToPixels((int) $item[1]);
             }
             if (strpos($item[1], 'cm') !== false) {
                 $item[1] = str_replace('cm', '', $item[1]);
-                $item[1] = Font::centimeterSizeToPixels($item[1]);
+                $item[1] = (string) Font::centimeterSizeToPixels((int) $item[1]);
             }
 
             $style[$item[0]] = $item[1];
@@ -1882,11 +1901,14 @@ class Xlsx extends BaseReader
         return $style;
     }
 
-    public static function stripWhiteSpaceFromStyleString($string): string
+    public static function stripWhiteSpaceFromStyleString(string $string): string
     {
         return trim(str_replace(["\r", "\n", ' '], '', $string), ';');
     }
 
+    /**
+     * @param mixed $value
+     */
     private static function boolean($value): bool
     {
         if (is_object($value)) {
@@ -1955,7 +1977,7 @@ class Xlsx extends BaseReader
         return $returnValue;
     }
 
-    private function readFormControlProperties(Spreadsheet $excel, $dir, $fileWorksheet, $docSheet, array &$unparsedLoadedData): void
+    private function readFormControlProperties(Spreadsheet $excel, string $dir, string $fileWorksheet, Worksheet $docSheet, array &$unparsedLoadedData): void
     {
         $zip = $this->zip;
         if (!$zip->locateName(dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')) {
@@ -1982,7 +2004,7 @@ class Xlsx extends BaseReader
         unset($unparsedCtrlProps);
     }
 
-    private function readPrinterSettings(Spreadsheet $excel, $dir, $fileWorksheet, $docSheet, array &$unparsedLoadedData): void
+    private function readPrinterSettings(Spreadsheet $excel, string $dir, string $fileWorksheet, Worksheet $docSheet, array &$unparsedLoadedData): void
     {
         $zip = $this->zip;
         if (!$zip->locateName(dirname("$dir/$fileWorksheet") . '/_rels/' . basename($fileWorksheet) . '.rels')) {
@@ -2070,7 +2092,7 @@ class Xlsx extends BaseReader
         if ($xmlSheet && $xmlSheet->autoFilter) {
             // In older files, autofilter structure is defined in the worksheet file
             (new AutoFilter($docSheet, $xmlSheet))->load();
-        } elseif ($xmlSheet && $xmlSheet->tableParts && $xmlSheet->tableParts['count'] > 0) {
+        } elseif ($xmlSheet && $xmlSheet->tableParts && (int) $xmlSheet->tableParts['count'] > 0) {
             // But for Office365, MS decided to make it all just a bit more complicated
             $this->readAutoFilterTablesInTablesFile($xmlSheet, $dir, $fileWorksheet, $zip, $docSheet);
         }
diff --git a/src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php b/src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php
index 374da9f6..623c6691 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php
@@ -9,8 +9,10 @@ use SimpleXMLElement;
 
 class AutoFilter
 {
+    /** @var Worksheet */
     private $worksheet;
 
+    /** @var SimpleXMLElement */
     private $worksheetXml;
 
     public function __construct(Worksheet $workSheet, SimpleXMLElement $worksheetXml)
@@ -28,7 +30,7 @@ class AutoFilter
         }
     }
 
-    private function readAutoFilter($autoFilterRange, $xmlSheet): void
+    private function readAutoFilter(string $autoFilterRange, SimpleXMLElement $xmlSheet): void
     {
         $autoFilter = $this->worksheet->getAutoFilter();
         $autoFilter->setRange($autoFilterRange);
@@ -39,15 +41,15 @@ class AutoFilter
             if ($filterColumn->filters) {
                 $column->setFilterType(Column::AUTOFILTER_FILTERTYPE_FILTER);
                 $filters = $filterColumn->filters;
-                if ((isset($filters['blank'])) && ($filters['blank'] == 1)) {
+                if ((isset($filters['blank'])) && ((int) $filters['blank'] == 1)) {
                     //    Operator is undefined, but always treated as EQUAL
-                    $column->createRule()->setRule(null, '')->setRuleType(Rule::AUTOFILTER_RULETYPE_FILTER);
+                    $column->createRule()->setRule('', '')->setRuleType(Rule::AUTOFILTER_RULETYPE_FILTER);
                 }
                 //    Standard filters are always an OR join, so no join rule needs to be set
                 //    Entries can be either filter elements
                 foreach ($filters->filter as $filterRule) {
                     //    Operator is undefined, but always treated as EQUAL
-                    $column->createRule()->setRule(null, (string) $filterRule['val'])->setRuleType(Rule::AUTOFILTER_RULETYPE_FILTER);
+                    $column->createRule()->setRule('', (string) $filterRule['val'])->setRuleType(Rule::AUTOFILTER_RULETYPE_FILTER);
                 }
 
                 //    Or Date Group elements
@@ -69,7 +71,7 @@ class AutoFilter
         foreach ($filters->dateGroupItem as $dateGroupItem) {
             //    Operator is undefined, but always treated as EQUAL
             $column->createRule()->setRule(
-                null,
+                '',
                 [
                     'year' => (string) $dateGroupItem['year'],
                     'month' => (string) $dateGroupItem['month'],
@@ -110,7 +112,7 @@ class AutoFilter
             foreach ($filterColumn->dynamicFilter as $filterRule) {
                 //    Operator is undefined, but always treated as EQUAL
                 $column->createRule()->setRule(
-                    null,
+                    '',
                     (string) $filterRule['val'],
                     (string) $filterRule['type']
                 )->setRuleType(Rule::AUTOFILTER_RULETYPE_DYNAMICFILTER);
diff --git a/src/PhpSpreadsheet/Reader/Xlsx/BaseParserClass.php b/src/PhpSpreadsheet/Reader/Xlsx/BaseParserClass.php
index 1679f01f..2f146458 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx/BaseParserClass.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx/BaseParserClass.php
@@ -4,7 +4,10 @@ namespace PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 
 class BaseParserClass
 {
-    protected static function boolean($value)
+    /**
+     * @param mixed $value
+     */
+    protected static function boolean($value): bool
     {
         if (is_object($value)) {
             $value = (string) $value;
diff --git a/src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php b/src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
index 2a1e2afd..34705733 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
@@ -10,8 +10,10 @@ use SimpleXMLElement;
 
 class ColumnAndRowAttributes extends BaseParserClass
 {
+    /** @var Worksheet */
     private $worksheet;
 
+    /** @var ?SimpleXMLElement */
     private $worksheetXml;
 
     public function __construct(Worksheet $workSheet, ?SimpleXMLElement $worksheetXml = null)
@@ -120,7 +122,7 @@ class ColumnAndRowAttributes extends BaseParserClass
         }
     }
 
-    private function isFilteredColumn(IReadFilter $readFilter, $columnCoordinate, array $rowsAttributes)
+    private function isFilteredColumn(IReadFilter $readFilter, string $columnCoordinate, array $rowsAttributes): bool
     {
         foreach ($rowsAttributes as $rowCoordinate => $rowAttributes) {
             if (!$readFilter->readCell($columnCoordinate, $rowCoordinate, $this->worksheet->getTitle())) {
@@ -131,7 +133,7 @@ class ColumnAndRowAttributes extends BaseParserClass
         return false;
     }
 
-    private function readColumnAttributes(SimpleXMLElement $worksheetCols, $readDataOnly)
+    private function readColumnAttributes(SimpleXMLElement $worksheetCols, bool $readDataOnly): array
     {
         $columnAttributes = [];
 
@@ -151,7 +153,7 @@ class ColumnAndRowAttributes extends BaseParserClass
         return $columnAttributes;
     }
 
-    private function readColumnRangeAttributes(SimpleXMLElement $column, $readDataOnly)
+    private function readColumnRangeAttributes(SimpleXMLElement $column, bool $readDataOnly): array
     {
         $columnAttributes = [];
 
@@ -172,7 +174,7 @@ class ColumnAndRowAttributes extends BaseParserClass
         return $columnAttributes;
     }
 
-    private function isFilteredRow(IReadFilter $readFilter, $rowCoordinate, array $columnsAttributes)
+    private function isFilteredRow(IReadFilter $readFilter, int $rowCoordinate, array $columnsAttributes): bool
     {
         foreach ($columnsAttributes as $columnCoordinate => $columnAttributes) {
             if (!$readFilter->readCell($columnCoordinate, $rowCoordinate, $this->worksheet->getTitle())) {
@@ -183,7 +185,7 @@ class ColumnAndRowAttributes extends BaseParserClass
         return false;
     }
 
-    private function readRowAttributes(SimpleXMLElement $worksheetRow, $readDataOnly)
+    private function readRowAttributes(SimpleXMLElement $worksheetRow, bool $readDataOnly): array
     {
         $rowAttributes = [];
 
diff --git a/src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php b/src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
index c631a0fe..7d947bac 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
@@ -10,11 +10,14 @@ use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\ConditionalFormatValueO
 use PhpOffice\PhpSpreadsheet\Style\Style as Style;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use SimpleXMLElement;
+use stdClass;
 
 class ConditionalStyles
 {
+    /** @var Worksheet */
     private $worksheet;
 
+    /** @var SimpleXMLElement */
     private $worksheetXml;
 
     /**
@@ -22,6 +25,7 @@ class ConditionalStyles
      */
     private $ns;
 
+    /** @var array */
     private $dxfs;
 
     public function __construct(Worksheet $workSheet, SimpleXMLElement $worksheetXml, array $dxfs = [])
@@ -146,7 +150,7 @@ class ConditionalStyles
         return $cfStyle;
     }
 
-    private function readConditionalStyles($xmlSheet): array
+    private function readConditionalStyles(SimpleXMLElement $xmlSheet): array
     {
         $conditionals = [];
         foreach ($xmlSheet->conditionalFormatting as $conditional) {
@@ -162,7 +166,7 @@ class ConditionalStyles
         return $conditionals;
     }
 
-    private function setConditionalStyles(Worksheet $worksheet, array $conditionals, $xmlExtLst): void
+    private function setConditionalStyles(Worksheet $worksheet, array $conditionals, SimpleXMLElement $xmlExtLst): void
     {
         foreach ($conditionals as $cellRangeReference => $cfRules) {
             ksort($cfRules);
@@ -176,7 +180,7 @@ class ConditionalStyles
         }
     }
 
-    private function readStyleRules($cfRules, $extLst)
+    private function readStyleRules(array $cfRules, SimpleXMLElement $extLst): array
     {
         $conditionalFormattingRuleExtensions = ConditionalFormattingRuleExtension::parseExtLstXml($extLst);
         $conditionalStyles = [];
@@ -213,7 +217,7 @@ class ConditionalStyles
 
             if (isset($cfRule->dataBar)) {
                 $objConditional->setDataBar(
-                    $this->readDataBarOfConditionalRule($cfRule, $conditionalFormattingRuleExtensions)
+                    $this->readDataBarOfConditionalRule($cfRule, $conditionalFormattingRuleExtensions) // @phpstan-ignore-line
                 );
             } else {
                 $objConditional->setStyle(clone $this->dxfs[(int) ($cfRule['dxfId'])]);
@@ -225,7 +229,10 @@ class ConditionalStyles
         return $conditionalStyles;
     }
 
-    private function readDataBarOfConditionalRule($cfRule, $conditionalFormattingRuleExtensions): ConditionalDataBar
+    /**
+     * @param SimpleXMLElement|stdClass $cfRule
+     */
+    private function readDataBarOfConditionalRule($cfRule, array $conditionalFormattingRuleExtensions): ConditionalDataBar
     {
         $dataBar = new ConditionalDataBar();
         //dataBar attribute
@@ -257,7 +264,10 @@ class ConditionalStyles
         return $dataBar;
     }
 
-    private function readDataBarExtLstOfConditionalRule(ConditionalDataBar $dataBar, $cfRule, $conditionalFormattingRuleExtensions): void
+    /**
+     * @param SimpleXMLElement|stdClass $cfRule
+     */
+    private function readDataBarExtLstOfConditionalRule(ConditionalDataBar $dataBar, $cfRule, array $conditionalFormattingRuleExtensions): void
     {
         if (isset($cfRule->extLst)) {
             $ns = $cfRule->extLst->getNamespaces(true);
diff --git a/src/PhpSpreadsheet/Reader/Xlsx/DataValidations.php b/src/PhpSpreadsheet/Reader/Xlsx/DataValidations.php
index b699cb57..dac76230 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx/DataValidations.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx/DataValidations.php
@@ -8,8 +8,10 @@ use SimpleXMLElement;
 
 class DataValidations
 {
+    /** @var Worksheet */
     private $worksheet;
 
+    /** @var SimpleXMLElement */
     private $worksheetXml;
 
     public function __construct(Worksheet $workSheet, SimpleXMLElement $worksheetXml)
@@ -22,7 +24,7 @@ class DataValidations
     {
         foreach ($this->worksheetXml->dataValidations->dataValidation as $dataValidation) {
             // Uppercase coordinate
-            $range = strtoupper($dataValidation['sqref']);
+            $range = strtoupper((string) $dataValidation['sqref']);
             $rangeSet = explode(' ', $range);
             foreach ($rangeSet as $range) {
                 $stRange = $this->worksheet->shrinkRangeToFit($range);
diff --git a/src/PhpSpreadsheet/Reader/Xlsx/Hyperlinks.php b/src/PhpSpreadsheet/Reader/Xlsx/Hyperlinks.php
index 84884996..7d48c796 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx/Hyperlinks.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx/Hyperlinks.php
@@ -9,8 +9,10 @@ use SimpleXMLElement;
 
 class Hyperlinks
 {
+    /** @var Worksheet */
     private $worksheet;
 
+    /** @var array */
     private $hyperlinks = [];
 
     public function __construct(Worksheet $workSheet)
diff --git a/src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php b/src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php
index 56f18f98..08decd6e 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php
@@ -8,8 +8,10 @@ use SimpleXMLElement;
 
 class PageSetup extends BaseParserClass
 {
+    /** @var Worksheet */
     private $worksheet;
 
+    /** @var ?SimpleXMLElement */
     private $worksheetXml;
 
     public function __construct(Worksheet $workSheet, ?SimpleXMLElement $worksheetXml = null)
@@ -18,16 +20,17 @@ class PageSetup extends BaseParserClass
         $this->worksheetXml = $worksheetXml;
     }
 
-    public function load(array $unparsedLoadedData)
+    public function load(array $unparsedLoadedData): array
     {
-        if (!$this->worksheetXml) {
+        $worksheetXml = $this->worksheetXml;
+        if ($worksheetXml === null) {
             return $unparsedLoadedData;
         }
 
-        $this->margins($this->worksheetXml, $this->worksheet);
-        $unparsedLoadedData = $this->pageSetup($this->worksheetXml, $this->worksheet, $unparsedLoadedData);
-        $this->headerFooter($this->worksheetXml, $this->worksheet);
-        $this->pageBreaks($this->worksheetXml, $this->worksheet);
+        $this->margins($worksheetXml, $this->worksheet);
+        $unparsedLoadedData = $this->pageSetup($worksheetXml, $this->worksheet, $unparsedLoadedData);
+        $this->headerFooter($worksheetXml, $this->worksheet);
+        $this->pageBreaks($worksheetXml, $this->worksheet);
 
         return $unparsedLoadedData;
     }
@@ -45,7 +48,7 @@ class PageSetup extends BaseParserClass
         }
     }
 
-    private function pageSetup(SimpleXMLElement $xmlSheet, Worksheet $worksheet, array $unparsedLoadedData)
+    private function pageSetup(SimpleXMLElement $xmlSheet, Worksheet $worksheet, array $unparsedLoadedData): array
     {
         if ($xmlSheet->pageSetup) {
             $docPageSetup = $worksheet->getPageSetup();
diff --git a/src/PhpSpreadsheet/Reader/Xlsx/SheetViewOptions.php b/src/PhpSpreadsheet/Reader/Xlsx/SheetViewOptions.php
index a302cc56..9c02da9f 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx/SheetViewOptions.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx/SheetViewOptions.php
@@ -7,8 +7,10 @@ use SimpleXMLElement;
 
 class SheetViewOptions extends BaseParserClass
 {
+    /** @var Worksheet */
     private $worksheet;
 
+    /** @var ?SimpleXMLElement */
     private $worksheetXml;
 
     public function __construct(Worksheet $workSheet, ?SimpleXMLElement $worksheetXml = null)
@@ -24,10 +26,11 @@ class SheetViewOptions extends BaseParserClass
         }
 
         if (isset($this->worksheetXml->sheetPr)) {
-            $this->tabColor($this->worksheetXml->sheetPr, $styleReader);
-            $this->codeName($this->worksheetXml->sheetPr);
-            $this->outlines($this->worksheetXml->sheetPr);
-            $this->pageSetup($this->worksheetXml->sheetPr);
+            $sheetPr = $this->worksheetXml->sheetPr;
+            $this->tabColor($sheetPr, $styleReader);
+            $this->codeName($sheetPr);
+            $this->outlines($sheetPr);
+            $this->pageSetup($sheetPr);
         }
 
         if (isset($this->worksheetXml->sheetFormatPr)) {

From adbda6391257041f4925c0f497bf0c17af0bfd67 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Sun, 4 Sep 2022 10:43:31 -0700
Subject: [PATCH 48/69] Phpstan and Xlsx Reader (#3043)

Eliminate most Phpstan messages in Xlsx Reader. In combination with similar changes to Xlsx Writer, baseline will shrink to just over 3,000 lines.
---
 samples/Chart/33_Chart_create_scatter2.php    |   6 +-
 samples/Chart/33_Chart_create_scatter3.php    |   6 +-
 .../33_Chart_create_scatter5_trendlines.php   |  18 +--
 src/PhpSpreadsheet/Chart/DataSeriesValues.php |  10 +-
 src/PhpSpreadsheet/Reader/Xlsx/Chart.php      |   4 +-
 src/PhpSpreadsheet/Shared/Font.php            |   2 +-
 src/PhpSpreadsheet/Shared/StringHelper.php    |  16 ++-
 src/PhpSpreadsheet/Style/Font.php             |   8 +-
 src/PhpSpreadsheet/Writer/Pdf/Dompdf.php      |   3 -
 src/PhpSpreadsheet/Writer/Xlsx/Chart.php      |   3 -
 .../Calculation/FormulaParserTest.php         |   2 +-
 .../Chart/AxisGlowTest.php                    |   6 +-
 .../Chart/AxisShadowTest.php                  |   6 +-
 .../Chart/GridlinesShadowGlowTest.php         |   6 +-
 .../Chart/Issue2506Test.php                   |   2 +-
 .../Chart/MultiplierTest.php                  |   4 +-
 .../Chart/ShadowPresetsTest.php               |   7 +-
 .../Reader/Xlsx/AutoFilter2Test.php           |  13 +-
 .../Reader/Xlsx/RibbonTest.php                |  10 +-
 tests/PhpSpreadsheetTests/RichTextTest.php    |   4 +-
 .../SpreadsheetCoverageTest.php               | 135 +++++++++---------
 .../Worksheet/ColumnCellIteratorTest.php      |   3 +
 .../Worksheet/RowCellIteratorTest.php         |   3 +
 23 files changed, 146 insertions(+), 131 deletions(-)

diff --git a/samples/Chart/33_Chart_create_scatter2.php b/samples/Chart/33_Chart_create_scatter2.php
index 59310620..cbc3ec1a 100644
--- a/samples/Chart/33_Chart_create_scatter2.php
+++ b/samples/Chart/33_Chart_create_scatter2.php
@@ -1,6 +1,6 @@
 <?php
 
-use PhpOffice\PhpSpreadsheet\Chart\Axis;
+use PhpOffice\PhpSpreadsheet\Chart\Axis as ChartAxis;
 use PhpOffice\PhpSpreadsheet\Chart\Chart;
 use PhpOffice\PhpSpreadsheet\Chart\ChartColor;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeries;
@@ -121,12 +121,12 @@ $dataSeriesValues[2] // triangle border
 $dataSeriesValues[2]->setScatterLines(false); // points not connected
 
 // Added so that Xaxis shows dates instead of Excel-equivalent-year1900-numbers
-$xAxis = new Axis();
+$xAxis = new ChartAxis();
 //$xAxis->setAxisNumberProperties(Properties::FORMAT_CODE_DATE );
 $xAxis->setAxisNumberProperties(Properties::FORMAT_CODE_DATE_ISO8601, true);
 $xAxis->setAxisOption('textRotation', '45');
 
-$yAxis = new Axis();
+$yAxis = new ChartAxis();
 $yAxis->setLineStyleProperties(
     2.5,     // width in points
     Properties::LINE_STYLE_COMPOUND_SIMPLE,
diff --git a/samples/Chart/33_Chart_create_scatter3.php b/samples/Chart/33_Chart_create_scatter3.php
index f6f9a6f4..899fca79 100644
--- a/samples/Chart/33_Chart_create_scatter3.php
+++ b/samples/Chart/33_Chart_create_scatter3.php
@@ -1,6 +1,6 @@
 <?php
 
-use PhpOffice\PhpSpreadsheet\Chart\Axis;
+use PhpOffice\PhpSpreadsheet\Chart\Axis as ChartAxis;
 use PhpOffice\PhpSpreadsheet\Chart\Chart;
 use PhpOffice\PhpSpreadsheet\Chart\ChartColor;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeries;
@@ -121,13 +121,13 @@ $dataSeriesValues[2] // triangle border
 $dataSeriesValues[2]->setScatterLines(false); // points not connected
 
 // Added so that Xaxis shows dates instead of Excel-equivalent-year1900-numbers
-$xAxis = new Axis();
+$xAxis = new ChartAxis();
 //$xAxis->setAxisNumberProperties(Properties::FORMAT_CODE_DATE );
 $xAxis->setAxisNumberProperties(Properties::FORMAT_CODE_DATE_ISO8601, true);
 $xAxis->setAxisOption('textRotation', '45');
 $xAxis->setAxisOption('hidden', '1');
 
-$yAxis = new Axis();
+$yAxis = new ChartAxis();
 $yAxis->setLineStyleProperties(
     2.5,     // width in points
     Properties::LINE_STYLE_COMPOUND_SIMPLE,
diff --git a/samples/Chart/33_Chart_create_scatter5_trendlines.php b/samples/Chart/33_Chart_create_scatter5_trendlines.php
index 5beb82cd..dcee3e14 100644
--- a/samples/Chart/33_Chart_create_scatter5_trendlines.php
+++ b/samples/Chart/33_Chart_create_scatter5_trendlines.php
@@ -1,6 +1,6 @@
 <?php
 
-use PhpOffice\PhpSpreadsheet\Chart\Axis;
+use PhpOffice\PhpSpreadsheet\Chart\Axis as ChartAxis;
 use PhpOffice\PhpSpreadsheet\Chart\Chart;
 use PhpOffice\PhpSpreadsheet\Chart\ChartColor;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeries;
@@ -77,10 +77,10 @@ $dataSeriesValues = [
 // marker details
 $dataSeriesValues[0]
     ->getMarkerFillColor()
-    ->setColorProperties('0070C0', null, ChartColor::EXCEL_COLOR_TYPE_ARGB);
+    ->setColorProperties('0070C0', null, ChartColor::EXCEL_COLOR_TYPE_RGB);
 $dataSeriesValues[0]
     ->getMarkerBorderColor()
-    ->setColorProperties('002060', null, ChartColor::EXCEL_COLOR_TYPE_ARGB);
+    ->setColorProperties('002060', null, ChartColor::EXCEL_COLOR_TYPE_RGB);
 
 // line details - dashed, smooth line (Bezier) with arrows, 40% transparent
 $dataSeriesValues[0]
@@ -105,24 +105,24 @@ $dataSeriesValues[1] // square marker border color
     ->setColorProperties('accent6', 3, ChartColor::EXCEL_COLOR_TYPE_SCHEME);
 $dataSeriesValues[1] // square marker fill color
     ->getMarkerFillColor()
-    ->setColorProperties('0FFF00', null, ChartColor::EXCEL_COLOR_TYPE_ARGB);
+    ->setColorProperties('0FFF00', null, ChartColor::EXCEL_COLOR_TYPE_RGB);
 $dataSeriesValues[1]
     ->setScatterLines(true)
     ->setSmoothLine(false)
-    ->setLineColorProperties('FF0000', 80, ChartColor::EXCEL_COLOR_TYPE_ARGB);
+    ->setLineColorProperties('FF0000', 80, ChartColor::EXCEL_COLOR_TYPE_RGB);
 $dataSeriesValues[1]->setLineWidth(2.0);
 
 // series 3 - metric3, markers, no line
 $dataSeriesValues[2] // triangle? fill
     //->setPointMarker('triangle') // let Excel choose shape, which is predicted to be a triangle
     ->getMarkerFillColor()
-    ->setColorProperties('FFFF00', null, ChartColor::EXCEL_COLOR_TYPE_ARGB);
+    ->setColorProperties('FFFF00', null, ChartColor::EXCEL_COLOR_TYPE_RGB);
 $dataSeriesValues[2] // triangle border
     ->getMarkerBorderColor()
     ->setColorProperties('accent4', null, ChartColor::EXCEL_COLOR_TYPE_SCHEME);
 $dataSeriesValues[2]->setScatterLines(false); // points not connected
 // Added so that Xaxis shows dates instead of Excel-equivalent-year1900-numbers
-$xAxis = new Axis();
+$xAxis = new ChartAxis();
 $xAxis->setAxisNumberProperties(Properties::FORMAT_CODE_DATE_ISO8601, true);
 
 // Build the dataseries
@@ -204,7 +204,7 @@ $dataSeriesValues[0]->setTrendLines($trendLines);
 
 $dataSeriesValues[0]->setScatterLines(false); // points not connected
 $dataSeriesValues[0]->getMarkerFillColor()
-    ->setColorProperties('FFFF00', null, ChartColor::EXCEL_COLOR_TYPE_ARGB);
+    ->setColorProperties('FFFF00', null, ChartColor::EXCEL_COLOR_TYPE_RGB);
 $dataSeriesValues[0]->getMarkerBorderColor()
     ->setColorProperties('accent4', null, ChartColor::EXCEL_COLOR_TYPE_SCHEME);
 
@@ -218,7 +218,7 @@ $dataSeriesValues[0]->getTrendLines()[1]->setLineStyleProperties(1.25);
 $dataSeriesValues[0]->getTrendLines()[2]->getLineColor()->setColorProperties('accent2', null, ChartColor::EXCEL_COLOR_TYPE_SCHEME);
 $dataSeriesValues[0]->getTrendLines()[2]->setLineStyleProperties(1.5, null, null, null, null, null, null, Properties::LINE_STYLE_ARROW_TYPE_OPEN, 8);
 
-$xAxis = new Axis();
+$xAxis = new ChartAxis();
 $xAxis->setAxisNumberProperties(Properties::FORMAT_CODE_DATE_ISO8601); // m/d/yyyy
 
 // Build the dataseries
diff --git a/src/PhpSpreadsheet/Chart/DataSeriesValues.php b/src/PhpSpreadsheet/Chart/DataSeriesValues.php
index 7d29e9c4..cd166b23 100644
--- a/src/PhpSpreadsheet/Chart/DataSeriesValues.php
+++ b/src/PhpSpreadsheet/Chart/DataSeriesValues.php
@@ -324,13 +324,13 @@ class DataSeriesValues extends Properties
         if (is_array($this->fillColor)) {
             $array = [];
             foreach ($this->fillColor as $chartColor) {
-                $array[] = self::chartColorToString($chartColor);
+                $array[] = $this->chartColorToString($chartColor);
             }
 
             return $array;
         }
 
-        return self::chartColorToString($this->fillColor);
+        return $this->chartColorToString($this->fillColor);
     }
 
     /**
@@ -348,13 +348,13 @@ class DataSeriesValues extends Properties
                 if ($fillString instanceof ChartColor) {
                     $this->fillColor[] = $fillString;
                 } else {
-                    $this->fillColor[] = self::stringToChartColor($fillString);
+                    $this->fillColor[] = $this->stringToChartColor($fillString);
                 }
             }
         } elseif ($color instanceof ChartColor) {
             $this->fillColor = $color;
-        } elseif (is_string($color)) {
-            $this->fillColor = self::stringToChartColor($color);
+        } else {
+            $this->fillColor = $this->stringToChartColor($color);
         }
 
         return $this;
diff --git a/src/PhpSpreadsheet/Reader/Xlsx/Chart.php b/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
index 9eb30256..507c8f5b 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
@@ -311,7 +311,7 @@ class Chart
                                             break;
                                         case 'stockChart':
                                             $plotSeries[] = $this->chartDataSeries($chartDetail, $chartDetailKey);
-                                            $plotAttributes = $this->readChartAttributes($plotAreaLayout);
+                                            $plotAttributes = $this->readChartAttributes($chartDetail);
 
                                             break;
                                     }
@@ -1068,7 +1068,7 @@ class Chart
     }
 
     /**
-     * @param null|Layout|SimpleXMLElement $chartDetail
+     * @param ?SimpleXMLElement $chartDetail
      */
     private function readChartAttributes($chartDetail): array
     {
diff --git a/src/PhpSpreadsheet/Shared/Font.php b/src/PhpSpreadsheet/Shared/Font.php
index 33796b4c..e90c679b 100644
--- a/src/PhpSpreadsheet/Shared/Font.php
+++ b/src/PhpSpreadsheet/Shared/Font.php
@@ -349,7 +349,7 @@ class Font
 
         // Special case if there are one or more newline characters ("\n")
         $cellText = $cellText ?? '';
-        if (strpos($cellText, "\n") !== false) {
+        if (strpos(/** @scrutinizer ignore-type */ $cellText, "\n") !== false) {
             $lineTexts = explode("\n", $cellText);
             $lineWidths = [];
             foreach ($lineTexts as $lineText) {
diff --git a/src/PhpSpreadsheet/Shared/StringHelper.php b/src/PhpSpreadsheet/Shared/StringHelper.php
index 0fe10e4d..16026c3c 100644
--- a/src/PhpSpreadsheet/Shared/StringHelper.php
+++ b/src/PhpSpreadsheet/Shared/StringHelper.php
@@ -337,9 +337,19 @@ class StringHelper
         mb_substitute_character(65533); // Unicode substitution character
         // Phpstan does not think this can return false.
         $returnValue = mb_convert_encoding($textValue, 'UTF-8', 'UTF-8');
-        mb_substitute_character($subst);
+        mb_substitute_character(/** @scrutinizer ignore-type */ $subst);
 
-        return $returnValue;
+        return self::returnString($returnValue);
+    }
+
+    /**
+     * Strictly to satisfy Scrutinizer.
+     *
+     * @param mixed $value
+     */
+    private static function returnString($value): string
+    {
+        return is_string($value) ? $value : '';
     }
 
     /**
@@ -433,7 +443,7 @@ class StringHelper
             }
         }
 
-        return mb_convert_encoding($textValue, $to, $from);
+        return self::returnString(mb_convert_encoding($textValue, $to, $from));
     }
 
     /**
diff --git a/src/PhpSpreadsheet/Style/Font.php b/src/PhpSpreadsheet/Style/Font.php
index 19d67563..3d7bc1bc 100644
--- a/src/PhpSpreadsheet/Style/Font.php
+++ b/src/PhpSpreadsheet/Style/Font.php
@@ -743,14 +743,14 @@ class Font extends Supervisor
 
     private function hashChartColor(?ChartColor $underlineColor): string
     {
-        if ($this->underlineColor === null) {
+        if ($underlineColor === null) {
             return '';
         }
 
         return
-            $this->underlineColor->getValue()
-            . $this->underlineColor->getType()
-            . (string) $this->underlineColor->getAlpha();
+            $underlineColor->getValue()
+            . $underlineColor->getType()
+            . (string) $underlineColor->getAlpha();
     }
 
     /**
diff --git a/src/PhpSpreadsheet/Writer/Pdf/Dompdf.php b/src/PhpSpreadsheet/Writer/Pdf/Dompdf.php
index cd17cccf..690b0c54 100644
--- a/src/PhpSpreadsheet/Writer/Pdf/Dompdf.php
+++ b/src/PhpSpreadsheet/Writer/Pdf/Dompdf.php
@@ -33,9 +33,6 @@ class Dompdf extends Pdf
     {
         $fileHandle = parent::prepareForSave($filename);
 
-        //  Default PDF paper size
-        $paperSize = 'LETTER'; //    Letter    (8.5 in. by 11 in.)
-
         //  Check for paper size and page orientation
         $setup = $this->spreadsheet->getSheet($this->getSheetIndex() ?? 0)->getPageSetup();
         $orientation = $this->getOrientation() ?? $setup->getOrientation();
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Chart.php b/src/PhpSpreadsheet/Writer/Xlsx/Chart.php
index 8dab9529..3b64bd8e 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/Chart.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/Chart.php
@@ -233,8 +233,6 @@ class Chart extends WriterPart
         if ($plotArea === null) {
             return;
         }
-        $majorGridlines = ($yAxis === null) ? null : $yAxis->getMajorGridlines();
-        $minorGridlines = ($yAxis === null) ? null : $yAxis->getMinorGridlines();
 
         $id1 = $id2 = $id3 = '0';
         $this->seriesIndex = 0;
@@ -1163,7 +1161,6 @@ class Chart extends WriterPart
                     $intercept = $trendLine->getIntercept();
                     $name = $trendLine->getName();
                     $trendLineColor = $trendLine->getLineColor(); // ChartColor
-                    $trendLineWidth = $trendLine->getLineStyleProperty('width');
 
                     $objWriter->startElement('c:trendline'); // N.B. lowercase 'ell'
                     if ($name !== '') {
diff --git a/tests/PhpSpreadsheetTests/Calculation/FormulaParserTest.php b/tests/PhpSpreadsheetTests/Calculation/FormulaParserTest.php
index 4682c6b2..d401f9c9 100644
--- a/tests/PhpSpreadsheetTests/Calculation/FormulaParserTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/FormulaParserTest.php
@@ -12,7 +12,7 @@ class FormulaParserTest extends TestCase
     {
         $this->expectException(CalcException::class);
         $this->expectExceptionMessage('Invalid parameter passed: formula');
-        $result = new FormulaParser(null);
+        new FormulaParser(null);
     }
 
     public function testInvalidTokenId(): void
diff --git a/tests/PhpSpreadsheetTests/Chart/AxisGlowTest.php b/tests/PhpSpreadsheetTests/Chart/AxisGlowTest.php
index 0ed4a1b4..b14d63fb 100644
--- a/tests/PhpSpreadsheetTests/Chart/AxisGlowTest.php
+++ b/tests/PhpSpreadsheetTests/Chart/AxisGlowTest.php
@@ -3,11 +3,11 @@
 namespace PhpOffice\PhpSpreadsheetTests\Chart;
 
 use PhpOffice\PhpSpreadsheet\Chart\Chart;
+use PhpOffice\PhpSpreadsheet\Chart\ChartColor;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeries;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeriesValues;
 use PhpOffice\PhpSpreadsheet\Chart\Legend as ChartLegend;
 use PhpOffice\PhpSpreadsheet\Chart\PlotArea;
-use PhpOffice\PhpSpreadsheet\Chart\Properties;
 use PhpOffice\PhpSpreadsheet\Chart\Title;
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx as XlsxReader;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
@@ -107,7 +107,7 @@ class AxisGlowTest extends AbstractFunctional
         $yAxis = $chart->getChartAxisY();
         $xAxis = $chart->getChartAxisX();
         $yGlowSize = 10.0;
-        $yAxis->setGlowProperties($yGlowSize, 'FFFF00', 30, Properties::EXCEL_COLOR_TYPE_ARGB);
+        $yAxis->setGlowProperties($yGlowSize, 'FFFF00', 30, ChartColor::EXCEL_COLOR_TYPE_RGB);
         $expectedGlowColor = [
             'type' => 'srgbClr',
             'value' => 'FFFF00',
@@ -231,7 +231,7 @@ class AxisGlowTest extends AbstractFunctional
         );
         $yAxis = $chart->getChartAxisX(); // deliberate
         $yGlowSize = 20.0;
-        $yAxis->setGlowProperties($yGlowSize, 'accent1', 20, Properties::EXCEL_COLOR_TYPE_SCHEME);
+        $yAxis->setGlowProperties($yGlowSize, 'accent1', 20, ChartColor::EXCEL_COLOR_TYPE_SCHEME);
         $expectedGlowColor = [
             'type' => 'schemeClr',
             'value' => 'accent1',
diff --git a/tests/PhpSpreadsheetTests/Chart/AxisShadowTest.php b/tests/PhpSpreadsheetTests/Chart/AxisShadowTest.php
index d6f122ef..78deece4 100644
--- a/tests/PhpSpreadsheetTests/Chart/AxisShadowTest.php
+++ b/tests/PhpSpreadsheetTests/Chart/AxisShadowTest.php
@@ -3,11 +3,11 @@
 namespace PhpOffice\PhpSpreadsheetTests\Chart;
 
 use PhpOffice\PhpSpreadsheet\Chart\Chart;
+use PhpOffice\PhpSpreadsheet\Chart\ChartColor;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeries;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeriesValues;
 use PhpOffice\PhpSpreadsheet\Chart\Legend as ChartLegend;
 use PhpOffice\PhpSpreadsheet\Chart\PlotArea;
-use PhpOffice\PhpSpreadsheet\Chart\Properties;
 use PhpOffice\PhpSpreadsheet\Chart\Title;
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx as XlsxReader;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
@@ -113,7 +113,7 @@ class AxisShadowTest extends AbstractFunctional
             'distance' => 3,
             'rotWithShape' => 0,
             'color' => [
-                'type' => Properties::EXCEL_COLOR_TYPE_STANDARD,
+                'type' => ChartColor::EXCEL_COLOR_TYPE_STANDARD,
                 'value' => 'black',
                 'alpha' => 40,
             ],
@@ -139,7 +139,7 @@ class AxisShadowTest extends AbstractFunctional
                 'ky' => null,
             ],
             'color' => [
-                'type' => Properties::EXCEL_COLOR_TYPE_ARGB,
+                'type' => ChartColor::EXCEL_COLOR_TYPE_RGB,
                 'value' => 'FF0000',
                 'alpha' => 20,
             ],
diff --git a/tests/PhpSpreadsheetTests/Chart/GridlinesShadowGlowTest.php b/tests/PhpSpreadsheetTests/Chart/GridlinesShadowGlowTest.php
index e2c91eba..e1215441 100644
--- a/tests/PhpSpreadsheetTests/Chart/GridlinesShadowGlowTest.php
+++ b/tests/PhpSpreadsheetTests/Chart/GridlinesShadowGlowTest.php
@@ -4,12 +4,12 @@ namespace PhpOffice\PhpSpreadsheetTests\Chart;
 
 use PhpOffice\PhpSpreadsheet\Chart\Axis;
 use PhpOffice\PhpSpreadsheet\Chart\Chart;
+use PhpOffice\PhpSpreadsheet\Chart\ChartColor;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeries;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeriesValues;
 use PhpOffice\PhpSpreadsheet\Chart\GridLines;
 use PhpOffice\PhpSpreadsheet\Chart\Legend as ChartLegend;
 use PhpOffice\PhpSpreadsheet\Chart\PlotArea;
-use PhpOffice\PhpSpreadsheet\Chart\Properties;
 use PhpOffice\PhpSpreadsheet\Chart\Title;
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx as XlsxReader;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
@@ -98,7 +98,7 @@ class GridlinesShadowGlowTest extends AbstractFunctional
         $majorGridlines = new GridLines();
         $yAxis->setMajorGridlines($majorGridlines);
         $majorGlowSize = 10.0;
-        $majorGridlines->setGlowProperties($majorGlowSize, 'FFFF00', 30, Properties::EXCEL_COLOR_TYPE_ARGB);
+        $majorGridlines->setGlowProperties($majorGlowSize, 'FFFF00', 30, ChartColor::EXCEL_COLOR_TYPE_RGB);
         $softEdgeSize = 2.5;
         $majorGridlines->setSoftEdges($softEdgeSize);
         $expectedGlowColor = [
@@ -122,7 +122,7 @@ class GridlinesShadowGlowTest extends AbstractFunctional
             'distance' => 3,
             'rotWithShape' => 0,
             'color' => [
-                'type' => Properties::EXCEL_COLOR_TYPE_STANDARD,
+                'type' => ChartColor::EXCEL_COLOR_TYPE_STANDARD,
                 'value' => 'black',
                 'alpha' => 40,
             ],
diff --git a/tests/PhpSpreadsheetTests/Chart/Issue2506Test.php b/tests/PhpSpreadsheetTests/Chart/Issue2506Test.php
index a2a14c9d..e1c30770 100644
--- a/tests/PhpSpreadsheetTests/Chart/Issue2506Test.php
+++ b/tests/PhpSpreadsheetTests/Chart/Issue2506Test.php
@@ -23,7 +23,7 @@ class Issue2506Test extends AbstractFunctional
     public function testDataSeriesValues(): void
     {
         $reader = new XlsxReader();
-        self::readCharts($reader);
+        $this->readCharts($reader);
         $spreadsheet = $reader->load(self::DIRECTORY . 'issue.2506.xlsx');
         $worksheet = $spreadsheet->getActiveSheet();
         $charts = $worksheet->getChartCollection();
diff --git a/tests/PhpSpreadsheetTests/Chart/MultiplierTest.php b/tests/PhpSpreadsheetTests/Chart/MultiplierTest.php
index 35161ff7..db602e8a 100644
--- a/tests/PhpSpreadsheetTests/Chart/MultiplierTest.php
+++ b/tests/PhpSpreadsheetTests/Chart/MultiplierTest.php
@@ -3,11 +3,11 @@
 namespace PhpOffice\PhpSpreadsheetTests\Chart;
 
 use PhpOffice\PhpSpreadsheet\Chart\Chart;
+use PhpOffice\PhpSpreadsheet\Chart\ChartColor;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeries;
 use PhpOffice\PhpSpreadsheet\Chart\DataSeriesValues;
 use PhpOffice\PhpSpreadsheet\Chart\Legend as ChartLegend;
 use PhpOffice\PhpSpreadsheet\Chart\PlotArea;
-use PhpOffice\PhpSpreadsheet\Chart\Properties;
 use PhpOffice\PhpSpreadsheet\Chart\Title;
 use PhpOffice\PhpSpreadsheet\Shared\File;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
@@ -109,7 +109,7 @@ class MultiplierTest extends TestCase
                 'ky' => null,
             ],
             'color' => [
-                'type' => Properties::EXCEL_COLOR_TYPE_ARGB,
+                'type' => ChartColor::EXCEL_COLOR_TYPE_RGB,
                 'value' => 'FF0000',
                 'alpha' => 20,
             ],
diff --git a/tests/PhpSpreadsheetTests/Chart/ShadowPresetsTest.php b/tests/PhpSpreadsheetTests/Chart/ShadowPresetsTest.php
index e96d6c14..20cacbc1 100644
--- a/tests/PhpSpreadsheetTests/Chart/ShadowPresetsTest.php
+++ b/tests/PhpSpreadsheetTests/Chart/ShadowPresetsTest.php
@@ -3,6 +3,7 @@
 namespace PhpOffice\PhpSpreadsheetTests\Chart;
 
 use PhpOffice\PhpSpreadsheet\Chart\Axis;
+use PhpOffice\PhpSpreadsheet\Chart\ChartColor;
 use PhpOffice\PhpSpreadsheet\Chart\GridLines;
 use PhpOffice\PhpSpreadsheet\Chart\Properties;
 use PHPUnit\Framework\TestCase;
@@ -131,7 +132,7 @@ class ShadowPresetsTest extends TestCase
             'presets' => Properties::SHADOW_PRESETS_NOSHADOW,
             'effect' => null,
             'color' => [
-                'type' => Properties::EXCEL_COLOR_TYPE_STANDARD,
+                'type' => ChartColor::EXCEL_COLOR_TYPE_STANDARD,
                 'value' => 'black',
                 'alpha' => 40,
             ],
@@ -160,7 +161,7 @@ class ShadowPresetsTest extends TestCase
             'presets' => Properties::SHADOW_PRESETS_NOSHADOW,
             'effect' => null,
             'color' => [
-                'type' => Properties::EXCEL_COLOR_TYPE_STANDARD,
+                'type' => ChartColor::EXCEL_COLOR_TYPE_STANDARD,
                 'value' => 'black',
                 'alpha' => 40,
             ],
@@ -189,7 +190,7 @@ class ShadowPresetsTest extends TestCase
             'presets' => Properties::SHADOW_PRESETS_NOSHADOW,
             'effect' => null,
             'color' => [
-                'type' => Properties::EXCEL_COLOR_TYPE_STANDARD,
+                'type' => ChartColor::EXCEL_COLOR_TYPE_STANDARD,
                 'value' => 'black',
                 'alpha' => 40,
             ],
diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/AutoFilter2Test.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/AutoFilter2Test.php
index 6d6949d8..0bb9f130 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xlsx/AutoFilter2Test.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/AutoFilter2Test.php
@@ -11,12 +11,14 @@ class AutoFilter2Test extends TestCase
 {
     private const TESTBOOK = 'tests/data/Reader/XLSX/autofilter2.xlsx';
 
-    public function getVisibleSheet(Worksheet $sheet, int $maxRow): array
+    public function getVisibleSheet(?Worksheet $sheet, int $maxRow): array
     {
         $actualVisible = [];
-        for ($row = 2; $row <= $maxRow; ++$row) {
-            if ($sheet->getRowDimension($row)->getVisible()) {
-                $actualVisible[] = $row;
+        if ($sheet !== null) {
+            for ($row = 2; $row <= $maxRow; ++$row) {
+                if ($sheet->getRowDimension($row)->getVisible()) {
+                    $actualVisible[] = $row;
+                }
             }
         }
 
@@ -35,13 +37,14 @@ class AutoFilter2Test extends TestCase
         self::assertCount(1, $columns);
         $column = $columns['A'] ?? null;
         self::assertNotNull($column);
+        /** @scrutinizer ignore-call */
         $ruleset = $column->getRules();
         self::assertCount(1, $ruleset);
         $rule = $ruleset[0];
         self::assertSame(Rule::AUTOFILTER_RULETYPE_DATEGROUP, $rule->getRuleType());
         $value = $rule->getValue();
         self::assertIsArray($value);
-        self::assertCount(6, $value);
+        self::assertCount(6, /** @scrutinizer ignore-type */ $value);
         self::assertSame('2002', $value['year']);
         self::assertSame('', $value['month']);
         self::assertSame('', $value['day']);
diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/RibbonTest.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/RibbonTest.php
index ab304e7b..68b3bb01 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xlsx/RibbonTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/RibbonTest.php
@@ -24,14 +24,14 @@ class RibbonTest extends AbstractFunctional
         self::assertSame('customUI/customUI.xml', $target);
         $data = $spreadsheet->getRibbonXMLData('data');
         self::assertIsString($data);
-        self::assertSame(1522, strlen($data));
+        self::assertSame(1522, strlen(/** @scrutinizer ignore-type */ $data));
         $vbaCode = (string) $spreadsheet->getMacrosCode();
         self::assertSame(13312, strlen($vbaCode));
         self::assertNull($spreadsheet->getRibbonBinObjects());
-        self::assertNull($spreadsheet->getRibbonBinObjects('names'));
-        self::assertNull($spreadsheet->getRibbonBinObjects('data'));
+        foreach (['names', 'data', 'xxxxx'] as $type) {
+            self::assertNull($spreadsheet->getRibbonBinObjects($type), "Expecting null when type is $type");
+        }
         self::assertEmpty($spreadsheet->getRibbonBinObjects('types'));
-        self::assertNull($spreadsheet->getRibbonBinObjects('xxxxx'));
 
         $reloadedSpreadsheet = $this->writeAndReload($spreadsheet, 'Xlsx');
         $spreadsheet->disconnectWorksheets();
@@ -58,7 +58,7 @@ class RibbonTest extends AbstractFunctional
         self::assertSame('customUI/customUI.xml', $target);
         $data = $spreadsheet->getRibbonXMLData('data');
         self::assertIsString($data);
-        self::assertSame(1522, strlen($data));
+        self::assertSame(1522, strlen(/** @scrutinizer ignore-type */ $data));
         $vbaCode = (string) $spreadsheet->getMacrosCode();
         self::assertSame(13312, strlen($vbaCode));
         $spreadsheet->discardMacros();
diff --git a/tests/PhpSpreadsheetTests/RichTextTest.php b/tests/PhpSpreadsheetTests/RichTextTest.php
index e2dfcce7..49878529 100644
--- a/tests/PhpSpreadsheetTests/RichTextTest.php
+++ b/tests/PhpSpreadsheetTests/RichTextTest.php
@@ -28,7 +28,9 @@ class RichTextTest extends TestCase
     public function testTextElements(): void
     {
         $element1 = new TextElement('A');
-        self::assertNull($element1->getFont());
+        if ($element1->getFont() !== null) {
+            self::fail('Expected font to be null');
+        }
         $element2 = new TextElement('B');
         $element3 = new TextElement('C');
         $richText = new RichText();
diff --git a/tests/PhpSpreadsheetTests/SpreadsheetCoverageTest.php b/tests/PhpSpreadsheetTests/SpreadsheetCoverageTest.php
index 584c53fe..a455a7d2 100644
--- a/tests/PhpSpreadsheetTests/SpreadsheetCoverageTest.php
+++ b/tests/PhpSpreadsheetTests/SpreadsheetCoverageTest.php
@@ -9,81 +9,93 @@ use PHPUnit\Framework\TestCase;
 
 class SpreadsheetCoverageTest extends TestCase
 {
+    /** @var ?Spreadsheet */
+    private $spreadsheet;
+
+    /** @var ?Spreadsheet */
+    private $spreadsheet2;
+
+    protected function tearDown(): void
+    {
+        if ($this->spreadsheet !== null) {
+            $this->spreadsheet->disconnectWorksheets();
+            $this->spreadsheet = null;
+        }
+        if ($this->spreadsheet2 !== null) {
+            $this->spreadsheet2->disconnectWorksheets();
+            $this->spreadsheet2 = null;
+        }
+    }
+
     public function testDocumentProperties(): void
     {
-        $spreadsheet = new Spreadsheet();
-        $properties = $spreadsheet->getProperties();
+        $this->spreadsheet = new Spreadsheet();
+        $properties = $this->spreadsheet->getProperties();
         $properties->setCreator('Anyone');
         $properties->setTitle('Description');
-        $spreadsheet2 = new Spreadsheet();
-        self::assertNotEquals($properties, $spreadsheet2->getProperties());
+        $this->spreadsheet2 = new Spreadsheet();
+        self::assertNotEquals($properties, $this->spreadsheet2->getProperties());
         $properties2 = clone $properties;
-        $spreadsheet2->setProperties($properties2);
-        self::assertEquals($properties, $spreadsheet2->getProperties());
-        $spreadsheet->disconnectWorksheets();
-        $spreadsheet2->disconnectWorksheets();
+        $this->spreadsheet2->setProperties($properties2);
+        self::assertEquals($properties, $this->spreadsheet2->getProperties());
     }
 
     public function testDocumentSecurity(): void
     {
-        $spreadsheet = new Spreadsheet();
-        $security = $spreadsheet->getSecurity();
+        $this->spreadsheet = new Spreadsheet();
+        $security = $this->spreadsheet->getSecurity();
         $security->setLockRevision(true);
         $revisionsPassword = 'revpasswd';
         $security->setRevisionsPassword($revisionsPassword);
-        $spreadsheet2 = new Spreadsheet();
-        self::assertNotEquals($security, $spreadsheet2->getSecurity());
+        $this->spreadsheet2 = new Spreadsheet();
+        self::assertNotEquals($security, $this->spreadsheet2->getSecurity());
         $security2 = clone $security;
-        $spreadsheet2->setSecurity($security2);
-        self::assertEquals($security, $spreadsheet2->getSecurity());
-        $spreadsheet->disconnectWorksheets();
-        $spreadsheet2->disconnectWorksheets();
+        $this->spreadsheet2->setSecurity($security2);
+        self::assertEquals($security, $this->spreadsheet2->getSecurity());
     }
 
     public function testCellXfCollection(): void
     {
-        $spreadsheet = new Spreadsheet();
-        $sheet = $spreadsheet->getActiveSheet();
+        $this->spreadsheet = new Spreadsheet();
+        $sheet = $this->spreadsheet->getActiveSheet();
         $sheet->getStyle('A1')->getFont()->setName('font1');
         $sheet->getStyle('A2')->getFont()->setName('font2');
         $sheet->getStyle('A3')->getFont()->setName('font3');
         $sheet->getStyle('B1')->getFont()->setName('font1');
         $sheet->getStyle('B2')->getFont()->setName('font2');
-        $collection = $spreadsheet->getCellXfCollection();
+        $collection = $this->spreadsheet->getCellXfCollection();
         self::assertCount(4, $collection);
         $font1Style = $collection[1];
-        self::assertTrue($spreadsheet->cellXfExists($font1Style));
-        self::assertSame('font1', $spreadsheet->getCellXfCollection()[1]->getFont()->getName());
+        self::assertTrue($this->spreadsheet->cellXfExists($font1Style));
+        self::assertSame('font1', $this->spreadsheet->getCellXfCollection()[1]->getFont()->getName());
         self::assertSame('font1', $sheet->getStyle('A1')->getFont()->getName());
         self::assertSame('font2', $sheet->getStyle('A2')->getFont()->getName());
         self::assertSame('font3', $sheet->getStyle('A3')->getFont()->getName());
         self::assertSame('font1', $sheet->getStyle('B1')->getFont()->getName());
         self::assertSame('font2', $sheet->getStyle('B2')->getFont()->getName());
 
-        $spreadsheet->removeCellXfByIndex(1);
-        self::assertFalse($spreadsheet->cellXfExists($font1Style));
-        self::assertSame('font2', $spreadsheet->getCellXfCollection()[1]->getFont()->getName());
+        $this->spreadsheet->removeCellXfByIndex(1);
+        self::assertFalse($this->spreadsheet->cellXfExists($font1Style));
+        self::assertSame('font2', $this->spreadsheet->getCellXfCollection()[1]->getFont()->getName());
         self::assertSame('Calibri', $sheet->getStyle('A1')->getFont()->getName());
         self::assertSame('font2', $sheet->getStyle('A2')->getFont()->getName());
         self::assertSame('font3', $sheet->getStyle('A3')->getFont()->getName());
         self::assertSame('Calibri', $sheet->getStyle('B1')->getFont()->getName());
         self::assertSame('font2', $sheet->getStyle('B2')->getFont()->getName());
-        $spreadsheet->disconnectWorksheets();
     }
 
     public function testInvalidRemoveCellXfByIndex(): void
     {
         $this->expectException(SSException::class);
         $this->expectExceptionMessage('CellXf index is out of bounds.');
-        $spreadsheet = new Spreadsheet();
-        $sheet = $spreadsheet->getActiveSheet();
+        $this->spreadsheet = new Spreadsheet();
+        $sheet = $this->spreadsheet->getActiveSheet();
         $sheet->getStyle('A1')->getFont()->setName('font1');
         $sheet->getStyle('A2')->getFont()->setName('font2');
         $sheet->getStyle('A3')->getFont()->setName('font3');
         $sheet->getStyle('B1')->getFont()->setName('font1');
         $sheet->getStyle('B2')->getFont()->setName('font2');
-        $spreadsheet->removeCellXfByIndex(5);
-        $spreadsheet->disconnectWorksheets();
+        $this->spreadsheet->removeCellXfByIndex(5);
     }
 
     public function testInvalidRemoveDefaultStyle(): void
@@ -91,71 +103,63 @@ class SpreadsheetCoverageTest extends TestCase
         $this->expectException(SSException::class);
         $this->expectExceptionMessage('No default style found for this workbook');
         // Removing default style probably should be disallowed.
-        $spreadsheet = new Spreadsheet();
-        $sheet = $spreadsheet->getActiveSheet();
-        $spreadsheet->removeCellXfByIndex(0);
-        $style = $spreadsheet->getDefaultStyle();
-        $spreadsheet->disconnectWorksheets();
+        $this->spreadsheet = new Spreadsheet();
+        $this->spreadsheet->removeCellXfByIndex(0);
+        $this->spreadsheet->getDefaultStyle();
     }
 
     public function testCellStyleXF(): void
     {
-        $spreadsheet = new Spreadsheet();
-        $collection = $spreadsheet->getCellStyleXfCollection();
+        $this->spreadsheet = new Spreadsheet();
+        $collection = $this->spreadsheet->getCellStyleXfCollection();
         self::assertCount(1, $collection);
         $styleXf = $collection[0];
-        self::assertSame($styleXf, $spreadsheet->getCellStyleXfByIndex(0));
+        self::assertSame($styleXf, $this->spreadsheet->getCellStyleXfByIndex(0));
         $hash = $styleXf->getHashCode();
-        self::assertSame($styleXf, $spreadsheet->getCellStyleXfByHashCode($hash));
-        self::assertFalse($spreadsheet->getCellStyleXfByHashCode($hash . 'x'));
-        $spreadsheet->disconnectWorksheets();
+        self::assertSame($styleXf, $this->spreadsheet->getCellStyleXfByHashCode($hash));
+        self::assertFalse($this->spreadsheet->getCellStyleXfByHashCode($hash . 'x'));
     }
 
     public function testInvalidRemoveCellStyleXfByIndex(): void
     {
         $this->expectException(SSException::class);
         $this->expectExceptionMessage('CellStyleXf index is out of bounds.');
-        $spreadsheet = new Spreadsheet();
-        $sheet = $spreadsheet->getActiveSheet();
-        $spreadsheet->removeCellStyleXfByIndex(5);
-        $spreadsheet->disconnectWorksheets();
+        $this->spreadsheet = new Spreadsheet();
+        $this->spreadsheet->removeCellStyleXfByIndex(5);
     }
 
     public function testInvalidFirstSheetIndex(): void
     {
         $this->expectException(SSException::class);
         $this->expectExceptionMessage('First sheet index must be a positive integer.');
-        $spreadsheet = new Spreadsheet();
-        $spreadsheet->setFirstSheetIndex(-1);
-        $spreadsheet->disconnectWorksheets();
+        $this->spreadsheet = new Spreadsheet();
+        $this->spreadsheet->setFirstSheetIndex(-1);
     }
 
     public function testInvalidVisibility(): void
     {
         $this->expectException(SSException::class);
         $this->expectExceptionMessage('Invalid visibility value.');
-        $spreadsheet = new Spreadsheet();
-        $spreadsheet->setVisibility(Spreadsheet::VISIBILITY_HIDDEN);
-        self::assertSame(Spreadsheet::VISIBILITY_HIDDEN, $spreadsheet->getVisibility());
-        $spreadsheet->setVisibility(null);
-        self::assertSame(Spreadsheet::VISIBILITY_VISIBLE, $spreadsheet->getVisibility());
-        $spreadsheet->setVisibility('badvalue');
-        $spreadsheet->disconnectWorksheets();
+        $this->spreadsheet = new Spreadsheet();
+        $this->spreadsheet->setVisibility(Spreadsheet::VISIBILITY_HIDDEN);
+        self::assertSame(Spreadsheet::VISIBILITY_HIDDEN, $this->spreadsheet->getVisibility());
+        $this->spreadsheet->setVisibility(null);
+        self::assertSame(Spreadsheet::VISIBILITY_VISIBLE, $this->spreadsheet->getVisibility());
+        $this->spreadsheet->setVisibility('badvalue');
     }
 
     public function testInvalidTabRatio(): void
     {
         $this->expectException(SSException::class);
         $this->expectExceptionMessage('Tab ratio must be between 0 and 1000.');
-        $spreadsheet = new Spreadsheet();
-        $spreadsheet->setTabRatio(2000);
-        $spreadsheet->disconnectWorksheets();
+        $this->spreadsheet = new Spreadsheet();
+        $this->spreadsheet->setTabRatio(2000);
     }
 
     public function testCopy(): void
     {
-        $spreadsheet = new Spreadsheet();
-        $sheet = $spreadsheet->getActiveSheet();
+        $this->spreadsheet = new Spreadsheet();
+        $sheet = $this->spreadsheet->getActiveSheet();
         $sheet->getStyle('A1')->getFont()->setName('font1');
         $sheet->getStyle('A2')->getFont()->setName('font2');
         $sheet->getStyle('A3')->getFont()->setName('font3');
@@ -166,8 +170,8 @@ class SpreadsheetCoverageTest extends TestCase
         $sheet->getCell('A3')->setValue('this is a3');
         $sheet->getCell('B1')->setValue('this is b1');
         $sheet->getCell('B2')->setValue('this is b2');
-        $copied = $spreadsheet->copy();
-        $copysheet = $copied->getActiveSheet();
+        $this->spreadsheet2 = $this->spreadsheet->copy();
+        $copysheet = $this->spreadsheet2->getActiveSheet();
         $copysheet->getStyle('A2')->getFont()->setName('font12');
         $copysheet->getCell('A2')->setValue('this was a2');
 
@@ -192,18 +196,13 @@ class SpreadsheetCoverageTest extends TestCase
         self::assertSame('this is a3', $copysheet->getCell('A3')->getValue());
         self::assertSame('this is b1', $copysheet->getCell('B1')->getValue());
         self::assertSame('this is b2', $copysheet->getCell('B2')->getValue());
-
-        $spreadsheet->disconnectWorksheets();
-        $copied->disconnectWorksheets();
     }
 
     public function testClone(): void
     {
         $this->expectException(SSException::class);
         $this->expectExceptionMessage('Do not use clone on spreadsheet. Use spreadsheet->copy() instead.');
-        $spreadsheet = new Spreadsheet();
-        $clone = clone $spreadsheet;
-        $spreadsheet->disconnectWorksheets();
-        $clone->disconnectWorksheets();
+        $this->spreadsheet = new Spreadsheet();
+        $this->spreadsheet2 = clone $this->spreadsheet;
     }
 }
diff --git a/tests/PhpSpreadsheetTests/Worksheet/ColumnCellIteratorTest.php b/tests/PhpSpreadsheetTests/Worksheet/ColumnCellIteratorTest.php
index 1a7ff675..02b96426 100644
--- a/tests/PhpSpreadsheetTests/Worksheet/ColumnCellIteratorTest.php
+++ b/tests/PhpSpreadsheetTests/Worksheet/ColumnCellIteratorTest.php
@@ -40,6 +40,7 @@ class ColumnCellIteratorTest extends TestCase
         $values = [];
         foreach ($iterator as $key => $ColumnCell) {
             self::assertNotNull($ColumnCell);
+            /** @scrutinizer ignore-call */
             $values[] = $ColumnCell->getValue();
             self::assertEquals($ColumnCellIndexResult++, $key);
             self::assertInstanceOf(Cell::class, $ColumnCell);
@@ -60,6 +61,7 @@ class ColumnCellIteratorTest extends TestCase
         $values = [];
         foreach ($iterator as $key => $ColumnCell) {
             self::assertNotNull($ColumnCell);
+            /** @scrutinizer ignore-call */
             $values[] = $ColumnCell->getValue();
             self::assertEquals($ColumnCellIndexResult++, $key);
             self::assertInstanceOf(Cell::class, $ColumnCell);
@@ -81,6 +83,7 @@ class ColumnCellIteratorTest extends TestCase
         while ($iterator->valid()) {
             $current = $iterator->current();
             self::assertNotNull($current);
+            /** @scrutinizer ignore-call */
             $cell = $current->getCoordinate();
             $values[] = $sheet->getCell($cell)->getValue();
             $iterator->prev();
diff --git a/tests/PhpSpreadsheetTests/Worksheet/RowCellIteratorTest.php b/tests/PhpSpreadsheetTests/Worksheet/RowCellIteratorTest.php
index b0606804..9afda3cb 100644
--- a/tests/PhpSpreadsheetTests/Worksheet/RowCellIteratorTest.php
+++ b/tests/PhpSpreadsheetTests/Worksheet/RowCellIteratorTest.php
@@ -40,6 +40,7 @@ class RowCellIteratorTest extends TestCase
         $values = [];
         foreach ($iterator as $key => $RowCell) {
             self::assertNotNull($RowCell);
+            /** @scrutinizer ignore-call */
             $values[] = $RowCell->getValue();
             self::assertEquals($RowCellIndexResult++, $key);
             self::assertInstanceOf(Cell::class, $RowCell);
@@ -59,6 +60,7 @@ class RowCellIteratorTest extends TestCase
         $values = [];
         foreach ($iterator as $key => $RowCell) {
             self::assertNotNull($RowCell);
+            /** @scrutinizer ignore-call */
             $values[] = $RowCell->getValue();
             self::assertEquals($RowCellIndexResult++, $key);
             self::assertInstanceOf(Cell::class, $RowCell);
@@ -80,6 +82,7 @@ class RowCellIteratorTest extends TestCase
         while ($iterator->valid()) {
             $current = $iterator->current();
             self::assertNotNull($current);
+            /** @scrutinizer ignore-call */
             $cell = $current->getCoordinate();
             $values[] = $sheet->getCell($cell)->getValue();
             $iterator->prev();

From 3884aa74773d4b9b3275176c633cf9f8f3610245 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Sat, 3 Sep 2022 22:03:16 +0200
Subject: [PATCH 49/69] Update Excel function samples for Date/Time functions

---
 samples/Calculations/DateTime/DATE.php       | 16 ++++--
 samples/Calculations/DateTime/DATEDIF.php    | 60 ++++++++++++++++++++
 samples/Calculations/DateTime/DATEVALUE.php  | 18 +++---
 samples/Calculations/DateTime/DAY.php        | 50 ++++++++++++++++
 samples/Calculations/DateTime/DAYS.php       | 52 +++++++++++++++++
 samples/Calculations/DateTime/DAYS360.php    | 57 +++++++++++++++++++
 samples/Calculations/DateTime/EDATE.php      | 43 ++++++++++++++
 samples/Calculations/DateTime/EOMONTH.php    | 43 ++++++++++++++
 samples/Calculations/DateTime/HOUR.php       | 48 ++++++++++++++++
 samples/Calculations/DateTime/ISOWEEKNUM.php | 50 ++++++++++++++++
 samples/Calculations/DateTime/MINUTE.php     | 48 ++++++++++++++++
 samples/Calculations/DateTime/MONTH.php      | 50 ++++++++++++++++
 samples/Calculations/DateTime/NOW.php        | 27 +++++++++
 samples/Calculations/DateTime/SECOND.php     | 48 ++++++++++++++++
 samples/Calculations/DateTime/TIME.php       | 14 +++--
 samples/Calculations/DateTime/TIMEVALUE.php  |  8 ++-
 samples/Calculations/DateTime/TODAY.php      | 27 +++++++++
 samples/Calculations/DateTime/WEEKDAY.php    | 58 +++++++++++++++++++
 samples/Calculations/DateTime/WEEKNUM.php    | 52 +++++++++++++++++
 samples/Calculations/DateTime/YEAR.php       | 50 ++++++++++++++++
 src/PhpSpreadsheet/Helper/Sample.php         |  4 +-
 21 files changed, 801 insertions(+), 22 deletions(-)
 create mode 100644 samples/Calculations/DateTime/DATEDIF.php
 create mode 100644 samples/Calculations/DateTime/DAY.php
 create mode 100644 samples/Calculations/DateTime/DAYS.php
 create mode 100644 samples/Calculations/DateTime/DAYS360.php
 create mode 100644 samples/Calculations/DateTime/EDATE.php
 create mode 100644 samples/Calculations/DateTime/EOMONTH.php
 create mode 100644 samples/Calculations/DateTime/HOUR.php
 create mode 100644 samples/Calculations/DateTime/ISOWEEKNUM.php
 create mode 100644 samples/Calculations/DateTime/MINUTE.php
 create mode 100644 samples/Calculations/DateTime/MONTH.php
 create mode 100644 samples/Calculations/DateTime/NOW.php
 create mode 100644 samples/Calculations/DateTime/SECOND.php
 create mode 100644 samples/Calculations/DateTime/TODAY.php
 create mode 100644 samples/Calculations/DateTime/WEEKDAY.php
 create mode 100644 samples/Calculations/DateTime/WEEKNUM.php
 create mode 100644 samples/Calculations/DateTime/YEAR.php

diff --git a/samples/Calculations/DateTime/DATE.php b/samples/Calculations/DateTime/DATE.php
index 5d758f76..d526cbdb 100644
--- a/samples/Calculations/DateTime/DATE.php
+++ b/samples/Calculations/DateTime/DATE.php
@@ -4,7 +4,11 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
 require __DIR__ . '/../../Header.php';
 
-$helper->log('Returns the serial number of a particular date.');
+$category = 'Date/Time';
+$functionName = 'DATE';
+$description = 'Returns the Excel serial number of a particular date';
+
+$helper->titles($category, $functionName, $description);
 
 // Create new PhpSpreadsheet object
 $spreadsheet = new Spreadsheet();
@@ -27,15 +31,15 @@ for ($row = 1; $row <= $testDateCount; ++$row) {
 }
 $worksheet->getStyle('E1:E' . $testDateCount)
     ->getNumberFormat()
-    ->setFormatCode('yyyy-mmm-dd');
+    ->setFormatCode('yyyy-mm-dd');
 
 // Test the formulae
 for ($row = 1; $row <= $testDateCount; ++$row) {
-    $helper->log('Year: ' . $worksheet->getCell('A' . $row)->getFormattedValue());
-    $helper->log('Month: ' . $worksheet->getCell('B' . $row)->getFormattedValue());
-    $helper->log('Day: ' . $worksheet->getCell('C' . $row)->getFormattedValue());
+    $helper->log("(A{$row}) Year: " . $worksheet->getCell('A' . $row)->getFormattedValue());
+    $helper->log("(B{$row}) Month: " . $worksheet->getCell('B' . $row)->getFormattedValue());
+    $helper->log("(C{$row}) Day: " . $worksheet->getCell('C' . $row)->getFormattedValue());
     $helper->log('Formula: ' . $worksheet->getCell('D' . $row)->getValue());
-    $helper->log('Excel DateStamp: ' . $worksheet->getCell('D' . $row)->getFormattedValue());
+    $helper->log('Excel DateStamp: ' . $worksheet->getCell('D' . $row)->getCalculatedValue());
     $helper->log('Formatted DateStamp: ' . $worksheet->getCell('E' . $row)->getFormattedValue());
     $helper->log('');
 }
diff --git a/samples/Calculations/DateTime/DATEDIF.php b/samples/Calculations/DateTime/DATEDIF.php
new file mode 100644
index 00000000..7bc077c9
--- /dev/null
+++ b/samples/Calculations/DateTime/DATEDIF.php
@@ -0,0 +1,60 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Date/Time';
+$functionName = 'DATEDIF';
+$description = 'Calculates the number of days, months, or years between two dates';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testDates = [
+    [1900, 1, 1],
+    [1904, 1, 1],
+    [1936, 3, 17],
+    [1960, 12, 19],
+    [1999, 12, 31],
+    [2000, 1, 1],
+    [2019, 2, 14],
+    [2020, 7, 4],
+];
+$testDateCount = count($testDates);
+
+$worksheet->fromArray($testDates, null, 'A1', true);
+
+for ($row = 1; $row <= $testDateCount; ++$row) {
+    $worksheet->setCellValue('D' . $row, '=DATE(A' . $row . ',B' . $row . ',C' . $row . ')');
+    $worksheet->setCellValue('E' . $row, '=D' . $row);
+    $worksheet->setCellValue('F' . $row, '=TODAY()');
+    $worksheet->setCellValue('G' . $row, '=DATEDIF(D' . $row . ', F' . $row . ', "Y")');
+    $worksheet->setCellValue('H' . $row, '=DATEDIF(D' . $row . ', F' . $row . ', "M")');
+    $worksheet->setCellValue('I' . $row, '=DATEDIF(D' . $row . ', F' . $row . ', "D")');
+    $worksheet->setCellValue('J' . $row, '=DATEDIF(D' . $row . ', F' . $row . ', "MD")');
+    $worksheet->setCellValue('K' . $row, '=DATEDIF(D' . $row . ', F' . $row . ', "YM")');
+    $worksheet->setCellValue('L' . $row, '=DATEDIF(D' . $row . ', F' . $row . ', "YD")');
+}
+$worksheet->getStyle('E1:F' . $testDateCount)
+    ->getNumberFormat()
+    ->setFormatCode('yyyy-mm-dd');
+
+// Test the formulae
+for ($row = 1; $row <= $testDateCount; ++$row) {
+    $helper->log(sprintf(
+        'Between: %s and %s',
+        $worksheet->getCell('E' . $row)->getFormattedValue(),
+        $worksheet->getCell('F' . $row)->getFormattedValue()
+    ));
+    $helper->log('In years ("Y"): ' . $worksheet->getCell('G' . $row)->getCalculatedValue());
+    $helper->log('In months ("M"): ' . $worksheet->getCell('H' . $row)->getCalculatedValue());
+    $helper->log('In days ("D"): ' . $worksheet->getCell('I' . $row)->getCalculatedValue());
+    $helper->log('In days ignoring months and years ("MD"): ' . $worksheet->getCell('J' . $row)->getCalculatedValue());
+    $helper->log('In months ignoring days and years ("YM"): ' . $worksheet->getCell('K' . $row)->getCalculatedValue());
+    $helper->log('In days ignoring years ("YD"): ' . $worksheet->getCell('L' . $row)->getCalculatedValue());
+}
diff --git a/samples/Calculations/DateTime/DATEVALUE.php b/samples/Calculations/DateTime/DATEVALUE.php
index 5cdb936d..c506c6f2 100644
--- a/samples/Calculations/DateTime/DATEVALUE.php
+++ b/samples/Calculations/DateTime/DATEVALUE.php
@@ -4,7 +4,11 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
 require __DIR__ . '/../../Header.php';
 
-$helper->log('Converts a date in the form of text to a serial number.');
+$category = 'Date/Time';
+$functionName = 'DATEVALUE';
+$description = 'Converts a date in the form of text to an Excel serial number';
+
+$helper->titles($category, $functionName, $description);
 
 // Create new PhpSpreadsheet object
 $spreadsheet = new Spreadsheet();
@@ -13,8 +17,8 @@ $worksheet = $spreadsheet->getActiveSheet();
 // Add some data
 $testDates = ['26 March 2012', '29 Feb 2012', 'April 1, 2012', '25/12/2012',
     '2012-Oct-31', '5th November', 'January 1st', 'April 2012',
-    '17-03', '03-2012', '29 Feb 2011', '03-05-07',
-    '03-MAY-07', '03-13-07',
+    '17-03', '03-17', '03-2012', '29 Feb 2011', '03-05-07',
+    '03-MAY-07', '03-13-07', '13-03-07', '03/13/07', '13/03/07',
 ];
 $testDateCount = count($testDates);
 
@@ -26,14 +30,14 @@ for ($row = 1; $row <= $testDateCount; ++$row) {
 
 $worksheet->getStyle('C1:C' . $testDateCount)
     ->getNumberFormat()
-    ->setFormatCode('yyyy-mmm-dd');
+    ->setFormatCode('yyyy-mm-dd');
 
 // Test the formulae
 $helper->log('<strong>Warning: </strong>The PhpSpreadsheet DATEVALUE() function accepts a wider range of date formats than MS Excel DATEFORMAT() function.');
 for ($row = 1; $row <= $testDateCount; ++$row) {
-    $helper->log('Date String: ' . $worksheet->getCell('A' . $row)->getFormattedValue());
+    $helper->log("(A{$row}) Date String: " . $worksheet->getCell('A' . $row)->getFormattedValue());
     $helper->log('Formula: ' . $worksheet->getCell('B' . $row)->getValue());
-    $helper->log('Excel DateStamp: ' . $worksheet->getCell('B' . $row)->getFormattedValue());
-    $helper->log('Formatted DateStamp' . $worksheet->getCell('C' . $row)->getFormattedValue());
+    $helper->log('Excel DateStamp: ' . $worksheet->getCell('B' . $row)->getCalculatedValue());
+    $helper->log('Formatted DateStamp: ' . $worksheet->getCell('C' . $row)->getFormattedValue());
     $helper->log('');
 }
diff --git a/samples/Calculations/DateTime/DAY.php b/samples/Calculations/DateTime/DAY.php
new file mode 100644
index 00000000..3a4da7e6
--- /dev/null
+++ b/samples/Calculations/DateTime/DAY.php
@@ -0,0 +1,50 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Date/Time';
+$functionName = 'DAY';
+$description = 'Returns the day of a date, an integer ranging from 1 to 31';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testDates = [
+    [1900, 1, 1],
+    [1904, 2, 14],
+    [1936, 3, 17],
+    [1964, 4, 29],
+    [1999, 5, 18],
+    [2000, 6, 21],
+    [2019, 7, 4],
+    [2020, 8, 31],
+    [1956, 9, 10],
+    [2010, 10, 10],
+    [1982, 11, 30],
+    [1960, 12, 19],
+    ['=YEAR(TODAY())', '=MONTH(TODAY())', '=DAY(TODAY())'],
+];
+$testDateCount = count($testDates);
+
+$worksheet->fromArray($testDates, null, 'A1', true);
+
+for ($row = 1; $row <= $testDateCount; ++$row) {
+    $worksheet->setCellValue('D' . $row, '=DATE(A' . $row . ',B' . $row . ',C' . $row . ')');
+    $worksheet->setCellValue('E' . $row, '=D' . $row);
+    $worksheet->setCellValue('F' . $row, '=DAY(D' . $row . ')');
+}
+$worksheet->getStyle('E1:E' . $testDateCount)
+    ->getNumberFormat()
+    ->setFormatCode('yyyy-mm-dd');
+
+// Test the formulae
+for ($row = 1; $row <= $testDateCount; ++$row) {
+    $helper->log(sprintf('(E%d): %s', $row, $worksheet->getCell('E' . $row)->getFormattedValue()));
+    $helper->log('Day is: ' . $worksheet->getCell('F' . $row)->getCalculatedValue());
+}
diff --git a/samples/Calculations/DateTime/DAYS.php b/samples/Calculations/DateTime/DAYS.php
new file mode 100644
index 00000000..ddd47f37
--- /dev/null
+++ b/samples/Calculations/DateTime/DAYS.php
@@ -0,0 +1,52 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Date/Time';
+$functionName = 'DAYS';
+$description = 'Returns the number of days between two dates';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testDates = [
+    [1900, 1, 1],
+    [1904, 1, 1],
+    [1936, 3, 17],
+    [1960, 12, 19],
+    [1999, 12, 31],
+    [2000, 1, 1],
+    [2019, 2, 14],
+    [2020, 7, 4],
+    [2029, 12, 31],
+    [2525, 1, 1],
+];
+$testDateCount = count($testDates);
+
+$worksheet->fromArray($testDates, null, 'A1', true);
+
+for ($row = 1; $row <= $testDateCount; ++$row) {
+    $worksheet->setCellValue('D' . $row, '=DATE(A' . $row . ',B' . $row . ',C' . $row . ')');
+    $worksheet->setCellValue('E' . $row, '=D' . $row);
+    $worksheet->setCellValue('F' . $row, '=TODAY()');
+    $worksheet->setCellValue('G' . $row, '=DAYS(D' . $row . ', F' . $row . ')');
+}
+$worksheet->getStyle('E1:F' . $testDateCount)
+    ->getNumberFormat()
+    ->setFormatCode('yyyy-mm-dd');
+
+// Test the formulae
+for ($row = 1; $row <= $testDateCount; ++$row) {
+    $helper->log(sprintf(
+        'Between: %s and %s',
+        $worksheet->getCell('E' . $row)->getFormattedValue(),
+        $worksheet->getCell('F' . $row)->getFormattedValue()
+    ));
+    $helper->log('Days: ' . $worksheet->getCell('G' . $row)->getCalculatedValue());
+}
diff --git a/samples/Calculations/DateTime/DAYS360.php b/samples/Calculations/DateTime/DAYS360.php
new file mode 100644
index 00000000..b0e2fdbb
--- /dev/null
+++ b/samples/Calculations/DateTime/DAYS360.php
@@ -0,0 +1,57 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Date/Time';
+$functionName = 'DAYS360';
+$description = 'Returns the number of days between two dates based on a 360-day year';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testDates = [
+    [1900, 1, 1],
+    [1904, 1, 1],
+    [1936, 3, 17],
+    [1960, 12, 19],
+    [1999, 12, 31],
+    [2000, 1, 1],
+    [2019, 2, 14],
+    [2020, 7, 4],
+    [2029, 12, 31],
+    [2525, 1, 1],
+];
+$testDateCount = count($testDates);
+
+$worksheet->fromArray($testDates, null, 'A1', true);
+
+for ($row = 1; $row <= $testDateCount; ++$row) {
+    $worksheet->setCellValue('D' . $row, '=DATE(A' . $row . ',B' . $row . ',C' . $row . ')');
+    $worksheet->setCellValue('E' . $row, '=D' . $row);
+    $worksheet->setCellValue('F' . $row, '=DATE(2022,12,31)');
+    $worksheet->setCellValue('G' . $row, '=DAYS360(D' . $row . ', F' . $row . ', FALSE)');
+    $worksheet->setCellValue('H' . $row, '=DAYS360(D' . $row . ', F' . $row . ', TRUE)');
+}
+$worksheet->getStyle('E1:F' . $testDateCount)
+    ->getNumberFormat()
+    ->setFormatCode('yyyy-mm-dd');
+
+// Test the formulae
+for ($row = 1; $row <= $testDateCount; ++$row) {
+    $helper->log(sprintf(
+        'Between: %s and %s',
+        $worksheet->getCell('E' . $row)->getFormattedValue(),
+        $worksheet->getCell('F' . $row)->getFormattedValue()
+    ));
+    $helper->log(sprintf(
+        'Days: %d (US) %d (European)',
+        $worksheet->getCell('G' . $row)->getCalculatedValue(),
+        $worksheet->getCell('H' . $row)->getCalculatedValue()
+    ));
+}
diff --git a/samples/Calculations/DateTime/EDATE.php b/samples/Calculations/DateTime/EDATE.php
new file mode 100644
index 00000000..be6e4d19
--- /dev/null
+++ b/samples/Calculations/DateTime/EDATE.php
@@ -0,0 +1,43 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Date/Time';
+$functionName = 'EDATE';
+$description = 'Returns the serial number that represents the date that is the indicated number of months before or after a specified date';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+$months = range(-12, 12);
+$testDateCount = count($months);
+
+for ($row = 1; $row <= $testDateCount; ++$row) {
+    $worksheet->setCellValue('A' . $row, '=DATE(2020,12,31)');
+    $worksheet->setCellValue('B' . $row, '=A' . $row);
+    $worksheet->setCellValue('C' . $row, $months[$row - 1]);
+    $worksheet->setCellValue('D' . $row, '=EDATE(B' . $row . ', C' . $row . ')');
+}
+$worksheet->getStyle('B1:B' . $testDateCount)
+    ->getNumberFormat()
+    ->setFormatCode('yyyy-mm-dd');
+
+$worksheet->getStyle('D1:D' . $testDateCount)
+    ->getNumberFormat()
+    ->setFormatCode('yyyy-mm-dd');
+
+// Test the formulae
+for ($row = 1; $row <= $testDateCount; ++$row) {
+    $helper->log(sprintf(
+        '%s and %d months is %d (%s)',
+        $worksheet->getCell('B' . $row)->getFormattedValue(),
+        $worksheet->getCell('C' . $row)->getFormattedValue(),
+        $worksheet->getCell('D' . $row)->getCalculatedValue(),
+        $worksheet->getCell('D' . $row)->getFormattedValue()
+    ));
+}
diff --git a/samples/Calculations/DateTime/EOMONTH.php b/samples/Calculations/DateTime/EOMONTH.php
new file mode 100644
index 00000000..e0b7568a
--- /dev/null
+++ b/samples/Calculations/DateTime/EOMONTH.php
@@ -0,0 +1,43 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Date/Time';
+$functionName = 'EOMONTH';
+$description = 'Returns the serial number for the last day of the month that is the indicated number of months before or after start_date';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+$months = range(-12, 12);
+$testDateCount = count($months);
+
+for ($row = 1; $row <= $testDateCount; ++$row) {
+    $worksheet->setCellValue('A' . $row, '=DATE(2020,1,1)');
+    $worksheet->setCellValue('B' . $row, '=A' . $row);
+    $worksheet->setCellValue('C' . $row, $months[$row - 1]);
+    $worksheet->setCellValue('D' . $row, '=EOMONTH(B' . $row . ', C' . $row . ')');
+}
+$worksheet->getStyle('B1:B' . $testDateCount)
+    ->getNumberFormat()
+    ->setFormatCode('yyyy-mm-dd');
+
+$worksheet->getStyle('D1:D' . $testDateCount)
+    ->getNumberFormat()
+    ->setFormatCode('yyyy-mm-dd');
+
+// Test the formulae
+for ($row = 1; $row <= $testDateCount; ++$row) {
+    $helper->log(sprintf(
+        '%s and %d months is %d (%s)',
+        $worksheet->getCell('B' . $row)->getFormattedValue(),
+        $worksheet->getCell('C' . $row)->getFormattedValue(),
+        $worksheet->getCell('D' . $row)->getCalculatedValue(),
+        $worksheet->getCell('D' . $row)->getFormattedValue()
+    ));
+}
diff --git a/samples/Calculations/DateTime/HOUR.php b/samples/Calculations/DateTime/HOUR.php
new file mode 100644
index 00000000..53c21644
--- /dev/null
+++ b/samples/Calculations/DateTime/HOUR.php
@@ -0,0 +1,48 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Date/Time';
+$functionName = 'HOUR';
+$description = 'Returns the hour of a time value. The hour is given as an integer, ranging from 0 (12:00 AM) to 23 (11:00 PM)';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testTimes = [
+    [0, 6, 0],
+    [1, 12, 15],
+    [3, 30, 12],
+    [5, 17, 31],
+    [8, 15, 45],
+    [12, 45, 11],
+    [14, 0, 30],
+    [17, 55, 50],
+    [19, 21, 8],
+    [21, 10, 10],
+    [23, 59, 59],
+];
+$testTimeCount = count($testTimes);
+
+$worksheet->fromArray($testTimes, null, 'A1', true);
+
+for ($row = 1; $row <= $testTimeCount; ++$row) {
+    $worksheet->setCellValue('D' . $row, '=TIME(A' . $row . ',B' . $row . ',C' . $row . ')');
+    $worksheet->setCellValue('E' . $row, '=D' . $row);
+    $worksheet->setCellValue('F' . $row, '=HOUR(D' . $row . ')');
+}
+$worksheet->getStyle('E1:E' . $testTimeCount)
+    ->getNumberFormat()
+    ->setFormatCode('hh:mm:ss');
+
+// Test the formulae
+for ($row = 1; $row <= $testTimeCount; ++$row) {
+    $helper->log(sprintf('(E%d): %s', $row, $worksheet->getCell('E' . $row)->getFormattedValue()));
+    $helper->log('Hour is: ' . $worksheet->getCell('F' . $row)->getCalculatedValue());
+}
diff --git a/samples/Calculations/DateTime/ISOWEEKNUM.php b/samples/Calculations/DateTime/ISOWEEKNUM.php
new file mode 100644
index 00000000..4a989fbd
--- /dev/null
+++ b/samples/Calculations/DateTime/ISOWEEKNUM.php
@@ -0,0 +1,50 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Date/Time';
+$functionName = 'ISOWEEKNUM';
+$description = 'Returns number of the ISO week number of the year for a given date. (ISO-8601)';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testDates = [
+    [1900, 1, 1],
+    [1904, 2, 14],
+    [1936, 3, 17],
+    [1964, 4, 29],
+    [1999, 5, 18],
+    [2000, 6, 21],
+    [2019, 7, 4],
+    [2020, 8, 31],
+    [1956, 9, 10],
+    [2010, 10, 10],
+    [1982, 11, 30],
+    [1960, 12, 19],
+    ['=YEAR(TODAY())', '=MONTH(TODAY())', '=DAY(TODAY())'],
+];
+$testDateCount = count($testDates);
+
+$worksheet->fromArray($testDates, null, 'A1', true);
+
+for ($row = 1; $row <= $testDateCount; ++$row) {
+    $worksheet->setCellValue('D' . $row, '=DATE(A' . $row . ',B' . $row . ',C' . $row . ')');
+    $worksheet->setCellValue('E' . $row, '=D' . $row);
+    $worksheet->setCellValue('F' . $row, '=ISOWEEKNUM(D' . $row . ')');
+}
+$worksheet->getStyle('E1:E' . $testDateCount)
+    ->getNumberFormat()
+    ->setFormatCode('yyyy-mm-dd');
+
+// Test the formulae
+for ($row = 1; $row <= $testDateCount; ++$row) {
+    $helper->log(sprintf('(E%d): %s', $row, $worksheet->getCell('E' . $row)->getFormattedValue()));
+    $helper->log('ISO Week number is: ' . $worksheet->getCell('F' . $row)->getCalculatedValue());
+}
diff --git a/samples/Calculations/DateTime/MINUTE.php b/samples/Calculations/DateTime/MINUTE.php
new file mode 100644
index 00000000..11e90e13
--- /dev/null
+++ b/samples/Calculations/DateTime/MINUTE.php
@@ -0,0 +1,48 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Date/Time';
+$functionName = 'MINUTE';
+$description = 'Returns the minute of a time value. The minute is given as an integer, ranging from 0 to 59';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testTimes = [
+    [0, 6, 0],
+    [1, 12, 15],
+    [3, 30, 12],
+    [5, 17, 31],
+    [8, 15, 45],
+    [12, 45, 11],
+    [14, 0, 30],
+    [17, 55, 50],
+    [19, 21, 8],
+    [21, 10, 10],
+    [23, 59, 59],
+];
+$testTimeCount = count($testTimes);
+
+$worksheet->fromArray($testTimes, null, 'A1', true);
+
+for ($row = 1; $row <= $testTimeCount; ++$row) {
+    $worksheet->setCellValue('D' . $row, '=TIME(A' . $row . ',B' . $row . ',C' . $row . ')');
+    $worksheet->setCellValue('E' . $row, '=D' . $row);
+    $worksheet->setCellValue('F' . $row, '=MINUTE(D' . $row . ')');
+}
+$worksheet->getStyle('E1:E' . $testTimeCount)
+    ->getNumberFormat()
+    ->setFormatCode('hh:mm:ss');
+
+// Test the formulae
+for ($row = 1; $row <= $testTimeCount; ++$row) {
+    $helper->log(sprintf('(E%d): %s', $row, $worksheet->getCell('E' . $row)->getFormattedValue()));
+    $helper->log('Minute is: ' . $worksheet->getCell('F' . $row)->getCalculatedValue());
+}
diff --git a/samples/Calculations/DateTime/MONTH.php b/samples/Calculations/DateTime/MONTH.php
new file mode 100644
index 00000000..8cceaf4c
--- /dev/null
+++ b/samples/Calculations/DateTime/MONTH.php
@@ -0,0 +1,50 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Date/Time';
+$functionName = 'MONTH';
+$description = 'Returns the month of a date, an integer ranging from 1 to 12';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testDates = [
+    [1900, 1, 1],
+    [1904, 2, 14],
+    [1936, 3, 17],
+    [1964, 4, 29],
+    [1999, 5, 18],
+    [2000, 6, 21],
+    [2019, 7, 4],
+    [2020, 8, 31],
+    [1956, 9, 10],
+    [2010, 10, 10],
+    [1982, 11, 30],
+    [1960, 12, 19],
+    ['=YEAR(TODAY())', '=MONTH(TODAY())', '=DAY(TODAY())'],
+];
+$testDateCount = count($testDates);
+
+$worksheet->fromArray($testDates, null, 'A1', true);
+
+for ($row = 1; $row <= $testDateCount; ++$row) {
+    $worksheet->setCellValue('D' . $row, '=DATE(A' . $row . ',B' . $row . ',C' . $row . ')');
+    $worksheet->setCellValue('E' . $row, '=D' . $row);
+    $worksheet->setCellValue('F' . $row, '=MONTH(D' . $row . ')');
+}
+$worksheet->getStyle('E1:E' . $testDateCount)
+    ->getNumberFormat()
+    ->setFormatCode('yyyy-mm-dd');
+
+// Test the formulae
+for ($row = 1; $row <= $testDateCount; ++$row) {
+    $helper->log(sprintf('(E%d): %s', $row, $worksheet->getCell('E' . $row)->getFormattedValue()));
+    $helper->log('Month is: ' . $worksheet->getCell('F' . $row)->getCalculatedValue());
+}
diff --git a/samples/Calculations/DateTime/NOW.php b/samples/Calculations/DateTime/NOW.php
new file mode 100644
index 00000000..858a3162
--- /dev/null
+++ b/samples/Calculations/DateTime/NOW.php
@@ -0,0 +1,27 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Date/Time';
+$functionName = 'NOW';
+$description = 'Returns the serial number of the current date and time';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+$worksheet->setCellValue('A1', '=NOW()');
+$worksheet->getStyle('A1')
+    ->getNumberFormat()
+    ->setFormatCode('yyyy-mm-dd hh:mm:ss');
+
+// Test the formulae
+$helper->log(sprintf(
+    'Today is %f (%s)',
+    $worksheet->getCell('A1')->getCalculatedValue(),
+    $worksheet->getCell('A1')->getFormattedValue()
+));
diff --git a/samples/Calculations/DateTime/SECOND.php b/samples/Calculations/DateTime/SECOND.php
new file mode 100644
index 00000000..33806fd5
--- /dev/null
+++ b/samples/Calculations/DateTime/SECOND.php
@@ -0,0 +1,48 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Date/Time';
+$functionName = 'SECOND';
+$description = 'Returns the second of a time value. The second is given as an integer, ranging from 0 to 59';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testTimes = [
+    [0, 6, 0],
+    [1, 12, 15],
+    [3, 30, 12],
+    [5, 17, 31],
+    [8, 15, 45],
+    [12, 45, 11],
+    [14, 0, 30],
+    [17, 55, 50],
+    [19, 21, 8],
+    [21, 10, 10],
+    [23, 59, 59],
+];
+$testTimeCount = count($testTimes);
+
+$worksheet->fromArray($testTimes, null, 'A1', true);
+
+for ($row = 1; $row <= $testTimeCount; ++$row) {
+    $worksheet->setCellValue('D' . $row, '=TIME(A' . $row . ',B' . $row . ',C' . $row . ')');
+    $worksheet->setCellValue('E' . $row, '=D' . $row);
+    $worksheet->setCellValue('F' . $row, '=SECOND(D' . $row . ')');
+}
+$worksheet->getStyle('E1:E' . $testTimeCount)
+    ->getNumberFormat()
+    ->setFormatCode('hh:mm:ss');
+
+// Test the formulae
+for ($row = 1; $row <= $testTimeCount; ++$row) {
+    $helper->log(sprintf('(E%d): %s', $row, $worksheet->getCell('E' . $row)->getFormattedValue()));
+    $helper->log('Second is: ' . $worksheet->getCell('F' . $row)->getCalculatedValue());
+}
diff --git a/samples/Calculations/DateTime/TIME.php b/samples/Calculations/DateTime/TIME.php
index 3d4208ad..42c45488 100644
--- a/samples/Calculations/DateTime/TIME.php
+++ b/samples/Calculations/DateTime/TIME.php
@@ -4,7 +4,11 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
 require __DIR__ . '/../../Header.php';
 
-$helper->log('Returns the serial number of a particular time.');
+$category = 'Date/Time';
+$functionName = 'TIME';
+$description = 'Returns the Excel serial number of a particular time';
+
+$helper->titles($category, $functionName, $description);
 
 // Create new PhpSpreadsheet object
 $spreadsheet = new Spreadsheet();
@@ -29,11 +33,11 @@ $worksheet->getStyle('E1:E' . $testDateCount)
 
 // Test the formulae
 for ($row = 1; $row <= $testDateCount; ++$row) {
-    $helper->log('Hour: ' . $worksheet->getCell('A' . $row)->getFormattedValue());
-    $helper->log('Minute: ' . $worksheet->getCell('B' . $row)->getFormattedValue());
-    $helper->log('Second: ' . $worksheet->getCell('C' . $row)->getFormattedValue());
+    $helper->log("(A{$row}) Hour: " . $worksheet->getCell('A' . $row)->getFormattedValue());
+    $helper->log("(B{$row}) Minute: " . $worksheet->getCell('B' . $row)->getFormattedValue());
+    $helper->log("(C{$row}) Second: " . $worksheet->getCell('C' . $row)->getFormattedValue());
     $helper->log('Formula: ' . $worksheet->getCell('D' . $row)->getValue());
-    $helper->log('Excel TimeStamp: ' . $worksheet->getCell('D' . $row)->getFormattedValue());
+    $helper->log('Excel TimeStamp: ' . $worksheet->getCell('D' . $row)->getCalculatedValue());
     $helper->log('Formatted TimeStamp: ' . $worksheet->getCell('E' . $row)->getFormattedValue());
     $helper->log('');
 }
diff --git a/samples/Calculations/DateTime/TIMEVALUE.php b/samples/Calculations/DateTime/TIMEVALUE.php
index f75393cd..15ea8cd9 100644
--- a/samples/Calculations/DateTime/TIMEVALUE.php
+++ b/samples/Calculations/DateTime/TIMEVALUE.php
@@ -4,7 +4,11 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet;
 
 require __DIR__ . '/../../Header.php';
 
-$helper->log('Converts a time in the form of text to a serial number.');
+$category = 'Date/Time';
+$functionName = 'DATEVALUE';
+$description = 'Converts a time in the form of text to an Excel serial number';
+
+$helper->titles($category, $functionName, $description);
 
 // Create new PhpSpreadsheet object
 $spreadsheet = new Spreadsheet();
@@ -27,7 +31,7 @@ $worksheet->getStyle('C1:C' . $testDateCount)
 
 // Test the formulae
 for ($row = 1; $row <= $testDateCount; ++$row) {
-    $helper->log('Time String: ' . $worksheet->getCell('A' . $row)->getFormattedValue());
+    $helper->log("(A{$row}) Time String: " . $worksheet->getCell('A' . $row)->getFormattedValue());
     $helper->log('Formula: ' . $worksheet->getCell('B' . $row)->getValue());
     $helper->log('Excel TimeStamp: ' . $worksheet->getCell('B' . $row)->getFormattedValue());
     $helper->log('Formatted TimeStamp: ' . $worksheet->getCell('C' . $row)->getFormattedValue());
diff --git a/samples/Calculations/DateTime/TODAY.php b/samples/Calculations/DateTime/TODAY.php
new file mode 100644
index 00000000..031149d5
--- /dev/null
+++ b/samples/Calculations/DateTime/TODAY.php
@@ -0,0 +1,27 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Date/Time';
+$functionName = 'TODAY';
+$description = 'Returns the serial number of the current date';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+$worksheet->setCellValue('A1', '=TODAY()');
+$worksheet->getStyle('A1')
+    ->getNumberFormat()
+    ->setFormatCode('yyyy-mm-dd');
+
+// Test the formulae
+$helper->log(sprintf(
+    'Today is %d (%s)',
+    $worksheet->getCell('A1')->getCalculatedValue(),
+    $worksheet->getCell('A1')->getFormattedValue()
+));
diff --git a/samples/Calculations/DateTime/WEEKDAY.php b/samples/Calculations/DateTime/WEEKDAY.php
new file mode 100644
index 00000000..7d4b4288
--- /dev/null
+++ b/samples/Calculations/DateTime/WEEKDAY.php
@@ -0,0 +1,58 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Date/Time';
+$functionName = 'WEEKDAY';
+$description = 'Returns the day of the week corresponding to a date';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testDates = [
+    [1900, 1, 1],
+    [1904, 2, 14],
+    [1936, 3, 17],
+    [1964, 4, 29],
+    [1999, 5, 18],
+    [2000, 6, 21],
+    [2019, 7, 4],
+    [2020, 8, 31],
+    [1956, 9, 10],
+    [2010, 10, 10],
+    [1982, 11, 30],
+    [1960, 12, 19],
+    ['=YEAR(TODAY())', '=MONTH(TODAY())', '=DAY(TODAY())'],
+];
+$testDateCount = count($testDates);
+
+$worksheet->fromArray($testDates, null, 'A1', true);
+
+for ($row = 1; $row <= $testDateCount; ++$row) {
+    $worksheet->setCellValue('D' . $row, '=DATE(A' . $row . ',B' . $row . ',C' . $row . ')');
+    $worksheet->setCellValue('E' . $row, '=D' . $row);
+    $worksheet->setCellValue('F' . $row, '=WEEKDAY(D' . $row . ')');
+    $worksheet->setCellValue('G' . $row, '=WEEKDAY(D' . $row . ', 2)');
+}
+$worksheet->getStyle('E1:E' . $testDateCount)
+    ->getNumberFormat()
+    ->setFormatCode('yyyy-mm-dd');
+
+// Test the formulae
+for ($row = 1; $row <= $testDateCount; ++$row) {
+    $helper->log(sprintf('(E%d): %s', $row, $worksheet->getCell('E' . $row)->getFormattedValue()));
+    $helper->log(sprintf(
+        'Weekday is: %d (1-7 = Sun-Sat)',
+        $worksheet->getCell('F' . $row)->getCalculatedValue()
+    ));
+    $helper->log(sprintf(
+        'Weekday is: %d (1-7 = Mon-Sun)',
+        $worksheet->getCell('G' . $row)->getCalculatedValue()
+    ));
+}
diff --git a/samples/Calculations/DateTime/WEEKNUM.php b/samples/Calculations/DateTime/WEEKNUM.php
new file mode 100644
index 00000000..1d4c4a12
--- /dev/null
+++ b/samples/Calculations/DateTime/WEEKNUM.php
@@ -0,0 +1,52 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Date/Time';
+$functionName = 'WEEKNUM';
+$description = 'Returns the week number of a specific date';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testDates = [
+    [1900, 1, 1],
+    [1904, 2, 14],
+    [1936, 3, 17],
+    [1964, 4, 29],
+    [1999, 5, 18],
+    [2000, 6, 21],
+    [2019, 7, 4],
+    [2020, 8, 31],
+    [1956, 9, 10],
+    [2010, 10, 10],
+    [1982, 11, 30],
+    [1960, 12, 19],
+    ['=YEAR(TODAY())', '=MONTH(TODAY())', '=DAY(TODAY())'],
+];
+$testDateCount = count($testDates);
+
+$worksheet->fromArray($testDates, null, 'A1', true);
+
+for ($row = 1; $row <= $testDateCount; ++$row) {
+    $worksheet->setCellValue('D' . $row, '=DATE(A' . $row . ',B' . $row . ',C' . $row . ')');
+    $worksheet->setCellValue('E' . $row, '=D' . $row);
+    $worksheet->setCellValue('F' . $row, '=WEEKNUM(D' . $row . ')');
+    $worksheet->setCellValue('G' . $row, '=WEEKNUM(D' . $row . ', 21)');
+}
+$worksheet->getStyle('E1:E' . $testDateCount)
+    ->getNumberFormat()
+    ->setFormatCode('yyyy-mm-dd');
+
+// Test the formulae
+for ($row = 1; $row <= $testDateCount; ++$row) {
+    $helper->log(sprintf('(E%d): %s', $row, $worksheet->getCell('E' . $row)->getFormattedValue()));
+    $helper->log('System 1 Week number is: ' . $worksheet->getCell('F' . $row)->getCalculatedValue());
+    $helper->log('System 2 (ISO-8601) Week number is: ' . $worksheet->getCell('G' . $row)->getCalculatedValue());
+}
diff --git a/samples/Calculations/DateTime/YEAR.php b/samples/Calculations/DateTime/YEAR.php
new file mode 100644
index 00000000..f7bfa6ea
--- /dev/null
+++ b/samples/Calculations/DateTime/YEAR.php
@@ -0,0 +1,50 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Date/Time';
+$functionName = 'YEAR';
+$description = 'Returns the year of a date, an integer ranging from 1900 to 9999';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testDates = [
+    [1900, 1, 1],
+    [1904, 2, 14],
+    [1936, 3, 17],
+    [1964, 4, 29],
+    [1999, 5, 18],
+    [2000, 6, 21],
+    [2019, 7, 4],
+    [2020, 8, 31],
+    [1956, 9, 10],
+    [2010, 10, 10],
+    [1982, 11, 30],
+    [1960, 12, 19],
+    ['=YEAR(TODAY())', '=MONTH(TODAY())', '=DAY(TODAY())'],
+];
+$testDateCount = count($testDates);
+
+$worksheet->fromArray($testDates, null, 'A1', true);
+
+for ($row = 1; $row <= $testDateCount; ++$row) {
+    $worksheet->setCellValue('D' . $row, '=DATE(A' . $row . ',B' . $row . ',C' . $row . ')');
+    $worksheet->setCellValue('E' . $row, '=D' . $row);
+    $worksheet->setCellValue('F' . $row, '=YEAR(D' . $row . ')');
+}
+$worksheet->getStyle('E1:E' . $testDateCount)
+    ->getNumberFormat()
+    ->setFormatCode('yyyy-mm-dd');
+
+// Test the formulae
+for ($row = 1; $row <= $testDateCount; ++$row) {
+    $helper->log(sprintf('(E%d): %s', $row, $worksheet->getCell('E' . $row)->getFormattedValue()));
+    $helper->log('Year is: ' . $worksheet->getCell('F' . $row)->getCalculatedValue());
+}
diff --git a/src/PhpSpreadsheet/Helper/Sample.php b/src/PhpSpreadsheet/Helper/Sample.php
index aeb2bea6..9f7563d6 100644
--- a/src/PhpSpreadsheet/Helper/Sample.php
+++ b/src/PhpSpreadsheet/Helper/Sample.php
@@ -187,8 +187,8 @@ class Sample
     {
         $this->log(sprintf('%s Functions:', $category));
         $description === null
-            ? $this->log(sprintf('%s()', rtrim($functionName, '()')))
-            : $this->log(sprintf('%s() - %s.', rtrim($functionName, '()'), rtrim($description, '.')));
+            ? $this->log(sprintf('Function: %s()', rtrim($functionName, '()')))
+            : $this->log(sprintf('Function: %s() - %s.', rtrim($functionName, '()'), rtrim($description, '.')));
     }
 
     public function displayGrid(array $matrix): void

From 7e3807309de6794fb277ceb8ef9af8bb6969e775 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Fri, 9 Sep 2022 07:34:36 -0700
Subject: [PATCH 50/69] Reconcile Differences between Css and Excel For Cell
 Alignment (#3048)

This PR expands on PR #2195 from @nkjackzhang. That PR has been stalled for some time awaiting requested fixes. Those fixes are part of this PR, and additional tests and samples are added. The original request was to handle `vertical-align:middle` in Css (Excel uses `center`). This PR does its best to also handle vertical alignment Excel values not found in Css - `justify` (as `middle`) and `distributed` (as `middle`). It likewises handles valid Css values not found in Excel (`baseline`, `sub`, and `text-bottom` as `bottom`; `super` and `text-top` as `top`; `middle` as `center`).

It also handles horizontal alignment Excel values not found in Css - `center-continuous` as `center` and `distributed` as `justify`; I couldn't think of a reasonable equivalent for `fill`, so it is ignored.

The values assigned for vertical and horizontal alignment are now lower-cased (special handling required for `centerContinuous`).
---
 samples/Basic/49_alignment.php                | 80 +++++++++++++++++
 src/PhpSpreadsheet/Style/Alignment.php        | 69 +++++++++++++--
 src/PhpSpreadsheet/Writer/Html.php            | 24 ++---
 src/PhpSpreadsheet/Writer/Xlsx/Style.php      | 21 +++--
 .../Style/AlignmentMiddleTest.php             | 87 +++++++++++++++++++
 .../Style/AlignmentTest.php                   | 31 ++++---
 6 files changed, 273 insertions(+), 39 deletions(-)
 create mode 100644 samples/Basic/49_alignment.php
 create mode 100644 tests/PhpSpreadsheetTests/Style/AlignmentMiddleTest.php

diff --git a/samples/Basic/49_alignment.php b/samples/Basic/49_alignment.php
new file mode 100644
index 00000000..83fdb3d4
--- /dev/null
+++ b/samples/Basic/49_alignment.php
@@ -0,0 +1,80 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+
+require __DIR__ . '/../Header.php';
+
+$helper->log('Create new Spreadsheet object');
+$spreadsheet = new Spreadsheet();
+$spreadsheet->getProperties()->setTitle('Alignment');
+$sheet = $spreadsheet->getActiveSheet();
+$hi = 'Hi There';
+$ju = 'This is a longer than normal sentence';
+$sheet->fromArray([
+    ['', 'default', 'bottom', 'top', 'center', 'justify', 'distributed'],
+    ['default', $hi, $hi, $hi, $hi, $hi, $hi],
+    ['left', $hi, $hi, $hi, $hi, $hi, $hi],
+    ['right', $hi, $hi, $hi, $hi, $hi, $hi],
+    ['center', $hi, $hi, $hi, $hi, $hi, $hi],
+    ['justify', $ju, $ju, $ju, $ju, $ju, $ju],
+    ['distributed', $ju, $ju, $ju, $ju, $ju, $ju],
+]);
+$sheet->getColumnDimension('B')->setWidth(20);
+$sheet->getColumnDimension('C')->setWidth(20);
+$sheet->getColumnDimension('D')->setWidth(20);
+$sheet->getColumnDimension('E')->setWidth(20);
+$sheet->getColumnDimension('F')->setWidth(20);
+$sheet->getColumnDimension('G')->setWidth(20);
+$sheet->getRowDimension(2)->setRowHeight(30);
+$sheet->getRowDimension(3)->setRowHeight(30);
+$sheet->getRowDimension(4)->setRowHeight(30);
+$sheet->getRowDimension(5)->setRowHeight(30);
+$sheet->getRowDimension(6)->setRowHeight(40);
+$sheet->getRowDimension(7)->setRowHeight(40);
+$minRow = 2;
+$maxRow = 7;
+$minCol = 'B';
+$maxCol = 'g';
+$sheet->getStyle("C$minRow:C$maxRow")
+    ->getAlignment()
+    ->setVertical(Alignment::VERTICAL_BOTTOM);
+$sheet->getStyle("D$minRow:D$maxRow")
+    ->getAlignment()
+    ->setVertical(Alignment::VERTICAL_TOP);
+$sheet->getStyle("E$minRow:E$maxRow")
+    ->getAlignment()
+    ->setVertical(Alignment::VERTICAL_CENTER);
+$sheet->getStyle("F$minRow:F$maxRow")
+    ->getAlignment()
+    ->setVertical(Alignment::VERTICAL_JUSTIFY);
+$sheet->getStyle("G$minRow:G$maxRow")
+    ->getAlignment()
+    ->setVertical(Alignment::VERTICAL_DISTRIBUTED);
+$sheet->getStyle("{$minCol}3:{$maxCol}3")
+    ->getAlignment()
+    ->setHorizontal(Alignment::HORIZONTAL_LEFT);
+$sheet->getStyle("{$minCol}4:{$maxCol}4")
+    ->getAlignment()
+    ->setHorizontal(Alignment::HORIZONTAL_RIGHT);
+$sheet->getStyle("{$minCol}5:{$maxCol}5")
+    ->getAlignment()
+    ->setHorizontal(Alignment::HORIZONTAL_CENTER);
+$sheet->getStyle("{$minCol}6:{$maxCol}6")
+    ->getAlignment()
+    ->setHorizontal(Alignment::HORIZONTAL_JUSTIFY);
+$sheet->getStyle("{$minCol}7:{$maxCol}7")
+    ->getAlignment()
+    ->setHorizontal(Alignment::HORIZONTAL_DISTRIBUTED);
+
+$sheet->getCell('A9')->setValue('Center Continuous A9-C9');
+$sheet->getStyle('A9:C9')
+    ->getAlignment()
+    ->setHorizontal(Alignment::HORIZONTAL_CENTER_CONTINUOUS);
+$sheet->getCell('A10')->setValue('Fill');
+$sheet->getStyle('A10')
+    ->getAlignment()
+    ->setHorizontal(Alignment::HORIZONTAL_FILL);
+$sheet->setSelectedCells('A1');
+
+$helper->write($spreadsheet, __FILE__, ['Xlsx', 'Html', 'Xls']);
diff --git a/src/PhpSpreadsheet/Style/Alignment.php b/src/PhpSpreadsheet/Style/Alignment.php
index 83ac5b0d..68edfaca 100644
--- a/src/PhpSpreadsheet/Style/Alignment.php
+++ b/src/PhpSpreadsheet/Style/Alignment.php
@@ -15,6 +15,27 @@ class Alignment extends Supervisor
     const HORIZONTAL_JUSTIFY = 'justify';
     const HORIZONTAL_FILL = 'fill';
     const HORIZONTAL_DISTRIBUTED = 'distributed'; // Excel2007 only
+    private const HORIZONTAL_CENTER_CONTINUOUS_LC = 'centercontinuous';
+    // Mapping for horizontal alignment
+    const HORIZONTAL_ALIGNMENT_FOR_XLSX = [
+        self::HORIZONTAL_LEFT => self::HORIZONTAL_LEFT,
+        self::HORIZONTAL_RIGHT => self::HORIZONTAL_RIGHT,
+        self::HORIZONTAL_CENTER => self::HORIZONTAL_CENTER,
+        self::HORIZONTAL_CENTER_CONTINUOUS => self::HORIZONTAL_CENTER_CONTINUOUS,
+        self::HORIZONTAL_JUSTIFY => self::HORIZONTAL_JUSTIFY,
+        self::HORIZONTAL_FILL => self::HORIZONTAL_FILL,
+        self::HORIZONTAL_DISTRIBUTED => self::HORIZONTAL_DISTRIBUTED,
+    ];
+    // Mapping for horizontal alignment CSS
+    const HORIZONTAL_ALIGNMENT_FOR_HTML = [
+        self::HORIZONTAL_LEFT => self::HORIZONTAL_LEFT,
+        self::HORIZONTAL_RIGHT => self::HORIZONTAL_RIGHT,
+        self::HORIZONTAL_CENTER => self::HORIZONTAL_CENTER,
+        self::HORIZONTAL_CENTER_CONTINUOUS => self::HORIZONTAL_CENTER,
+        self::HORIZONTAL_JUSTIFY => self::HORIZONTAL_JUSTIFY,
+        //self::HORIZONTAL_FILL => self::HORIZONTAL_FILL, // no reasonable equivalent for fill
+        self::HORIZONTAL_DISTRIBUTED => self::HORIZONTAL_JUSTIFY,
+    ];
 
     // Vertical alignment styles
     const VERTICAL_BOTTOM = 'bottom';
@@ -22,6 +43,45 @@ class Alignment extends Supervisor
     const VERTICAL_CENTER = 'center';
     const VERTICAL_JUSTIFY = 'justify';
     const VERTICAL_DISTRIBUTED = 'distributed'; // Excel2007 only
+    // Vertical alignment CSS
+    private const VERTICAL_BASELINE = 'baseline';
+    private const VERTICAL_MIDDLE = 'middle';
+    private const VERTICAL_SUB = 'sub';
+    private const VERTICAL_SUPER = 'super';
+    private const VERTICAL_TEXT_BOTTOM = 'text-bottom';
+    private const VERTICAL_TEXT_TOP = 'text-top';
+
+    // Mapping for vertical alignment
+    const VERTICAL_ALIGNMENT_FOR_XLSX = [
+        self::VERTICAL_BOTTOM => self::VERTICAL_BOTTOM,
+        self::VERTICAL_TOP => self::VERTICAL_TOP,
+        self::VERTICAL_CENTER => self::VERTICAL_CENTER,
+        self::VERTICAL_JUSTIFY => self::VERTICAL_JUSTIFY,
+        self::VERTICAL_DISTRIBUTED => self::VERTICAL_DISTRIBUTED,
+        // css settings that arent't in sync with Excel
+        self::VERTICAL_BASELINE => self::VERTICAL_BOTTOM,
+        self::VERTICAL_MIDDLE => self::VERTICAL_CENTER,
+        self::VERTICAL_SUB => self::VERTICAL_BOTTOM,
+        self::VERTICAL_SUPER => self::VERTICAL_TOP,
+        self::VERTICAL_TEXT_BOTTOM => self::VERTICAL_BOTTOM,
+        self::VERTICAL_TEXT_TOP => self::VERTICAL_TOP,
+    ];
+
+    // Mapping for vertical alignment for Html
+    const VERTICAL_ALIGNMENT_FOR_HTML = [
+        self::VERTICAL_BOTTOM => self::VERTICAL_BOTTOM,
+        self::VERTICAL_TOP => self::VERTICAL_TOP,
+        self::VERTICAL_CENTER => self::VERTICAL_MIDDLE,
+        self::VERTICAL_JUSTIFY => self::VERTICAL_MIDDLE,
+        self::VERTICAL_DISTRIBUTED => self::VERTICAL_MIDDLE,
+        // css settings that arent't in sync with Excel
+        self::VERTICAL_BASELINE => self::VERTICAL_BASELINE,
+        self::VERTICAL_MIDDLE => self::VERTICAL_MIDDLE,
+        self::VERTICAL_SUB => self::VERTICAL_SUB,
+        self::VERTICAL_SUPER => self::VERTICAL_SUPER,
+        self::VERTICAL_TEXT_BOTTOM => self::VERTICAL_TEXT_BOTTOM,
+        self::VERTICAL_TEXT_TOP => self::VERTICAL_TEXT_TOP,
+    ];
 
     // Read order
     const READORDER_CONTEXT = 0;
@@ -202,8 +262,9 @@ class Alignment extends Supervisor
      */
     public function setHorizontal(string $horizontalAlignment)
     {
-        if ($horizontalAlignment == '') {
-            $horizontalAlignment = self::HORIZONTAL_GENERAL;
+        $horizontalAlignment = strtolower($horizontalAlignment);
+        if ($horizontalAlignment === self::HORIZONTAL_CENTER_CONTINUOUS_LC) {
+            $horizontalAlignment = self::HORIZONTAL_CENTER_CONTINUOUS;
         }
 
         if ($this->isSupervisor) {
@@ -239,9 +300,7 @@ class Alignment extends Supervisor
      */
     public function setVertical($verticalAlignment)
     {
-        if ($verticalAlignment == '') {
-            $verticalAlignment = self::VERTICAL_BOTTOM;
-        }
+        $verticalAlignment = strtolower($verticalAlignment);
 
         if ($this->isSupervisor) {
             $styleArray = $this->getStyleArray(['vertical' => $verticalAlignment]);
diff --git a/src/PhpSpreadsheet/Writer/Html.php b/src/PhpSpreadsheet/Writer/Html.php
index 6a400673..c115cabb 100644
--- a/src/PhpSpreadsheet/Writer/Html.php
+++ b/src/PhpSpreadsheet/Writer/Html.php
@@ -230,13 +230,6 @@ class Html extends BaseWriter
         $this->editHtmlCallback = $callback;
     }
 
-    const VALIGN_ARR = [
-        Alignment::VERTICAL_BOTTOM => 'bottom',
-        Alignment::VERTICAL_TOP => 'top',
-        Alignment::VERTICAL_CENTER => 'middle',
-        Alignment::VERTICAL_JUSTIFY => 'middle',
-    ];
-
     /**
      * Map VAlign.
      *
@@ -246,17 +239,9 @@ class Html extends BaseWriter
      */
     private function mapVAlign($vAlign)
     {
-        return array_key_exists($vAlign, self::VALIGN_ARR) ? self::VALIGN_ARR[$vAlign] : 'baseline';
+        return Alignment::VERTICAL_ALIGNMENT_FOR_HTML[$vAlign] ?? '';
     }
 
-    const HALIGN_ARR = [
-        Alignment::HORIZONTAL_LEFT => 'left',
-        Alignment::HORIZONTAL_RIGHT => 'right',
-        Alignment::HORIZONTAL_CENTER => 'center',
-        Alignment::HORIZONTAL_CENTER_CONTINUOUS => 'center',
-        Alignment::HORIZONTAL_JUSTIFY => 'justify',
-    ];
-
     /**
      * Map HAlign.
      *
@@ -266,7 +251,7 @@ class Html extends BaseWriter
      */
     private function mapHAlign($hAlign)
     {
-        return array_key_exists($hAlign, self::HALIGN_ARR) ? self::HALIGN_ARR[$hAlign] : '';
+        return Alignment::HORIZONTAL_ALIGNMENT_FOR_HTML[$hAlign] ?? '';
     }
 
     const BORDER_ARR = [
@@ -988,7 +973,10 @@ class Html extends BaseWriter
         $css = [];
 
         // Create CSS
-        $css['vertical-align'] = $this->mapVAlign($alignment->getVertical() ?? '');
+        $verticalAlign = $this->mapVAlign($alignment->getVertical() ?? '');
+        if ($verticalAlign) {
+            $css['vertical-align'] = $verticalAlign;
+        }
         $textAlign = $this->mapHAlign($alignment->getHorizontal() ?? '');
         if ($textAlign) {
             $css['text-align'] = $textAlign;
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Style.php b/src/PhpSpreadsheet/Writer/Xlsx/Style.php
index b24b7533..0442c25d 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/Style.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/Style.php
@@ -5,6 +5,7 @@ namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
 use PhpOffice\PhpSpreadsheet\Style\Border;
 use PhpOffice\PhpSpreadsheet\Style\Borders;
 use PhpOffice\PhpSpreadsheet\Style\Conditional;
@@ -403,8 +404,14 @@ class Style extends WriterPart
 
         // alignment
         $objWriter->startElement('alignment');
-        $objWriter->writeAttribute('horizontal', (string) $style->getAlignment()->getHorizontal());
-        $objWriter->writeAttribute('vertical', (string) $style->getAlignment()->getVertical());
+        $vertical = Alignment::VERTICAL_ALIGNMENT_FOR_XLSX[$style->getAlignment()->getVertical()] ?? '';
+        $horizontal = Alignment::HORIZONTAL_ALIGNMENT_FOR_XLSX[$style->getAlignment()->getHorizontal()] ?? '';
+        if ($horizontal !== '') {
+            $objWriter->writeAttribute('horizontal', $horizontal);
+        }
+        if ($vertical !== '') {
+            $objWriter->writeAttribute('vertical', $vertical);
+        }
 
         $textRotation = 0;
         if ($style->getAlignment()->getTextRotation() >= 0) {
@@ -459,11 +466,13 @@ class Style extends WriterPart
 
         // alignment
         $objWriter->startElement('alignment');
-        if ($style->getAlignment()->getHorizontal() !== null) {
-            $objWriter->writeAttribute('horizontal', $style->getAlignment()->getHorizontal());
+        $horizontal = Alignment::HORIZONTAL_ALIGNMENT_FOR_XLSX[$style->getAlignment()->getHorizontal()] ?? '';
+        if ($horizontal) {
+            $objWriter->writeAttribute('horizontal', $horizontal);
         }
-        if ($style->getAlignment()->getVertical() !== null) {
-            $objWriter->writeAttribute('vertical', $style->getAlignment()->getVertical());
+        $vertical = Alignment::VERTICAL_ALIGNMENT_FOR_XLSX[$style->getAlignment()->getVertical()] ?? '';
+        if ($vertical) {
+            $objWriter->writeAttribute('vertical', $vertical);
         }
 
         if ($style->getAlignment()->getTextRotation() !== null) {
diff --git a/tests/PhpSpreadsheetTests/Style/AlignmentMiddleTest.php b/tests/PhpSpreadsheetTests/Style/AlignmentMiddleTest.php
new file mode 100644
index 00000000..1d260a6e
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Style/AlignmentMiddleTest.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Style;
+
+use PhpOffice\PhpSpreadsheet\Shared\File;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PhpOffice\PhpSpreadsheet\Writer\Html;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+use PHPUnit\Framework\TestCase;
+use ZipArchive;
+
+class AlignmentMiddleTest extends TestCase
+{
+    /** @var ?Spreadsheet */
+    private $spreadsheet;
+
+    /** @var string */
+    private $outputFileName = '';
+
+    protected function tearDown(): void
+    {
+        if ($this->spreadsheet !== null) {
+            $this->spreadsheet->disconnectWorksheets();
+            $this->spreadsheet = null;
+        }
+        if ($this->outputFileName !== '') {
+            unlink($this->outputFileName);
+            $this->outputFileName = '';
+        }
+    }
+
+    public function testCenterWriteHtml(): void
+    {
+        // Html Writer changes vertical align center to middle
+        $this->spreadsheet = new Spreadsheet();
+        $sheet = $this->spreadsheet->getActiveSheet();
+        $sheet->getCell('A1')->setValue('Cell1');
+        $sheet->getStyle('A1')
+            ->getAlignment()
+            ->setVertical(Alignment::VERTICAL_CENTER);
+        $writer = new HTML($this->spreadsheet);
+        $html = $writer->generateHtmlAll();
+        self::assertStringContainsString('vertical-align:middle', $html);
+        self::assertStringNotContainsString('vertical-align:center', $html);
+    }
+
+    public function testCenterWriteXlsx(): void
+    {
+        // Xlsx Writer uses vertical align center unchanged
+        $this->spreadsheet = new Spreadsheet();
+        $sheet = $this->spreadsheet->getActiveSheet();
+        $sheet->getCell('A1')->setValue('Cell1');
+        $sheet->getStyle('A1')
+            ->getAlignment()
+            ->setVertical(Alignment::VERTICAL_CENTER);
+        $this->outputFileName = File::temporaryFilename();
+        $writer = new Xlsx($this->spreadsheet);
+        $writer->save($this->outputFileName);
+        $zip = new ZipArchive();
+        $zip->open($this->outputFileName);
+        $html = $zip->getFromName('xl/styles.xml');
+        $zip->close();
+        self::assertStringContainsString('vertical="center"', $html);
+        self::assertStringNotContainsString('vertical="middle"', $html);
+    }
+
+    public function testCenterWriteXlsx2(): void
+    {
+        // Xlsx Writer changes vertical align middle to center
+        $this->spreadsheet = new Spreadsheet();
+        $sheet = $this->spreadsheet->getActiveSheet();
+        $sheet->getCell('A1')->setValue('Cell1');
+        $sheet->getStyle('A1')
+            ->getAlignment()
+            ->setVertical('middle');
+        $this->outputFileName = File::temporaryFilename();
+        $writer = new Xlsx($this->spreadsheet);
+        $writer->save($this->outputFileName);
+        $zip = new ZipArchive();
+        $zip->open($this->outputFileName);
+        $html = $zip->getFromName('xl/styles.xml');
+        $zip->close();
+        self::assertStringContainsString('vertical="center"', $html);
+        self::assertStringNotContainsString('vertical="middle"', $html);
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Style/AlignmentTest.php b/tests/PhpSpreadsheetTests/Style/AlignmentTest.php
index d10e3211..6f50ce22 100644
--- a/tests/PhpSpreadsheetTests/Style/AlignmentTest.php
+++ b/tests/PhpSpreadsheetTests/Style/AlignmentTest.php
@@ -9,10 +9,21 @@ use PHPUnit\Framework\TestCase;
 
 class AlignmentTest extends TestCase
 {
+    /** @var ?Spreadsheet */
+    private $spreadsheet;
+
+    protected function tearDown(): void
+    {
+        if ($this->spreadsheet !== null) {
+            $this->spreadsheet->disconnectWorksheets();
+            $this->spreadsheet = null;
+        }
+    }
+
     public function testAlignment(): void
     {
-        $spreadsheet = new Spreadsheet();
-        $sheet = $spreadsheet->getActiveSheet();
+        $this->spreadsheet = new Spreadsheet();
+        $sheet = $this->spreadsheet->getActiveSheet();
         $cell1 = $sheet->getCell('A1');
         $cell1->setValue('Cell1');
         $cell1->getStyle()->getAlignment()->setTextRotation(45);
@@ -31,8 +42,8 @@ class AlignmentTest extends TestCase
     public function testRotationTooHigh(): void
     {
         $this->expectException(PhpSpreadsheetException::class);
-        $spreadsheet = new Spreadsheet();
-        $sheet = $spreadsheet->getActiveSheet();
+        $this->spreadsheet = new Spreadsheet();
+        $sheet = $this->spreadsheet->getActiveSheet();
         $cell1 = $sheet->getCell('A1');
         $cell1->setValue('Cell1');
         $cell1->getStyle()->getAlignment()->setTextRotation(91);
@@ -42,8 +53,8 @@ class AlignmentTest extends TestCase
     public function testRotationTooLow(): void
     {
         $this->expectException(PhpSpreadsheetException::class);
-        $spreadsheet = new Spreadsheet();
-        $sheet = $spreadsheet->getActiveSheet();
+        $this->spreadsheet = new Spreadsheet();
+        $sheet = $this->spreadsheet->getActiveSheet();
         $cell1 = $sheet->getCell('A1');
         $cell1->setValue('Cell1');
         $cell1->getStyle()->getAlignment()->setTextRotation(-91);
@@ -52,8 +63,8 @@ class AlignmentTest extends TestCase
 
     public function testHorizontal(): void
     {
-        $spreadsheet = new Spreadsheet();
-        $sheet = $spreadsheet->getActiveSheet();
+        $this->spreadsheet = new Spreadsheet();
+        $sheet = $this->spreadsheet->getActiveSheet();
         $cell1 = $sheet->getCell('A1');
         $cell1->setValue('X');
         $cell1->getStyle()->getAlignment()->setHorizontal(Alignment::HORIZONTAL_LEFT)->setIndent(1);
@@ -74,8 +85,8 @@ class AlignmentTest extends TestCase
 
     public function testReadOrder(): void
     {
-        $spreadsheet = new Spreadsheet();
-        $sheet = $spreadsheet->getActiveSheet();
+        $this->spreadsheet = new Spreadsheet();
+        $sheet = $this->spreadsheet->getActiveSheet();
         $cell1 = $sheet->getCell('A1');
         $cell1->setValue('ABC');
         $cell1->getStyle()->getAlignment()->setReadOrder(0);

From b5f70de61d3ebe5ee09220e9c7f47d8a60f976a4 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Fri, 9 Sep 2022 07:56:11 -0700
Subject: [PATCH 51/69] More Scrutinizer Catch Up (#3050)

* More Scrutinizer Catch Up

Continue the work of PR #3043 by attending to the 12 remaining 'new' issues.

* Php 8.1 Problem

One new null-instead-of-string problem.
---
 phpstan-baseline.neon                         | 15 -------
 .../Chart/33_Chart_create_line_dateaxis.php   | 22 +++++-----
 src/PhpSpreadsheet/Chart/Axis.php             |  2 +-
 src/PhpSpreadsheet/Chart/Chart.php            |  6 ++-
 src/PhpSpreadsheet/Reader/Xlsx.php            | 13 +++---
 src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php | 12 +++---
 src/PhpSpreadsheet/Reader/Xlsx/Chart.php      | 40 +++++++++----------
 src/PhpSpreadsheet/Worksheet/PageSetup.php    |  9 +++--
 src/PhpSpreadsheet/Worksheet/Worksheet.php    |  2 +-
 src/PhpSpreadsheet/Writer/Html.php            | 29 +++++++-------
 src/PhpSpreadsheet/Writer/Xls/Worksheet.php   |  4 +-
 src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php  |  8 ++--
 .../Reader/Xlsx/AutoFilter2Test.php           |  1 +
 tests/PhpSpreadsheetTests/RichTextTest.php    |  3 --
 14 files changed, 78 insertions(+), 88 deletions(-)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index cc2eaa3d..3e2ccfc1 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -2590,21 +2590,6 @@ parameters:
 			count: 1
 			path: src/PhpSpreadsheet/Worksheet/PageSetup.php
 
-		-
-			message: "#^Parameter \\#1 \\$value of method PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\PageSetup\\:\\:setFirstPageNumber\\(\\) expects int, null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/PageSetup.php
-
-		-
-			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\PageSetup\\:\\:\\$pageOrder has no type specified\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/PageSetup.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between int\\<min, \\-1\\> and null will always evaluate to false\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Worksheet/PageSetup.php
-
 		-
 			message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\SheetView\\:\\:\\$sheetViewTypes has no type specified\\.$#"
 			count: 1
diff --git a/samples/Chart/33_Chart_create_line_dateaxis.php b/samples/Chart/33_Chart_create_line_dateaxis.php
index 1a47e5aa..413866e2 100644
--- a/samples/Chart/33_Chart_create_line_dateaxis.php
+++ b/samples/Chart/33_Chart_create_line_dateaxis.php
@@ -101,10 +101,10 @@ $dataSeriesValues = [
 // marker details
 $dataSeriesValues[0]
     ->getMarkerFillColor()
-    ->setColorProperties('0070C0', null, ChartColor::EXCEL_COLOR_TYPE_ARGB);
+    ->setColorProperties('0070C0', null, ChartColor::EXCEL_COLOR_TYPE_RGB);
 $dataSeriesValues[0]
     ->getMarkerBorderColor()
-    ->setColorProperties('002060', null, ChartColor::EXCEL_COLOR_TYPE_ARGB);
+    ->setColorProperties('002060', null, ChartColor::EXCEL_COLOR_TYPE_RGB);
 
 // line details - dashed, smooth line (Bezier) with arrows, 40% transparent
 $dataSeriesValues[0]
@@ -129,18 +129,18 @@ $dataSeriesValues[1] // square marker border color
     ->setColorProperties('accent6', 3, ChartColor::EXCEL_COLOR_TYPE_SCHEME);
 $dataSeriesValues[1] // square marker fill color
     ->getMarkerFillColor()
-    ->setColorProperties('0FFF00', null, ChartColor::EXCEL_COLOR_TYPE_ARGB);
+    ->setColorProperties('0FFF00', null, ChartColor::EXCEL_COLOR_TYPE_RGB);
 $dataSeriesValues[1]
     ->setScatterLines(true)
     ->setSmoothLine(false)
-    ->setLineColorProperties('FF0000', 80, ChartColor::EXCEL_COLOR_TYPE_ARGB);
+    ->setLineColorProperties('FF0000', 80, ChartColor::EXCEL_COLOR_TYPE_RGB);
 $dataSeriesValues[1]->setLineWidth(2.0);
 
 // series 3 - metric3, markers, no line
 $dataSeriesValues[2] // triangle? fill
     //->setPointMarker('triangle') // let Excel choose shape, which is predicted to be a triangle
     ->getMarkerFillColor()
-    ->setColorProperties('FFFF00', null, ChartColor::EXCEL_COLOR_TYPE_ARGB);
+    ->setColorProperties('FFFF00', null, ChartColor::EXCEL_COLOR_TYPE_RGB);
 $dataSeriesValues[2] // triangle border
     ->getMarkerBorderColor()
     ->setColorProperties('accent4', null, ChartColor::EXCEL_COLOR_TYPE_SCHEME);
@@ -239,7 +239,7 @@ $dataSeriesValues[0]
     ->setScatterlines(false); // disable connecting lines
 $dataSeriesValues[0]
     ->getMarkerFillColor()
-    ->setColorProperties('FFFF00', null, ChartColor::EXCEL_COLOR_TYPE_ARGB);
+    ->setColorProperties('FFFF00', null, ChartColor::EXCEL_COLOR_TYPE_RGB);
 $dataSeriesValues[0]
     ->getMarkerBorderColor()
     ->setColorProperties('accent4', null, ChartColor::EXCEL_COLOR_TYPE_SCHEME);
@@ -326,7 +326,7 @@ $chart = new Chart(
 // Set the position of the chart in the chart sheet below the first chart
 $chart->setTopLeftPosition('A13');
 $chart->setBottomRightPosition('P25');
-$chart->setRoundedCorners('true'); // Rounded corners in Chart Outline
+$chart->setRoundedCorners(true); // Rounded corners in Chart Outline
 
 // Add the chart to the worksheet $chartSheet
 $chartSheet->addChart($chart);
@@ -350,8 +350,8 @@ function dateRange(int $nrows, Spreadsheet $wrkbk): array
     $startDate = DateTime::createFromFormat('Y-m-d', $startDateStr); // php date obj
 
     // get date of first day of the quarter of the start date
-    $startMonth = $startDate->format('n'); // suppress leading zero
-    $startYr = $startDate->format('Y');
+    $startMonth = (int) $startDate->format('n'); // suppress leading zero
+    $startYr = (int) $startDate->format('Y');
     $qtr = intdiv($startMonth, 3) + (($startMonth % 3 > 0) ? 1 : 0);
     $qtrStartMonth = sprintf('%02d', 1 + (($qtr - 1) * 3));
     $qtrStartStr = "$startYr-$qtrStartMonth-01";
@@ -360,8 +360,8 @@ function dateRange(int $nrows, Spreadsheet $wrkbk): array
     // end the xaxis at the end of the quarter of the last date
     $lastDateStr = $dataSheet->getCellByColumnAndRow(2, $nrows + 1)->getValue();
     $lastDate = DateTime::createFromFormat('Y-m-d', $lastDateStr);
-    $lastMonth = $lastDate->format('n');
-    $lastYr = $lastDate->format('Y');
+    $lastMonth = (int) $lastDate->format('n');
+    $lastYr = (int) $lastDate->format('Y');
     $qtr = intdiv($lastMonth, 3) + (($lastMonth % 3 > 0) ? 1 : 0);
     $qtrEndMonth = 3 + (($qtr - 1) * 3);
     $lastDOM = cal_days_in_month(CAL_GREGORIAN, $qtrEndMonth, $lastYr);
diff --git a/src/PhpSpreadsheet/Chart/Axis.php b/src/PhpSpreadsheet/Chart/Axis.php
index 3ac5c3cd..9ebb081f 100644
--- a/src/PhpSpreadsheet/Chart/Axis.php
+++ b/src/PhpSpreadsheet/Chart/Axis.php
@@ -219,7 +219,7 @@ class Axis extends Properties
      * @param ?int $alpha
      * @param ?string $AlphaType
      */
-    public function setFillParameters($color, $alpha = null, $AlphaType = self::EXCEL_COLOR_TYPE_ARGB): void
+    public function setFillParameters($color, $alpha = null, $AlphaType = ChartColor::EXCEL_COLOR_TYPE_RGB): void
     {
         $this->fillColor->setColorProperties($color, $alpha, $AlphaType);
     }
diff --git a/src/PhpSpreadsheet/Chart/Chart.php b/src/PhpSpreadsheet/Chart/Chart.php
index 036338c6..f41d7883 100644
--- a/src/PhpSpreadsheet/Chart/Chart.php
+++ b/src/PhpSpreadsheet/Chart/Chart.php
@@ -774,9 +774,11 @@ class Chart
         return $this->roundedCorners;
     }
 
-    public function setRoundedCorners(bool $roundedCorners): self
+    public function setRoundedCorners(?bool $roundedCorners): self
     {
-        $this->roundedCorners = $roundedCorners;
+        if ($roundedCorners !== null) {
+            $this->roundedCorners = $roundedCorners;
+        }
 
         return $this;
     }
diff --git a/src/PhpSpreadsheet/Reader/Xlsx.php b/src/PhpSpreadsheet/Reader/Xlsx.php
index 244baddd..fc38375a 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx.php
@@ -306,22 +306,25 @@ class Xlsx extends BaseReader
         return (bool) $c->v;
     }
 
-    private static function castToError(SimpleXMLElement $c): ?string
+    private static function castToError(?SimpleXMLElement $c): ?string
     {
-        return isset($c->v) ? (string) $c->v : null;
+        return isset($c, $c->v) ? (string) $c->v : null;
     }
 
-    private static function castToString(SimpleXMLElement $c): ?string
+    private static function castToString(?SimpleXMLElement $c): ?string
     {
-        return isset($c->v) ? (string) $c->v : null;
+        return isset($c, $c->v) ? (string) $c->v : null;
     }
 
     /**
      * @param mixed $value
      * @param mixed $calculatedValue
      */
-    private function castToFormula(SimpleXMLElement $c, string $r, string &$cellDataType, &$value, &$calculatedValue, array &$sharedFormulas, string $castBaseType): void
+    private function castToFormula(?SimpleXMLElement $c, string $r, string &$cellDataType, &$value, &$calculatedValue, array &$sharedFormulas, string $castBaseType): void
     {
+        if ($c === null) {
+            return;
+        }
         $attr = $c->f->attributes();
         $cellDataType = 'f';
         $value = "={$c->f}";
diff --git a/src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php b/src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php
index 623c6691..39328adb 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx/AutoFilter.php
@@ -85,9 +85,9 @@ class AutoFilter
         }
     }
 
-    private function readCustomAutoFilter(SimpleXMLElement $filterColumn, Column $column): void
+    private function readCustomAutoFilter(?SimpleXMLElement $filterColumn, Column $column): void
     {
-        if ($filterColumn->customFilters) {
+        if (isset($filterColumn, $filterColumn->customFilters)) {
             $column->setFilterType(Column::AUTOFILTER_FILTERTYPE_CUSTOMFILTER);
             $customFilters = $filterColumn->customFilters;
             //    Custom filters can an AND or an OR join;
@@ -104,9 +104,9 @@ class AutoFilter
         }
     }
 
-    private function readDynamicAutoFilter(SimpleXMLElement $filterColumn, Column $column): void
+    private function readDynamicAutoFilter(?SimpleXMLElement $filterColumn, Column $column): void
     {
-        if ($filterColumn->dynamicFilter) {
+        if (isset($filterColumn, $filterColumn->dynamicFilter)) {
             $column->setFilterType(Column::AUTOFILTER_FILTERTYPE_DYNAMICFILTER);
             //    We should only ever have one dynamic filter
             foreach ($filterColumn->dynamicFilter as $filterRule) {
@@ -126,9 +126,9 @@ class AutoFilter
         }
     }
 
-    private function readTopTenAutoFilter(SimpleXMLElement $filterColumn, Column $column): void
+    private function readTopTenAutoFilter(?SimpleXMLElement $filterColumn, Column $column): void
     {
-        if ($filterColumn->top10) {
+        if (isset($filterColumn, $filterColumn->top10)) {
             $column->setFilterType(Column::AUTOFILTER_FILTERTYPE_TOPTENFILTER);
             //    We should only ever have one top10 filter
             foreach ($filterColumn->top10 as $filterRule) {
diff --git a/src/PhpSpreadsheet/Reader/Xlsx/Chart.php b/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
index 507c8f5b..6bc6d7c5 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
@@ -11,7 +11,7 @@ use PhpOffice\PhpSpreadsheet\Chart\GridLines;
 use PhpOffice\PhpSpreadsheet\Chart\Layout;
 use PhpOffice\PhpSpreadsheet\Chart\Legend;
 use PhpOffice\PhpSpreadsheet\Chart\PlotArea;
-use PhpOffice\PhpSpreadsheet\Chart\Properties;
+use PhpOffice\PhpSpreadsheet\Chart\Properties as ChartProperties;
 use PhpOffice\PhpSpreadsheet\Chart\Title;
 use PhpOffice\PhpSpreadsheet\Chart\TrendLine;
 use PhpOffice\PhpSpreadsheet\RichText\RichText;
@@ -113,6 +113,7 @@ class Chart
                                 $plotSeries = $plotAttributes = [];
                                 $catAxRead = false;
                                 $plotNoFill = false;
+                                /** @var SimpleXMLElement $chartDetail */
                                 foreach ($chartDetails as $chartDetailKey => $chartDetail) {
                                     switch ($chartDetailKey) {
                                         case 'spPr':
@@ -121,17 +122,18 @@ class Chart
                                                 $plotNoFill = true;
                                             }
                                             if (isset($possibleNoFill->gradFill->gsLst)) {
+                                                /** @var SimpleXMLElement $gradient */
                                                 foreach ($possibleNoFill->gradFill->gsLst->gs as $gradient) {
                                                     /** @var float */
                                                     $pos = self::getAttribute($gradient, 'pos', 'float');
                                                     $gradientArray[] = [
-                                                        $pos / Properties::PERCENTAGE_MULTIPLIER,
+                                                        $pos / ChartProperties::PERCENTAGE_MULTIPLIER,
                                                         new ChartColor($this->readColor($gradient)),
                                                     ];
                                                 }
                                             }
                                             if (isset($possibleNoFill->gradFill->lin)) {
-                                                $gradientLin = Properties::XmlToAngle((string) self::getAttribute($possibleNoFill->gradFill->lin, 'ang', 'string'));
+                                                $gradientLin = ChartProperties::XmlToAngle((string) self::getAttribute($possibleNoFill->gradFill->lin, 'ang', 'string'));
                                             }
 
                                             break;
@@ -464,12 +466,13 @@ class Chart
                     $pointSize = null;
                     $noFill = false;
                     $bubble3D = false;
-                    $dPtColors = [];
+                    $dptColors = [];
                     $markerFillColor = null;
                     $markerBorderColor = null;
                     $lineStyle = null;
                     $labelLayout = null;
                     $trendLines = [];
+                    /** @var SimpleXMLElement $seriesDetail */
                     foreach ($seriesDetails as $seriesKey => $seriesDetail) {
                         switch ($seriesKey) {
                             case 'idx':
@@ -487,7 +490,6 @@ class Chart
                                 break;
                             case 'spPr':
                                 $children = $seriesDetail->children($this->aNamespace);
-                                $ln = $children->ln;
                                 if (isset($children->ln)) {
                                     $ln = $children->ln;
                                     if (is_countable($ln->noFill) && count($ln->noFill) === 1) {
@@ -1161,7 +1163,7 @@ class Chart
         }
     }
 
-    private function readEffects(SimpleXMLElement $chartDetail, ?Properties $chartObject): void
+    private function readEffects(SimpleXMLElement $chartDetail, ?ChartProperties $chartObject): void
     {
         if (!isset($chartObject, $chartDetail->spPr)) {
             return;
@@ -1169,7 +1171,7 @@ class Chart
         $sppr = $chartDetail->spPr->children($this->aNamespace);
 
         if (isset($sppr->effectLst->glow)) {
-            $axisGlowSize = (float) self::getAttribute($sppr->effectLst->glow, 'rad', 'integer') / Properties::POINTS_WIDTH_MULTIPLIER;
+            $axisGlowSize = (float) self::getAttribute($sppr->effectLst->glow, 'rad', 'integer') / ChartProperties::POINTS_WIDTH_MULTIPLIER;
             if ($axisGlowSize != 0.0) {
                 $colorArray = $this->readColor($sppr->effectLst->glow);
                 $chartObject->setGlowProperties($axisGlowSize, $colorArray['value'], $colorArray['alpha'], $colorArray['type']);
@@ -1180,7 +1182,7 @@ class Chart
             /** @var string */
             $softEdgeSize = self::getAttribute($sppr->effectLst->softEdge, 'rad', 'string');
             if (is_numeric($softEdgeSize)) {
-                $chartObject->setSoftEdges((float) Properties::xmlToPoints($softEdgeSize));
+                $chartObject->setSoftEdges((float) ChartProperties::xmlToPoints($softEdgeSize));
             }
         }
 
@@ -1195,20 +1197,20 @@ class Chart
         if ($type !== '') {
             /** @var string */
             $blur = self::getAttribute($sppr->effectLst->$type, 'blurRad', 'string');
-            $blur = is_numeric($blur) ? Properties::xmlToPoints($blur) : null;
+            $blur = is_numeric($blur) ? ChartProperties::xmlToPoints($blur) : null;
             /** @var string */
             $dist = self::getAttribute($sppr->effectLst->$type, 'dist', 'string');
-            $dist = is_numeric($dist) ? Properties::xmlToPoints($dist) : null;
+            $dist = is_numeric($dist) ? ChartProperties::xmlToPoints($dist) : null;
             /** @var string */
             $direction = self::getAttribute($sppr->effectLst->$type, 'dir', 'string');
-            $direction = is_numeric($direction) ? Properties::xmlToAngle($direction) : null;
+            $direction = is_numeric($direction) ? ChartProperties::xmlToAngle($direction) : null;
             $algn = self::getAttribute($sppr->effectLst->$type, 'algn', 'string');
             $rot = self::getAttribute($sppr->effectLst->$type, 'rotWithShape', 'string');
             $size = [];
             foreach (['sx', 'sy'] as $sizeType) {
                 $sizeValue = self::getAttribute($sppr->effectLst->$type, $sizeType, 'string');
                 if (is_numeric($sizeValue)) {
-                    $size[$sizeType] = Properties::xmlToTenthOfPercent((string) $sizeValue);
+                    $size[$sizeType] = ChartProperties::xmlToTenthOfPercent((string) $sizeValue);
                 } else {
                     $size[$sizeType] = null;
                 }
@@ -1216,7 +1218,7 @@ class Chart
             foreach (['kx', 'ky'] as $sizeType) {
                 $sizeValue = self::getAttribute($sppr->effectLst->$type, $sizeType, 'string');
                 if (is_numeric($sizeValue)) {
-                    $size[$sizeType] = Properties::xmlToAngle((string) $sizeValue);
+                    $size[$sizeType] = ChartProperties::xmlToAngle((string) $sizeValue);
                 } else {
                     $size[$sizeType] = null;
                 }
@@ -1273,7 +1275,7 @@ class Chart
         return $result;
     }
 
-    private function readLineStyle(SimpleXMLElement $chartDetail, ?Properties $chartObject): void
+    private function readLineStyle(SimpleXMLElement $chartDetail, ?ChartProperties $chartObject): void
     {
         if (!isset($chartObject, $chartDetail->spPr)) {
             return;
@@ -1287,7 +1289,7 @@ class Chart
         /** @var string */
         $lineWidthTemp = self::getAttribute($sppr->ln, 'w', 'string');
         if (is_numeric($lineWidthTemp)) {
-            $lineWidth = Properties::xmlToPoints($lineWidthTemp);
+            $lineWidth = ChartProperties::xmlToPoints($lineWidthTemp);
         }
         /** @var string */
         $compoundType = self::getAttribute($sppr->ln, 'cmpd', 'string');
@@ -1296,15 +1298,13 @@ class Chart
         /** @var string */
         $capType = self::getAttribute($sppr->ln, 'cap', 'string');
         if (isset($sppr->ln->miter)) {
-            $joinType = Properties::LINE_STYLE_JOIN_MITER;
+            $joinType = ChartProperties::LINE_STYLE_JOIN_MITER;
         } elseif (isset($sppr->ln->bevel)) {
-            $joinType = Properties::LINE_STYLE_JOIN_BEVEL;
+            $joinType = ChartProperties::LINE_STYLE_JOIN_BEVEL;
         } else {
             $joinType = '';
         }
-        $headArrowType = '';
         $headArrowSize = '';
-        $endArrowType = '';
         $endArrowSize = '';
         /** @var string */
         $headArrowType = self::getAttribute($sppr->ln->headEnd, 'type', 'string');
@@ -1403,7 +1403,7 @@ class Chart
                 /** @var string */
                 $textRotation = self::getAttribute($children->bodyPr, 'rot', 'string');
                 if (is_numeric($textRotation)) {
-                    $whichAxis->setAxisOption('textRotation', (string) Properties::xmlToAngle($textRotation));
+                    $whichAxis->setAxisOption('textRotation', (string) ChartProperties::xmlToAngle($textRotation));
                 }
             }
         }
diff --git a/src/PhpSpreadsheet/Worksheet/PageSetup.php b/src/PhpSpreadsheet/Worksheet/PageSetup.php
index c23bfc59..4bdc2d4c 100644
--- a/src/PhpSpreadsheet/Worksheet/PageSetup.php
+++ b/src/PhpSpreadsheet/Worksheet/PageSetup.php
@@ -259,10 +259,11 @@ class PageSetup
     /**
      * First page number.
      *
-     * @var int
+     * @var ?int
      */
     private $firstPageNumber;
 
+    /** @var string */
     private $pageOrder = self::PAGEORDER_DOWN_THEN_OVER;
 
     /**
@@ -375,7 +376,7 @@ class PageSetup
     {
         // Microsoft Office Excel 2007 only allows setting a scale between 10 and 400 via the user interface,
         // but it is apparently still able to handle any scale >= 0, where 0 results in 100
-        if (($scale >= 0) || $scale === null) {
+        if ($scale === null || $scale >= 0) {
             $this->scale = $scale;
             if ($update) {
                 $this->fitToPage = false;
@@ -845,7 +846,7 @@ class PageSetup
     /**
      * Get first page number.
      *
-     * @return int
+     * @return ?int
      */
     public function getFirstPageNumber()
     {
@@ -855,7 +856,7 @@ class PageSetup
     /**
      * Set first page number.
      *
-     * @param int $value
+     * @param ?int $value
      *
      * @return $this
      */
diff --git a/src/PhpSpreadsheet/Worksheet/Worksheet.php b/src/PhpSpreadsheet/Worksheet/Worksheet.php
index 413ec9ef..d13d4141 100644
--- a/src/PhpSpreadsheet/Worksheet/Worksheet.php
+++ b/src/PhpSpreadsheet/Worksheet/Worksheet.php
@@ -1359,7 +1359,7 @@ class Worksheet implements IComparable
 
         if ($rowDimension !== null && $rowDimension->getXfIndex() > 0) {
             // then there is a row dimension with explicit style, assign it to the cell
-            $cell->setXfIndex($rowDimension->getXfIndex());
+            $cell->setXfIndex(/** @scrutinizer ignore-type */ $rowDimension->getXfIndex());
         } elseif ($columnDimension !== null && $columnDimension->getXfIndex() > 0) {
             // then there is a column dimension, assign it to the cell
             $cell->setXfIndex($columnDimension->getXfIndex());
diff --git a/src/PhpSpreadsheet/Writer/Html.php b/src/PhpSpreadsheet/Writer/Html.php
index c115cabb..fca5ee89 100644
--- a/src/PhpSpreadsheet/Writer/Html.php
+++ b/src/PhpSpreadsheet/Writer/Html.php
@@ -24,6 +24,7 @@ use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
 use PhpOffice\PhpSpreadsheet\Style\Style;
 use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
 use PhpOffice\PhpSpreadsheet\Worksheet\MemoryDrawing;
+use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 
 class Html extends BaseWriter
@@ -1277,23 +1278,22 @@ class Html extends BaseWriter
         }
     }
 
-    private function generateRowCellDataValue(Worksheet $worksheet, Cell $cell, ?string &$cellData): void
+    private function generateRowCellDataValue(Worksheet $worksheet, Cell $cell, string &$cellData): void
     {
         if ($cell->getValue() instanceof RichText) {
             $this->generateRowCellDataValueRich($cell, $cellData);
         } else {
             $origData = $this->preCalculateFormulas ? $cell->getCalculatedValue() : $cell->getValue();
             $formatCode = $worksheet->getParent()->getCellXfByIndex($cell->getXfIndex())->getNumberFormat()->getFormatCode();
-            if ($formatCode !== null) {
-                $cellData = NumberFormat::toFormattedString(
-                    $origData,
-                    $formatCode,
-                    [$this, 'formatColor']
-                );
-            }
+
+            $cellData = NumberFormat::toFormattedString(
+                $origData ?? '',
+                $formatCode ?? NumberFormat::FORMAT_GENERAL,
+                [$this, 'formatColor']
+            );
 
             if ($cellData === $origData) {
-                $cellData = htmlspecialchars($cellData ?? '', Settings::htmlEntityFlags());
+                $cellData = htmlspecialchars($cellData, Settings::htmlEntityFlags());
             }
             if ($worksheet->getParent()->getCellXfByIndex($cell->getXfIndex())->getFont()->getSuperscript()) {
                 $cellData = '<sup>' . $cellData . '</sup>';
@@ -1477,8 +1477,8 @@ class Html extends BaseWriter
                 && $this->isSpannedCell[$worksheet->getParent()->getIndex($worksheet)][$row + 1][$colNum]);
 
             // Colspan and Rowspan
-            $colspan = 1;
-            $rowspan = 1;
+            $colSpan = 1;
+            $rowSpan = 1;
             if (isset($this->isBaseCell[$worksheet->getParent()->getIndex($worksheet)][$row + 1][$colNum])) {
                 $spans = $this->isBaseCell[$worksheet->getParent()->getIndex($worksheet)][$row + 1][$colNum];
                 $rowSpan = $spans['rowspan'];
@@ -1791,7 +1791,8 @@ class Html extends BaseWriter
 
     public function getOrientation(): ?string
     {
-        return null;
+        // Expect Pdf classes to override this method.
+        return $this->isPdf ? PageSetup::ORIENTATION_PORTRAIT : null;
     }
 
     /**
@@ -1830,9 +1831,9 @@ class Html extends BaseWriter
             $bottom = StringHelper::FormatNumber($worksheet->getPageMargins()->getBottom()) . 'in; ';
             $htmlPage .= 'margin-bottom: ' . $bottom;
             $orientation = $this->getOrientation() ?? $worksheet->getPageSetup()->getOrientation();
-            if ($orientation === \PhpOffice\PhpSpreadsheet\Worksheet\PageSetup::ORIENTATION_LANDSCAPE) {
+            if ($orientation === PageSetup::ORIENTATION_LANDSCAPE) {
                 $htmlPage .= 'size: landscape; ';
-            } elseif ($orientation === \PhpOffice\PhpSpreadsheet\Worksheet\PageSetup::ORIENTATION_PORTRAIT) {
+            } elseif ($orientation === PageSetup::ORIENTATION_PORTRAIT) {
                 $htmlPage .= 'size: portrait; ';
             }
             $htmlPage .= '}' . PHP_EOL;
diff --git a/src/PhpSpreadsheet/Writer/Xls/Worksheet.php b/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
index 8f09af69..847d772a 100644
--- a/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
+++ b/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
@@ -465,7 +465,7 @@ class Worksheet extends BIFFwriter
                             switch ($calctype) {
                                 case 'integer':
                                 case 'double':
-                                    $this->writeNumber($row, $column, $calculatedValue, $xfIndex);
+                                    $this->writeNumber($row, $column, (float) $calculatedValue, $xfIndex);
 
                                     break;
                                 case 'string':
@@ -473,7 +473,7 @@ class Worksheet extends BIFFwriter
 
                                     break;
                                 case 'boolean':
-                                    $this->writeBoolErr($row, $column, $calculatedValue, 0, $xfIndex);
+                                    $this->writeBoolErr($row, $column, (int) $calculatedValue, 0, $xfIndex);
 
                                     break;
                                 default:
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php b/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
index 5680281f..1aa4f1ca 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
@@ -503,7 +503,7 @@ class Worksheet extends WriterPart
     private static function writeTimePeriodCondElements(XMLWriter $objWriter, Conditional $conditional, string $cellCoordinate): void
     {
         $txt = $conditional->getText();
-        if ($txt !== null) {
+        if (!empty($txt)) {
             $objWriter->writeAttribute('timePeriod', $txt);
             if (empty($conditional->getConditions())) {
                 if ($conditional->getOperatorType() == Conditional::TIMEPERIOD_TODAY) {
@@ -536,7 +536,7 @@ class Worksheet extends WriterPart
     private static function writeTextCondElements(XMLWriter $objWriter, Conditional $conditional, string $cellCoordinate): void
     {
         $txt = $conditional->getText();
-        if ($txt !== null) {
+        if (!empty($txt)) {
             $objWriter->writeAttribute('text', $txt);
             if (empty($conditional->getConditions())) {
                 if ($conditional->getOperatorType() == Conditional::OPERATOR_CONTAINSTEXT) {
@@ -1034,7 +1034,7 @@ class Worksheet extends WriterPart
         } else {
             $objWriter->writeAttribute('fitToWidth', '0');
         }
-        if ($worksheet->getPageSetup()->getFirstPageNumber() !== null) {
+        if (!empty($worksheet->getPageSetup()->getFirstPageNumber())) {
             $objWriter->writeAttribute('firstPageNumber', (string) $worksheet->getPageSetup()->getFirstPageNumber());
             $objWriter->writeAttribute('useFirstPageNumber', '1');
         }
@@ -1228,7 +1228,7 @@ class Worksheet extends WriterPart
                 StringHelper::controlCharacterPHP2OOXML(htmlspecialchars($cellValue, Settings::htmlEntityFlags()))
             );
             $objWriter->endElement();
-        } elseif ($cellValue instanceof RichText) {
+        } else {
             $objWriter->startElement('is');
             $this->getParentWriter()->getWriterPartstringtable()->writeRichText($objWriter, $cellValue);
             $objWriter->endElement();
diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/AutoFilter2Test.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/AutoFilter2Test.php
index 0bb9f130..57c09de5 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xlsx/AutoFilter2Test.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/AutoFilter2Test.php
@@ -70,6 +70,7 @@ class AutoFilter2Test extends TestCase
         self::assertCount(1, $columns);
         $column = $columns['A'] ?? null;
         self::assertNotNull($column);
+        /** @scrutinizer ignore-call */
         $ruleset = $column->getRules();
         self::assertCount(1, $ruleset);
         $rule = $ruleset[0];
diff --git a/tests/PhpSpreadsheetTests/RichTextTest.php b/tests/PhpSpreadsheetTests/RichTextTest.php
index 49878529..e6f55514 100644
--- a/tests/PhpSpreadsheetTests/RichTextTest.php
+++ b/tests/PhpSpreadsheetTests/RichTextTest.php
@@ -28,9 +28,6 @@ class RichTextTest extends TestCase
     public function testTextElements(): void
     {
         $element1 = new TextElement('A');
-        if ($element1->getFont() !== null) {
-            self::fail('Expected font to be null');
-        }
         $element2 = new TextElement('B');
         $element3 = new TextElement('C');
         $richText = new RichText();

From 2fe66d097fc4f5a310d5e6e387f37011793007bb Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Mon, 12 Sep 2022 08:23:43 -0700
Subject: [PATCH 52/69] Upgrade mitoteam/jpgraph for Php8.2 Usage (#3058)

They just released a Php8.2-compatible version. We should use that version going forward. Some tests had been disabled in 8.2 due to the problems which the new release fixes; these are now restored.
---
 composer.json                                 |  2 +-
 composer.lock                                 | 23 +++++++++++--------
 .../PhpSpreadsheetTests/Helper/SampleTest.php |  6 -----
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/composer.json b/composer.json
index 46ee56b9..6835b05b 100644
--- a/composer.json
+++ b/composer.json
@@ -81,7 +81,7 @@
         "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
         "dompdf/dompdf": "^1.0 || ^2.0",
         "friendsofphp/php-cs-fixer": "^3.2",
-        "mitoteam/jpgraph": "^10.1",
+        "mitoteam/jpgraph": "10.2.2",
         "mpdf/mpdf": "8.1.1",
         "phpcompatibility/php-compatibility": "^9.3",
         "phpstan/phpstan": "^1.1",
diff --git a/composer.lock b/composer.lock
index 37e2dfa8..4097420d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "dd19bb54ddc39f5b24f564818cb46c7e",
+    "content-hash": "8512207f173cb137bc2085b7fdf698bc",
     "packages": [
         {
             "name": "ezyang/htmlpurifier",
@@ -1342,20 +1342,23 @@
         },
         {
             "name": "mitoteam/jpgraph",
-            "version": "10.1.3",
+            "version": "10.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mitoteam/jpgraph.git",
-                "reference": "425a2a0f0c97a28fe0aca60a4384ce85880e438a"
+                "reference": "6d87fc342afaf8a9a898a3122b5f0f34fc82c4cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mitoteam/jpgraph/zipball/425a2a0f0c97a28fe0aca60a4384ce85880e438a",
-                "reference": "425a2a0f0c97a28fe0aca60a4384ce85880e438a",
+                "url": "https://api.github.com/repos/mitoteam/jpgraph/zipball/6d87fc342afaf8a9a898a3122b5f0f34fc82c4cf",
+                "reference": "6d87fc342afaf8a9a898a3122b5f0f34fc82c4cf",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5"
+                "php": ">=5.5 <=8.2"
+            },
+            "replace": {
+                "jpgraph/jpgraph": "4.0.2"
             },
             "type": "library",
             "autoload": {
@@ -1372,16 +1375,16 @@
                     "name": "JpGraph team"
                 }
             ],
-            "description": "Composer compatible version of JpGraph library with PHP 8.1 support",
+            "description": "Composer compatible version of JpGraph library with PHP 8.2 support",
             "homepage": "https://github.com/mitoteam/jpgraph",
             "keywords": [
                 "jpgraph"
             ],
             "support": {
                 "issues": "https://github.com/mitoteam/jpgraph/issues",
-                "source": "https://github.com/mitoteam/jpgraph/tree/10.1.3"
+                "source": "https://github.com/mitoteam/jpgraph/tree/10.2.2"
             },
-            "time": "2022-07-05T16:46:34+00:00"
+            "time": "2022-09-09T08:16:10+00:00"
         },
         {
             "name": "mpdf/mpdf",
@@ -5265,5 +5268,5 @@
         "ext-zlib": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.2.0"
 }
diff --git a/tests/PhpSpreadsheetTests/Helper/SampleTest.php b/tests/PhpSpreadsheetTests/Helper/SampleTest.php
index a104e8ff..2195155f 100644
--- a/tests/PhpSpreadsheetTests/Helper/SampleTest.php
+++ b/tests/PhpSpreadsheetTests/Helper/SampleTest.php
@@ -27,12 +27,6 @@ class SampleTest extends TestCase
     {
         $skipped = [
         ];
-        if (PHP_VERSION_ID >= 80200) {
-            // Hopefully temporary. Continue to try
-            //  32_chart_read_write_PDF/HTML
-            // so as not to lose track of the problem.
-            $skipped[] = 'Chart/35_Chart_render.php';
-        }
 
         // Unfortunately some tests are too long to run with code-coverage
         // analysis on GitHub Actions, so we need to exclude them

From 3e8d50547c0b7a8acf9352834b3e9155a86210b3 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Mon, 12 Sep 2022 08:45:13 -0700
Subject: [PATCH 53/69] Minor Fix for Percentage Formatting (#3053)

Fix #1929. This was already substantially fixed, but there was a lingering problem with an unexpected leading space. It turns out there was also a problem with leading zeros, also fixed. There are also problems involving commas; fixing those seems too complicated to delay these changes, but I will add it to my to-do list.
---
 .../Style/NumberFormat/PercentageFormatter.php       | 12 +++++++-----
 tests/PhpSpreadsheetTests/Style/NumberFormatTest.php |  2 +-
 tests/data/Style/NumberFormat.php                    |  9 +++++++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/PhpSpreadsheet/Style/NumberFormat/PercentageFormatter.php b/src/PhpSpreadsheet/Style/NumberFormat/PercentageFormatter.php
index f4d3412b..07aaff1f 100644
--- a/src/PhpSpreadsheet/Style/NumberFormat/PercentageFormatter.php
+++ b/src/PhpSpreadsheet/Style/NumberFormat/PercentageFormatter.php
@@ -20,7 +20,8 @@ class PercentageFormatter extends BaseFormatter
 
         $format = str_replace('%', '%%', $format);
         $wholePartSize = strlen((string) floor($value));
-        $decimalPartSize = $placeHolders = 0;
+        $decimalPartSize = 0;
+        $placeHolders = '';
         // Number of decimals
         if (preg_match('/\.([?0]+)/u', $format, $matches)) {
             $decimalPartSize = strlen($matches[1]);
@@ -29,12 +30,13 @@ class PercentageFormatter extends BaseFormatter
             $placeHolders = str_repeat(' ', strlen($matches[1]) - $decimalPartSize);
         }
         // Number of digits to display before the decimal
-        if (preg_match('/([#0,]+)\./u', $format, $matches)) {
-            $wholePartSize = max($wholePartSize, strlen($matches[1]));
+        if (preg_match('/([#0,]+)\.?/u', $format, $matches)) {
+            $firstZero = preg_replace('/^[#,]*/', '', $matches[1]);
+            $wholePartSize = max($wholePartSize, strlen($firstZero));
         }
 
-        $wholePartSize += $decimalPartSize;
-        $replacement = "{$wholePartSize}.{$decimalPartSize}";
+        $wholePartSize += $decimalPartSize + (int) ($decimalPartSize > 0);
+        $replacement = "0{$wholePartSize}.{$decimalPartSize}";
         $mask = (string) preg_replace('/[#0,]+\.?[?#0,]*/ui', "%{$replacement}f{$placeHolders}", $format);
 
         /** @var float */
diff --git a/tests/PhpSpreadsheetTests/Style/NumberFormatTest.php b/tests/PhpSpreadsheetTests/Style/NumberFormatTest.php
index e386b292..f09c34d7 100644
--- a/tests/PhpSpreadsheetTests/Style/NumberFormatTest.php
+++ b/tests/PhpSpreadsheetTests/Style/NumberFormatTest.php
@@ -47,7 +47,7 @@ class NumberFormatTest extends TestCase
     public function testFormatValueWithMask($expectedResult, ...$args): void
     {
         $result = NumberFormat::toFormattedString(...$args);
-        self::assertEquals($expectedResult, $result);
+        self::assertSame($expectedResult, $result);
     }
 
     public function providerNumberFormat(): array
diff --git a/tests/data/Style/NumberFormat.php b/tests/data/Style/NumberFormat.php
index 80f7080b..b307e23d 100644
--- a/tests/data/Style/NumberFormat.php
+++ b/tests/data/Style/NumberFormat.php
@@ -146,13 +146,13 @@ return [
         '#,###',
     ],
     [
-        12,
+        '12',
         12000,
         '#,',
     ],
     // Scaling test
     [
-        12.199999999999999,
+        '12.2',
         12200000,
         '0.0,,',
     ],
@@ -1486,4 +1486,9 @@ return [
         '-1111.119',
         NumberFormat::FORMAT_ACCOUNTING_EUR,
     ],
+    'issue 1929' => ['(79.3%)', -0.793, '#,##0.0%;(#,##0.0%)'],
+    'percent without leading 0' => ['6.2%', 0.062, '##.0%'],
+    'percent with leading 0' => ['06.2%', 0.062, '00.0%'],
+    'percent lead0 no decimal' => ['06%', 0.062, '00%'],
+    'percent nolead0 no decimal' => ['6%', 0.062, '##%'],
 ];

From 441ae741d7eaca24e677f553456f9b0c6a9efcda Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Mon, 5 Sep 2022 06:36:42 +0200
Subject: [PATCH 54/69] Update Excel function samples for Date/Time and
 Engineering functions

---
 samples/Calculations/DateTime/DATEDIF.php     |  1 +
 samples/Calculations/DateTime/DAYS.php        |  1 +
 samples/Calculations/DateTime/NETWORKDAYS.php | 66 ++++++++++++++++
 samples/Calculations/DateTime/WORKDAY.php     | 67 ++++++++++++++++
 samples/Calculations/DateTime/YEARFRAC.php    | 76 +++++++++++++++++++
 samples/Calculations/Engineering/BESSELI.php  | 29 +++++++
 samples/Calculations/Engineering/BESSELJ.php  | 29 +++++++
 samples/Calculations/Engineering/BESSELK.php  | 29 +++++++
 samples/Calculations/Engineering/BESSELY.php  | 29 +++++++
 samples/Calculations/Engineering/BIN2DEC.php  | 46 +++++++++++
 samples/Calculations/Engineering/BIN2HEX.php  | 46 +++++++++++
 samples/Calculations/Engineering/BIN2OCT.php  | 46 +++++++++++
 samples/Calculations/Engineering/BITAND.php   | 49 ++++++++++++
 .../Calculations/Engineering/BITLSHIFT.php    | 65 ++++++++++++++++
 samples/Calculations/Engineering/BITOR.php    | 49 ++++++++++++
 .../Calculations/Engineering/BITRSHIFT.php    | 63 +++++++++++++++
 samples/Calculations/Engineering/BITXOR.php   | 49 ++++++++++++
 samples/Calculations/Engineering/COMPLEX.php  | 41 ++++++++++
 samples/Calculations/Engineering/CONVERT.php  | 58 ++++++++++++++
 samples/Calculations/Engineering/DEC2BIN.php  | 47 ++++++++++++
 samples/Calculations/Engineering/DEC2HEX.php  | 48 ++++++++++++
 samples/Calculations/Engineering/DEC2OCT.php  | 48 ++++++++++++
 samples/Calculations/Engineering/DELTA.php    | 46 +++++++++++
 samples/Calculations/Engineering/ERF.php      | 67 ++++++++++++++++
 samples/Calculations/Engineering/ERFC.php     | 41 ++++++++++
 samples/Calculations/Engineering/GESTEP.php   | 53 +++++++++++++
 samples/Calculations/Engineering/HEX2BIN.php  | 46 +++++++++++
 samples/Calculations/Engineering/HEX2DEC.php  | 48 ++++++++++++
 samples/Calculations/Engineering/HEX2OCT.php  | 46 +++++++++++
 samples/Calculations/Engineering/IMABS.php    | 48 ++++++++++++
 .../Calculations/Engineering/IMAGINARY.php    | 48 ++++++++++++
 .../Calculations/Engineering/IMARGUMENT.php   | 48 ++++++++++++
 .../Calculations/Engineering/IMCONJUGATE.php  | 48 ++++++++++++
 samples/Calculations/Engineering/IMCOS.php    | 48 ++++++++++++
 samples/Calculations/Engineering/IMCOSH.php   | 48 ++++++++++++
 samples/Calculations/Engineering/IMCOT.php    | 48 ++++++++++++
 samples/Calculations/Engineering/IMCSC.php    | 48 ++++++++++++
 samples/Calculations/Engineering/IMCSCH.php   | 48 ++++++++++++
 samples/Calculations/Engineering/IMDIV.php    | 42 ++++++++++
 samples/Calculations/Engineering/IMEXP.php    | 48 ++++++++++++
 samples/Calculations/Engineering/IMLN.php     | 48 ++++++++++++
 samples/Calculations/Engineering/IMLOG10.php  | 48 ++++++++++++
 samples/Calculations/Engineering/IMLOG2.php   | 48 ++++++++++++
 samples/Calculations/Engineering/IMPOWER.php  | 49 ++++++++++++
 .../Calculations/Engineering/IMPRODUCT.php    | 42 ++++++++++
 samples/Calculations/Engineering/IMREAL.php   | 48 ++++++++++++
 samples/Calculations/Engineering/IMSEC.php    | 48 ++++++++++++
 samples/Calculations/Engineering/IMSECH.php   | 48 ++++++++++++
 samples/Calculations/Engineering/IMSIN.php    | 48 ++++++++++++
 samples/Calculations/Engineering/IMSINH.php   | 48 ++++++++++++
 samples/Calculations/Engineering/IMSQRT.php   | 48 ++++++++++++
 samples/Calculations/Engineering/IMSUB.php    | 42 ++++++++++
 samples/Calculations/Engineering/IMSUM.php    | 42 ++++++++++
 samples/Calculations/Engineering/IMTAN.php    | 48 ++++++++++++
 samples/Calculations/Engineering/OCT2BIN.php  | 47 ++++++++++++
 samples/Calculations/Engineering/OCT2DEC.php  | 49 ++++++++++++
 samples/Calculations/Engineering/OCT2HEX.php  | 49 ++++++++++++
 .../Calculation/Engineering/Compare.php       |  4 +-
 tests/data/Calculation/DateTime/DATE.php      |  5 +-
 .../data/Calculation/Engineering/BIN2DEC.php  |  2 +
 60 files changed, 2659 insertions(+), 3 deletions(-)
 create mode 100644 samples/Calculations/DateTime/NETWORKDAYS.php
 create mode 100644 samples/Calculations/DateTime/WORKDAY.php
 create mode 100644 samples/Calculations/DateTime/YEARFRAC.php
 create mode 100644 samples/Calculations/Engineering/BESSELI.php
 create mode 100644 samples/Calculations/Engineering/BESSELJ.php
 create mode 100644 samples/Calculations/Engineering/BESSELK.php
 create mode 100644 samples/Calculations/Engineering/BESSELY.php
 create mode 100644 samples/Calculations/Engineering/BIN2DEC.php
 create mode 100644 samples/Calculations/Engineering/BIN2HEX.php
 create mode 100644 samples/Calculations/Engineering/BIN2OCT.php
 create mode 100644 samples/Calculations/Engineering/BITAND.php
 create mode 100644 samples/Calculations/Engineering/BITLSHIFT.php
 create mode 100644 samples/Calculations/Engineering/BITOR.php
 create mode 100644 samples/Calculations/Engineering/BITRSHIFT.php
 create mode 100644 samples/Calculations/Engineering/BITXOR.php
 create mode 100644 samples/Calculations/Engineering/COMPLEX.php
 create mode 100644 samples/Calculations/Engineering/CONVERT.php
 create mode 100644 samples/Calculations/Engineering/DEC2BIN.php
 create mode 100644 samples/Calculations/Engineering/DEC2HEX.php
 create mode 100644 samples/Calculations/Engineering/DEC2OCT.php
 create mode 100644 samples/Calculations/Engineering/DELTA.php
 create mode 100644 samples/Calculations/Engineering/ERF.php
 create mode 100644 samples/Calculations/Engineering/ERFC.php
 create mode 100644 samples/Calculations/Engineering/GESTEP.php
 create mode 100644 samples/Calculations/Engineering/HEX2BIN.php
 create mode 100644 samples/Calculations/Engineering/HEX2DEC.php
 create mode 100644 samples/Calculations/Engineering/HEX2OCT.php
 create mode 100644 samples/Calculations/Engineering/IMABS.php
 create mode 100644 samples/Calculations/Engineering/IMAGINARY.php
 create mode 100644 samples/Calculations/Engineering/IMARGUMENT.php
 create mode 100644 samples/Calculations/Engineering/IMCONJUGATE.php
 create mode 100644 samples/Calculations/Engineering/IMCOS.php
 create mode 100644 samples/Calculations/Engineering/IMCOSH.php
 create mode 100644 samples/Calculations/Engineering/IMCOT.php
 create mode 100644 samples/Calculations/Engineering/IMCSC.php
 create mode 100644 samples/Calculations/Engineering/IMCSCH.php
 create mode 100644 samples/Calculations/Engineering/IMDIV.php
 create mode 100644 samples/Calculations/Engineering/IMEXP.php
 create mode 100644 samples/Calculations/Engineering/IMLN.php
 create mode 100644 samples/Calculations/Engineering/IMLOG10.php
 create mode 100644 samples/Calculations/Engineering/IMLOG2.php
 create mode 100644 samples/Calculations/Engineering/IMPOWER.php
 create mode 100644 samples/Calculations/Engineering/IMPRODUCT.php
 create mode 100644 samples/Calculations/Engineering/IMREAL.php
 create mode 100644 samples/Calculations/Engineering/IMSEC.php
 create mode 100644 samples/Calculations/Engineering/IMSECH.php
 create mode 100644 samples/Calculations/Engineering/IMSIN.php
 create mode 100644 samples/Calculations/Engineering/IMSINH.php
 create mode 100644 samples/Calculations/Engineering/IMSQRT.php
 create mode 100644 samples/Calculations/Engineering/IMSUB.php
 create mode 100644 samples/Calculations/Engineering/IMSUM.php
 create mode 100644 samples/Calculations/Engineering/IMTAN.php
 create mode 100644 samples/Calculations/Engineering/OCT2BIN.php
 create mode 100644 samples/Calculations/Engineering/OCT2DEC.php
 create mode 100644 samples/Calculations/Engineering/OCT2HEX.php

diff --git a/samples/Calculations/DateTime/DATEDIF.php b/samples/Calculations/DateTime/DATEDIF.php
index 7bc077c9..3e035f5a 100644
--- a/samples/Calculations/DateTime/DATEDIF.php
+++ b/samples/Calculations/DateTime/DATEDIF.php
@@ -24,6 +24,7 @@ $testDates = [
     [2000, 1, 1],
     [2019, 2, 14],
     [2020, 7, 4],
+    [2020, 2, 29],
 ];
 $testDateCount = count($testDates);
 
diff --git a/samples/Calculations/DateTime/DAYS.php b/samples/Calculations/DateTime/DAYS.php
index ddd47f37..15e9a58f 100644
--- a/samples/Calculations/DateTime/DAYS.php
+++ b/samples/Calculations/DateTime/DAYS.php
@@ -24,6 +24,7 @@ $testDates = [
     [2000, 1, 1],
     [2019, 2, 14],
     [2020, 7, 4],
+    [2020, 2, 29],
     [2029, 12, 31],
     [2525, 1, 1],
 ];
diff --git a/samples/Calculations/DateTime/NETWORKDAYS.php b/samples/Calculations/DateTime/NETWORKDAYS.php
new file mode 100644
index 00000000..585c0438
--- /dev/null
+++ b/samples/Calculations/DateTime/NETWORKDAYS.php
@@ -0,0 +1,66 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Date/Time';
+$functionName = 'NETWORKDAYS';
+$description = 'Returns the number of whole working days between start_date and end_date. Working days exclude weekends and any dates identified in holidays';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$publicHolidays = [
+    [2022, 1, 3, '=DATE(G1, H1, I1)', 'New Year'],
+    [2022, 4, 15, '=DATE(G2, H2, I2)', 'Good Friday'],
+    [2022, 4, 18, '=DATE(G3, H3, I3)', 'Easter Monday'],
+    [2022, 5, 2, '=DATE(G4, H4, I4)', 'Early May Bank Holiday'],
+    [2022, 6, 2, '=DATE(G5, H5, I5)', 'Spring Bank Holiday'],
+    [2022, 6, 3, '=DATE(G6, H6, I6)', 'Platinum Jubilee Bank Holiday'],
+    [2022, 8, 29, '=DATE(G7, H7, I7)', 'Summer Bank Holiday'],
+    [2022, 12, 26, '=DATE(G8, H8, I8)', 'Boxing Day'],
+    [2022, 12, 27, '=DATE(G9, H9, I9)', 'Christmas Day'],
+];
+
+$holidayCount = count($publicHolidays);
+$worksheet->fromArray($publicHolidays, null, 'G1', true);
+
+$worksheet->getStyle('J1:J' . $holidayCount)
+    ->getNumberFormat()
+    ->setFormatCode('yyyy-mm-dd');
+
+$worksheet->setCellValue('A1', '=DATE(2022,1,1)');
+
+for ($numberOfMonths = 0; $numberOfMonths < 12; ++$numberOfMonths) {
+    $worksheet->setCellValue('B' . ($numberOfMonths + 1), '=EOMONTH(A1, ' . $numberOfMonths . ')');
+    $worksheet->setCellValue('C' . ($numberOfMonths + 1), '=NETWORKDAYS(A1, B' . ($numberOfMonths + 1) . ')');
+    $worksheet->setCellValue('D' . ($numberOfMonths + 1), '=NETWORKDAYS(A1, B' . ($numberOfMonths + 1) . ', J1:J' . $holidayCount . ')');
+}
+
+$worksheet->getStyle('A1')
+    ->getNumberFormat()
+    ->setFormatCode('yyyy-mm-dd');
+
+$worksheet->getStyle('B1:B12')
+    ->getNumberFormat()
+    ->setFormatCode('yyyy-mm-dd');
+
+// Test the formulae
+$helper->log('UK Public Holidays');
+$holidayData = $worksheet->rangeToArray('J1:K' . $holidayCount, null, true, true, true);
+$helper->displayGrid($holidayData);
+
+for ($row = 1; $row <= 12; ++$row) {
+    $helper->log(sprintf(
+        'Between %s and %s is %d working days; %d with public holidays',
+        $worksheet->getCell('A1')->getFormattedValue(),
+        $worksheet->getCell('B' . $row)->getFormattedValue(),
+        $worksheet->getCell('C' . $row)->getCalculatedValue(),
+        $worksheet->getCell('D' . $row)->getCalculatedValue()
+    ));
+}
diff --git a/samples/Calculations/DateTime/WORKDAY.php b/samples/Calculations/DateTime/WORKDAY.php
new file mode 100644
index 00000000..d18e3463
--- /dev/null
+++ b/samples/Calculations/DateTime/WORKDAY.php
@@ -0,0 +1,67 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Date/Time';
+$functionName = 'WORKDAY';
+$description = 'Returns a number that represents a date that is the indicated number of working days before or after a starting date. Working days exclude weekends and any dates identified as holidays';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$publicHolidays = [
+    [2022, 1, 3, '=DATE(G1, H1, I1)', 'New Year'],
+    [2022, 4, 15, '=DATE(G2, H2, I2)', 'Good Friday'],
+    [2022, 4, 18, '=DATE(G3, H3, I3)', 'Easter Monday'],
+    [2022, 5, 2, '=DATE(G4, H4, I4)', 'Early May Bank Holiday'],
+    [2022, 6, 2, '=DATE(G5, H5, I5)', 'Spring Bank Holiday'],
+    [2022, 6, 3, '=DATE(G6, H6, I6)', 'Platinum Jubilee Bank Holiday'],
+    [2022, 8, 29, '=DATE(G7, H7, I7)', 'Summer Bank Holiday'],
+    [2022, 12, 26, '=DATE(G8, H8, I8)', 'Boxing Day'],
+    [2022, 12, 27, '=DATE(G9, H9, I9)', 'Christmas Day'],
+];
+
+$holidayCount = count($publicHolidays);
+$worksheet->fromArray($publicHolidays, null, 'G1', true);
+
+$worksheet->getStyle('J1:J' . $holidayCount)
+    ->getNumberFormat()
+    ->setFormatCode('yyyy-mm-dd');
+
+$worksheet->setCellValue('A1', '=DATE(2022,1,1)');
+
+$workdayStep = 10;
+for ($days = $workdayStep; $days <= 366; $days += $workdayStep) {
+    $worksheet->setCellValue('B' . ((int) $days / $workdayStep + 1), $days);
+    $worksheet->setCellValue('C' . ((int) $days / $workdayStep + 1), '=WORKDAY(A1, B' . ((int) $days / $workdayStep + 1) . ')');
+    $worksheet->setCellValue('D' . ((int) $days / $workdayStep + 1), '=WORKDAY(A1, B' . ((int) $days / $workdayStep + 1) . ', J1:J' . $holidayCount . ')');
+}
+
+$worksheet->getStyle('A1')
+    ->getNumberFormat()
+    ->setFormatCode('yyyy-mm-dd');
+
+$worksheet->getStyle('C1:D50')
+    ->getNumberFormat()
+    ->setFormatCode('yyyy-mm-dd');
+
+// Test the formulae
+$helper->log('UK Public Holidays');
+$holidayData = $worksheet->rangeToArray('J1:K' . $holidayCount, null, true, true, true);
+$helper->displayGrid($holidayData);
+
+for ($days = $workdayStep; $days <= 366; $days += $workdayStep) {
+    $helper->log(sprintf(
+        '%d workdays from %s is %s; %s with public holidays',
+        $worksheet->getCell('B' . ((int) $days / $workdayStep + 1))->getFormattedValue(),
+        $worksheet->getCell('A1')->getFormattedValue(),
+        $worksheet->getCell('C' . ((int) $days / $workdayStep + 1))->getFormattedValue(),
+        $worksheet->getCell('D' . ((int) $days / $workdayStep + 1))->getFormattedValue()
+    ));
+}
diff --git a/samples/Calculations/DateTime/YEARFRAC.php b/samples/Calculations/DateTime/YEARFRAC.php
new file mode 100644
index 00000000..81b36435
--- /dev/null
+++ b/samples/Calculations/DateTime/YEARFRAC.php
@@ -0,0 +1,76 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Date/Time';
+$functionName = 'DAYS360';
+$description = 'Returns the number of days between two dates based on a 360-day year';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testDates = [
+    [1900, 1, 1],
+    [1904, 1, 1],
+    [1936, 3, 17],
+    [1960, 12, 19],
+    [1999, 12, 31],
+    [2000, 1, 1],
+    [2019, 2, 14],
+    [2020, 7, 4],
+    [2020, 2, 29],
+    [2029, 12, 31],
+    [2525, 1, 1],
+];
+$testDateCount = count($testDates);
+
+$worksheet->fromArray($testDates, null, 'A1', true);
+
+for ($row = 1; $row <= $testDateCount; ++$row) {
+    $worksheet->setCellValue('D' . $row, '=DATE(A' . $row . ',B' . $row . ',C' . $row . ')');
+    $worksheet->setCellValue('E' . $row, '=D' . $row);
+    $worksheet->setCellValue('F' . $row, '=DATE(2022,12,31)');
+    $worksheet->setCellValue('G' . $row, '=YEARFRAC(D' . $row . ', F' . $row . ')');
+    $worksheet->setCellValue('H' . $row, '=YEARFRAC(D' . $row . ', F' . $row . ', 1)');
+    $worksheet->setCellValue('I' . $row, '=YEARFRAC(D' . $row . ', F' . $row . ', 2)');
+    $worksheet->setCellValue('J' . $row, '=YEARFRAC(D' . $row . ', F' . $row . ', 3)');
+    $worksheet->setCellValue('K' . $row, '=YEARFRAC(D' . $row . ', F' . $row . ', 4)');
+}
+$worksheet->getStyle('E1:F' . $testDateCount)
+    ->getNumberFormat()
+    ->setFormatCode('yyyy-mm-dd');
+
+// Test the formulae
+for ($row = 1; $row <= $testDateCount; ++$row) {
+    $helper->log(sprintf(
+        'Between: %s and %s',
+        $worksheet->getCell('E' . $row)->getFormattedValue(),
+        $worksheet->getCell('F' . $row)->getFormattedValue()
+    ));
+    $helper->log(sprintf(
+        'Days: %f - US (NASD) 30/360',
+        $worksheet->getCell('G' . $row)->getCalculatedValue()
+    ));
+    $helper->log(sprintf(
+        'Days: %f - Actual',
+        $worksheet->getCell('H' . $row)->getCalculatedValue()
+    ));
+    $helper->log(sprintf(
+        'Days: %f - Actual/360',
+        $worksheet->getCell('I' . $row)->getCalculatedValue()
+    ));
+    $helper->log(sprintf(
+        'Days: %f - Actual/365',
+        $worksheet->getCell('J' . $row)->getCalculatedValue()
+    ));
+    $helper->log(sprintf(
+        'Days: %f - European 30/360',
+        $worksheet->getCell('K' . $row)->getCalculatedValue()
+    ));
+}
diff --git a/samples/Calculations/Engineering/BESSELI.php b/samples/Calculations/Engineering/BESSELI.php
new file mode 100644
index 00000000..bd5d9b71
--- /dev/null
+++ b/samples/Calculations/Engineering/BESSELI.php
@@ -0,0 +1,29 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'BESSELI';
+$description = 'Returns the modified Bessel function, which is equivalent to the Bessel function evaluated for purely imaginary arguments';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+for ($n = 0; $n <= 5; ++$n) {
+    for ($x = 0; $x <= 5; $x = $x + 0.25) {
+        Calculation::getInstance($spreadsheet)->flushInstance();
+        $worksheet->setCellValue('A1', "=BESSELI({$x}, {$n})");
+
+        $helper->log(sprintf(
+            '%s = %f',
+            $worksheet->getCell('A1')->getValue(),
+            $worksheet->getCell('A1')->getCalculatedValue()
+        ));
+    }
+}
diff --git a/samples/Calculations/Engineering/BESSELJ.php b/samples/Calculations/Engineering/BESSELJ.php
new file mode 100644
index 00000000..3aa47886
--- /dev/null
+++ b/samples/Calculations/Engineering/BESSELJ.php
@@ -0,0 +1,29 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'BESSELJ';
+$description = 'Returns the Bessel function';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+for ($n = 0; $n <= 5; ++$n) {
+    for ($x = 0; $x <= 5; $x = $x + 0.25) {
+        Calculation::getInstance($spreadsheet)->flushInstance();
+        $worksheet->setCellValue('A1', "=BESSELJ({$x}, {$n})");
+
+        $helper->log(sprintf(
+            '%s = %f',
+            $worksheet->getCell('A1')->getValue(),
+            $worksheet->getCell('A1')->getCalculatedValue()
+        ));
+    }
+}
diff --git a/samples/Calculations/Engineering/BESSELK.php b/samples/Calculations/Engineering/BESSELK.php
new file mode 100644
index 00000000..ee8698e9
--- /dev/null
+++ b/samples/Calculations/Engineering/BESSELK.php
@@ -0,0 +1,29 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'BESSELK';
+$description = 'Returns the modified Bessel function, which is equivalent to the Bessel functions evaluated for purely imaginary arguments';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+for ($n = 0; $n <= 5; ++$n) {
+    for ($x = 0; $x <= 5; $x = $x + 0.25) {
+        Calculation::getInstance($spreadsheet)->flushInstance();
+        $worksheet->setCellValue('A1', "=BESSELK({$x}, {$n})");
+
+        $helper->log(sprintf(
+            '%s = %f',
+            $worksheet->getCell('A1')->getValue(),
+            $worksheet->getCell('A1')->getCalculatedValue()
+        ));
+    }
+}
diff --git a/samples/Calculations/Engineering/BESSELY.php b/samples/Calculations/Engineering/BESSELY.php
new file mode 100644
index 00000000..750b7204
--- /dev/null
+++ b/samples/Calculations/Engineering/BESSELY.php
@@ -0,0 +1,29 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'BESSELY';
+$description = 'Returns the Bessel function, which is also called the Weber function or the Neumann function';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+for ($n = 0; $n <= 5; ++$n) {
+    for ($x = 0; $x <= 5; $x = $x + 0.25) {
+        Calculation::getInstance($spreadsheet)->flushInstance();
+        $worksheet->setCellValue('A1', "=BESSELY({$x}, {$n})");
+
+        $helper->log(sprintf(
+            '%s = %f',
+            $worksheet->getCell('A1')->getValue(),
+            $worksheet->getCell('A1')->getCalculatedValue()
+        ));
+    }
+}
diff --git a/samples/Calculations/Engineering/BIN2DEC.php b/samples/Calculations/Engineering/BIN2DEC.php
new file mode 100644
index 00000000..0c4c4532
--- /dev/null
+++ b/samples/Calculations/Engineering/BIN2DEC.php
@@ -0,0 +1,46 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'BIN2DEC';
+$description = 'Converts a binary number to decimal';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    [101],
+    [110110],
+    [1000000],
+    [11111111],
+    [100010101],
+    [110001100],
+    [111111111],
+    [1111111111],
+    [1100110011],
+    [1000000000],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=BIN2DEC(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(B%d): Binary %s is decimal %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/BIN2HEX.php b/samples/Calculations/Engineering/BIN2HEX.php
new file mode 100644
index 00000000..51a11199
--- /dev/null
+++ b/samples/Calculations/Engineering/BIN2HEX.php
@@ -0,0 +1,46 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'BIN2HEX';
+$description = 'Converts a binary number to hexadecimal';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    [101],
+    [110110],
+    [1000000],
+    [11111111],
+    [100010101],
+    [110001100],
+    [111111111],
+    [1111111111],
+    [1100110011],
+    [1000000000],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=BIN2HEX(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(B%d): Binary %s is hexadecimal %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/BIN2OCT.php b/samples/Calculations/Engineering/BIN2OCT.php
new file mode 100644
index 00000000..c320d360
--- /dev/null
+++ b/samples/Calculations/Engineering/BIN2OCT.php
@@ -0,0 +1,46 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'BIN2OCT';
+$description = 'Converts a binary number to octal';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    [101],
+    [110110],
+    [1000000],
+    [11111111],
+    [100010101],
+    [110001100],
+    [111111111],
+    [1111111111],
+    [1100110011],
+    [1000000000],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=BIN2OCT(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(B%d): Binary %s is octal %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/BITAND.php b/samples/Calculations/Engineering/BITAND.php
new file mode 100644
index 00000000..2a8f7a3c
--- /dev/null
+++ b/samples/Calculations/Engineering/BITAND.php
@@ -0,0 +1,49 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'BITAND';
+$description = "Returns a bitwise 'AND' of two numbers";
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    [1, 5],
+    [3, 5],
+    [1, 6],
+    [9, 6],
+    [13, 25],
+    [23, 10],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('C' . $row, '=TEXT(DEC2BIN(A' . $row . '), "00000")');
+    $worksheet->setCellValue('D' . $row, '=TEXT(DEC2BIN(B' . $row . '), "00000")');
+    $worksheet->setCellValue('E' . $row, '=BITAND(A' . $row . ',B' . $row . ')');
+    $worksheet->setCellValue('F' . $row, '=TEXT(DEC2BIN(E' . $row . '), "00000")');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): Bitwise AND of %d (%s) and %d (%s) is %d (%s)',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('C' . $row)->getCalculatedValue(),
+        $worksheet->getCell('B' . $row)->getValue(),
+        $worksheet->getCell('D' . $row)->getCalculatedValue(),
+        $worksheet->getCell('E' . $row)->getCalculatedValue(),
+        $worksheet->getCell('F' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/BITLSHIFT.php b/samples/Calculations/Engineering/BITLSHIFT.php
new file mode 100644
index 00000000..872c8098
--- /dev/null
+++ b/samples/Calculations/Engineering/BITLSHIFT.php
@@ -0,0 +1,65 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'BITLSHIFT';
+$description = 'Returns a number shifted left by the specified number of bits';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    [1],
+    [3],
+    [9],
+    [15],
+    [26],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=DEC2BIN(A' . $row . ')');
+    $worksheet->setCellValue('C' . $row, '=BITLSHIFT(A' . $row . ',1)');
+    $worksheet->setCellValue('D' . $row, '=DEC2BIN(C' . $row . ')');
+    $worksheet->setCellValue('E' . $row, '=BITLSHIFT(A' . $row . ',2)');
+    $worksheet->setCellValue('F' . $row, '=DEC2BIN(E' . $row . ')');
+    $worksheet->setCellValue('G' . $row, '=BITLSHIFT(A' . $row . ',3)');
+    $worksheet->setCellValue('H' . $row, '=DEC2BIN(G' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): Bitwise Left Shift of %d (%s) by 1 bit is %d (%s)',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+        $worksheet->getCell('C' . $row)->getCalculatedValue(),
+        $worksheet->getCell('D' . $row)->getCalculatedValue(),
+    ));
+    $helper->log(sprintf(
+        '(E%d): Bitwise Left Shift of %d (%s) by 2 bits is %d (%s)',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+        $worksheet->getCell('E' . $row)->getCalculatedValue(),
+        $worksheet->getCell('F' . $row)->getCalculatedValue(),
+    ));
+    $helper->log(sprintf(
+        '(E%d): Bitwise Left Shift of %d (%s) by 3 bits is %d (%s)',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+        $worksheet->getCell('G' . $row)->getCalculatedValue(),
+        $worksheet->getCell('H' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/BITOR.php b/samples/Calculations/Engineering/BITOR.php
new file mode 100644
index 00000000..1bf7f71d
--- /dev/null
+++ b/samples/Calculations/Engineering/BITOR.php
@@ -0,0 +1,49 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'BITOR';
+$description = "Returns a bitwise 'OR' of two numbers";
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    [1, 5],
+    [3, 5],
+    [1, 6],
+    [9, 6],
+    [13, 25],
+    [23, 10],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('C' . $row, '=TEXT(DEC2BIN(A' . $row . '), "00000")');
+    $worksheet->setCellValue('D' . $row, '=TEXT(DEC2BIN(B' . $row . '), "00000")');
+    $worksheet->setCellValue('E' . $row, '=BITOR(A' . $row . ',B' . $row . ')');
+    $worksheet->setCellValue('F' . $row, '=TEXT(DEC2BIN(E' . $row . '), "00000")');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): Bitwise OR of %d (%s) and %d (%s) is %d (%s)',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('C' . $row)->getCalculatedValue(),
+        $worksheet->getCell('B' . $row)->getValue(),
+        $worksheet->getCell('D' . $row)->getCalculatedValue(),
+        $worksheet->getCell('E' . $row)->getCalculatedValue(),
+        $worksheet->getCell('F' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/BITRSHIFT.php b/samples/Calculations/Engineering/BITRSHIFT.php
new file mode 100644
index 00000000..3e7f3a88
--- /dev/null
+++ b/samples/Calculations/Engineering/BITRSHIFT.php
@@ -0,0 +1,63 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'BITRSHIFT';
+$description = 'Returns a number shifted right by the specified number of bits';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    [9],
+    [15],
+    [26],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=DEC2BIN(A' . $row . ')');
+    $worksheet->setCellValue('C' . $row, '=BITRSHIFT(A' . $row . ',1)');
+    $worksheet->setCellValue('D' . $row, '=DEC2BIN(C' . $row . ')');
+    $worksheet->setCellValue('E' . $row, '=BITRSHIFT(A' . $row . ',2)');
+    $worksheet->setCellValue('F' . $row, '=DEC2BIN(E' . $row . ')');
+    $worksheet->setCellValue('G' . $row, '=BITRSHIFT(A' . $row . ',3)');
+    $worksheet->setCellValue('H' . $row, '=DEC2BIN(G' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): Bitwise Right Shift of %d (%s) by 1 bit is %d (%s)',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+        $worksheet->getCell('C' . $row)->getCalculatedValue(),
+        $worksheet->getCell('D' . $row)->getCalculatedValue(),
+    ));
+    $helper->log(sprintf(
+        '(E%d): Bitwise Right Shift of %d (%s) by 2 bits is %d (%s)',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+        $worksheet->getCell('E' . $row)->getCalculatedValue(),
+        $worksheet->getCell('F' . $row)->getCalculatedValue(),
+    ));
+    $helper->log(sprintf(
+        '(E%d): Bitwise Right Shift of %d (%s) by 3 bits is %d (%s)',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+        $worksheet->getCell('G' . $row)->getCalculatedValue(),
+        $worksheet->getCell('H' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/BITXOR.php b/samples/Calculations/Engineering/BITXOR.php
new file mode 100644
index 00000000..482662cd
--- /dev/null
+++ b/samples/Calculations/Engineering/BITXOR.php
@@ -0,0 +1,49 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'BITXOR';
+$description = "Returns a bitwise 'XOR' of two numbers";
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    [1, 5],
+    [3, 5],
+    [1, 6],
+    [9, 6],
+    [13, 25],
+    [23, 10],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('C' . $row, '=TEXT(DEC2BIN(A' . $row . '), "00000")');
+    $worksheet->setCellValue('D' . $row, '=TEXT(DEC2BIN(B' . $row . '), "00000")');
+    $worksheet->setCellValue('E' . $row, '=BITXOR(A' . $row . ',B' . $row . ')');
+    $worksheet->setCellValue('F' . $row, '=TEXT(DEC2BIN(E' . $row . '), "00000")');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): Bitwise XOR of %d (%s) and %d (%s) is %d (%s)',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('C' . $row)->getCalculatedValue(),
+        $worksheet->getCell('B' . $row)->getValue(),
+        $worksheet->getCell('D' . $row)->getCalculatedValue(),
+        $worksheet->getCell('E' . $row)->getCalculatedValue(),
+        $worksheet->getCell('F' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/COMPLEX.php b/samples/Calculations/Engineering/COMPLEX.php
new file mode 100644
index 00000000..c58a1797
--- /dev/null
+++ b/samples/Calculations/Engineering/COMPLEX.php
@@ -0,0 +1,41 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'COMPLEX';
+$description = 'Converts real and imaginary coefficients into a complex number of the form x + yi or x + yj';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    [3, 4],
+    [3, 4, '"j"'],
+    [3.5, 4.75],
+    [0, 1],
+    [1, 0],
+    [0, -1],
+    [0, 2],
+    [2, 0],
+];
+$testDataCount = count($testData);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('A' . $row, '=COMPLEX(' . implode(',', $testData[$row - 1]) . ')');
+}
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(A%d): Formula %s result is %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('A' . $row)->getCalculatedValue()
+    ));
+}
diff --git a/samples/Calculations/Engineering/CONVERT.php b/samples/Calculations/Engineering/CONVERT.php
new file mode 100644
index 00000000..bce56ba5
--- /dev/null
+++ b/samples/Calculations/Engineering/CONVERT.php
@@ -0,0 +1,58 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'CONVERT';
+$description = 'Converts a number from one measurement system to another';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$conversions = [
+    [1, '"lbm"', '"kg"'],
+    [1, '"gal"', '"l"'],
+    [24, '"in"', '"ft"'],
+    [100, '"yd"', '"m"'],
+    [500, '"mi"', '"km"'],
+    [7.5, '"min"', '"sec"'],
+    [5, '"F"', '"C"'],
+    [32, '"C"', '"K"'],
+    [100, '"m2"', '"ft2"'],
+];
+$testDataCount = count($conversions);
+
+$worksheet->fromArray($conversions, null, 'A1');
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('D' . $row, '=CONVERT(' . implode(',', $conversions[$row - 1]) . ')');
+}
+
+$worksheet->setCellValue('H1', '=CONVERT(CONVERT(100,"m","ft"),"m","ft")');
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(A%d): Unit of Measure Conversion Formula %s - %d %s is %f %s',
+        $row,
+        $worksheet->getCell('D' . $row)->getValue(),
+        $worksheet->getCell('A' . $row)->getValue(),
+        trim($worksheet->getCell('B' . $row)->getValue(), '"'),
+        $worksheet->getCell('D' . $row)->getCalculatedValue(),
+        trim($worksheet->getCell('C' . $row)->getValue(), '"')
+    ));
+}
+
+$helper->log('Old method for area conversions, before MS Excel introduced area Units of Measure');
+
+$helper->log(sprintf(
+    '(A%d): Unit of Measure Conversion Formula %s result is %s',
+    $row,
+    $worksheet->getCell('H1')->getValue(),
+    $worksheet->getCell('H1')->getCalculatedValue()
+));
diff --git a/samples/Calculations/Engineering/DEC2BIN.php b/samples/Calculations/Engineering/DEC2BIN.php
new file mode 100644
index 00000000..2a064c06
--- /dev/null
+++ b/samples/Calculations/Engineering/DEC2BIN.php
@@ -0,0 +1,47 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'DEC2BIN';
+$description = 'Converts a decimal number to binary';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    [-255],
+    [-123],
+    [-15],
+    [-1],
+    [5],
+    [7],
+    [19],
+    [51],
+    [121],
+    [256],
+    [511],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=DEC2BIN(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(B%d): Decimal %s is binary %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/DEC2HEX.php b/samples/Calculations/Engineering/DEC2HEX.php
new file mode 100644
index 00000000..0a19ae54
--- /dev/null
+++ b/samples/Calculations/Engineering/DEC2HEX.php
@@ -0,0 +1,48 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'DEC2HEX';
+$description = 'Converts a decimal number to hexadecimal';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    [-255],
+    [-123],
+    [-15],
+    [-1],
+    [5],
+    [7],
+    [19],
+    [51],
+    [121],
+    [256],
+    [511],
+    [12345678],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=DEC2HEX(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(B%d): Decimal %s is hexadecimal %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/DEC2OCT.php b/samples/Calculations/Engineering/DEC2OCT.php
new file mode 100644
index 00000000..fc11a832
--- /dev/null
+++ b/samples/Calculations/Engineering/DEC2OCT.php
@@ -0,0 +1,48 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'DEC2OCT';
+$description = 'Converts a decimal number to octal';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    [-255],
+    [-123],
+    [-15],
+    [-1],
+    [5],
+    [7],
+    [19],
+    [51],
+    [121],
+    [256],
+    [511],
+    [12345678],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=DEC2OCT(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(B%d): Decimal %s is octal %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/DELTA.php b/samples/Calculations/Engineering/DELTA.php
new file mode 100644
index 00000000..cd51b161
--- /dev/null
+++ b/samples/Calculations/Engineering/DELTA.php
@@ -0,0 +1,46 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'DELTA';
+$description = 'Tests whether two values are equal. Returns 1 if number1 = number2; returns 0 otherwise. This function is also known as the Kronecker Delta function';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    [4, 5],
+    [3, 3],
+    [0.5, 0],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('C' . $row, '=DELTA(A' . $row . ',B' . $row . ')');
+}
+
+$comparison = [
+    0 => 'The values are not equal',
+    1 => 'The values are equal',
+];
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): Compare values %d and %d - Result is %d - %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getValue(),
+        $worksheet->getCell('C' . $row)->getCalculatedValue(),
+        $comparison[$worksheet->getCell('C' . $row)->getCalculatedValue()]
+    ));
+}
diff --git a/samples/Calculations/Engineering/ERF.php b/samples/Calculations/Engineering/ERF.php
new file mode 100644
index 00000000..e6505888
--- /dev/null
+++ b/samples/Calculations/Engineering/ERF.php
@@ -0,0 +1,67 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'ERF';
+$description = 'Returns the error function integrated between lower_limit and upper_limit';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData1 = [
+    [0.745],
+    [1],
+    [1.5],
+    [-2],
+];
+
+$testData2 = [
+    [0, 1.5],
+    [1, 2],
+    [-2, 1],
+];
+$testDataCount1 = count($testData1);
+$testDataCount2 = count($testData2);
+$testData2StartRow = $testDataCount1 + 1;
+
+$worksheet->fromArray($testData1, null, 'A1', true);
+$worksheet->fromArray($testData2, null, "A{$testData2StartRow}", true);
+
+for ($row = 1; $row <= $testDataCount1; ++$row) {
+    $worksheet->setCellValue('C' . $row, '=ERF(A' . $row . ')');
+}
+
+for ($row = $testDataCount1 + 1; $row <= $testDataCount2 + $testDataCount1; ++$row) {
+    $worksheet->setCellValue('C' . $row, '=ERF(A' . $row . ', B' . $row . ')');
+}
+
+// Test the formulae
+$helper->log('ERF() With a single argument');
+for ($row = 1; $row <= $testDataCount1; ++$row) {
+    $helper->log(sprintf(
+        '(C%d): %s The error function integrated between 0 and %f is %f',
+        $row,
+        $worksheet->getCell('C' . $row)->getValue(),
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('C' . $row)->getCalculatedValue(),
+    ));
+}
+
+$helper->log('ERF() With two arguments');
+for ($row = $testDataCount1 + 1; $row <= $testDataCount2 + $testDataCount1; ++$row) {
+    $helper->log(sprintf(
+        '(C%d): %s The error function integrated between %f and %f is %f',
+        $row,
+        $worksheet->getCell('C' . $row)->getValue(),
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getValue(),
+        $worksheet->getCell('C' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/ERFC.php b/samples/Calculations/Engineering/ERFC.php
new file mode 100644
index 00000000..5e7bcc6d
--- /dev/null
+++ b/samples/Calculations/Engineering/ERFC.php
@@ -0,0 +1,41 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'ERFC';
+$description = 'Returns the complementary ERF function integrated between x and infinity';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    [0],
+    [0.5],
+    [1],
+    [-1],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('C' . $row, '=ERFC(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): %s The complementary error function integrated by %f and infinity is %f',
+        $row,
+        $worksheet->getCell('C' . $row)->getValue(),
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('C' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/GESTEP.php b/samples/Calculations/Engineering/GESTEP.php
new file mode 100644
index 00000000..73f0a31c
--- /dev/null
+++ b/samples/Calculations/Engineering/GESTEP.php
@@ -0,0 +1,53 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'GESTEP';
+$description = 'Returns 1 if number ≥ step; returns 0 (zero) otherwise';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    [5, 4],
+    [5, 5],
+    [4, 5],
+    [-4, -5],
+    [-5, -4],
+    [1],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('C' . $row, '=GESTEP(A' . $row . ',B' . $row . ')');
+}
+
+$comparison = [
+    0 => 'Value %d is less than step %d',
+    1 => 'Value %d is greater than or equal to step %d',
+];
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): Compare value %d and step %d - Result is %d - %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getValue(),
+        $worksheet->getCell('C' . $row)->getCalculatedValue(),
+        sprintf(
+            $comparison[$worksheet->getCell('C' . $row)->getCalculatedValue()],
+            $worksheet->getCell('A' . $row)->getValue(),
+            $worksheet->getCell('B' . $row)->getValue(),
+        )
+    ));
+}
diff --git a/samples/Calculations/Engineering/HEX2BIN.php b/samples/Calculations/Engineering/HEX2BIN.php
new file mode 100644
index 00000000..2ad08925
--- /dev/null
+++ b/samples/Calculations/Engineering/HEX2BIN.php
@@ -0,0 +1,46 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'HEX2BIN';
+$description = 'Converts a hexadecimal number to binary';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    [3],
+    [8],
+    [42],
+    [99],
+    ['A2'],
+    ['F0'],
+    ['100'],
+    ['128'],
+    ['1AB'],
+    ['1FF'],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=HEX2BIN(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(B%d): Hexadecimal %s is binary %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/HEX2DEC.php b/samples/Calculations/Engineering/HEX2DEC.php
new file mode 100644
index 00000000..745d4110
--- /dev/null
+++ b/samples/Calculations/Engineering/HEX2DEC.php
@@ -0,0 +1,48 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'HEX2DEC';
+$description = 'Converts a hexadecimal number to decimal';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    ['08'],
+    ['42'],
+    ['A2'],
+    ['400'],
+    ['1000'],
+    ['1234'],
+    ['ABCD'],
+    ['C3B0'],
+    ['FFFFFFFFF'],
+    ['FFFFFFFFFF'],
+    ['FFFFFFF800'],
+    ['FEDCBA9876'],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=HEX2DEC(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(B%d): Hexadecimal %s is decimal %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/HEX2OCT.php b/samples/Calculations/Engineering/HEX2OCT.php
new file mode 100644
index 00000000..3608c1bb
--- /dev/null
+++ b/samples/Calculations/Engineering/HEX2OCT.php
@@ -0,0 +1,46 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'HEX2OCT';
+$description = 'Converts a hexadecimal number to octal';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    ['08'],
+    ['42'],
+    ['A2'],
+    ['400'],
+    ['100'],
+    ['1234'],
+    ['ABCD'],
+    ['C3B0'],
+    ['FFFFFFFFFF'],
+    ['FFFFFFF800'],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=HEX2OCT(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(B%d): Hexadecimal %s is octal %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/IMABS.php b/samples/Calculations/Engineering/IMABS.php
new file mode 100644
index 00000000..9c6b843c
--- /dev/null
+++ b/samples/Calculations/Engineering/IMABS.php
@@ -0,0 +1,48 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'IMABS';
+$description = 'Returns the absolute value (modulus) of a complex number in x + yi or x + yj text format';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    ['3+4i'],
+    ['5-12i'],
+    ['3.25+7.5i'],
+    ['3.25-12.5i'],
+    ['-3.25+7.5i'],
+    ['-3.25-7.5i'],
+    ['0-j'],
+    ['0-2.5j'],
+    ['0+j'],
+    ['0+1.25j'],
+    [4],
+    [-2.5],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=IMABS(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): The absolute value of %s is %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/IMAGINARY.php b/samples/Calculations/Engineering/IMAGINARY.php
new file mode 100644
index 00000000..99138938
--- /dev/null
+++ b/samples/Calculations/Engineering/IMAGINARY.php
@@ -0,0 +1,48 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'IMAGINARY';
+$description = 'Returns the imaginary coefficient of a complex number in x + yi or x + yj text format';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    ['3+4i'],
+    ['5-12i'],
+    ['3.25+7.5i'],
+    ['3.25-12.5i'],
+    ['-3.25+7.5i'],
+    ['-3.25-7.5i'],
+    ['0-j'],
+    ['0-2.5j'],
+    ['0+j'],
+    ['0+1.25j'],
+    [4],
+    [-2.5],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=IMAGINARY(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): The imaginary component of %s is %f',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/IMARGUMENT.php b/samples/Calculations/Engineering/IMARGUMENT.php
new file mode 100644
index 00000000..e559e951
--- /dev/null
+++ b/samples/Calculations/Engineering/IMARGUMENT.php
@@ -0,0 +1,48 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'IMARGUMENT';
+$description = 'Returns the argument Theta, an angle expressed in radians';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    ['3+4i'],
+    ['5-12i'],
+    ['3.25+7.5i'],
+    ['3.25-12.5i'],
+    ['-3.25+7.5i'],
+    ['-3.25-7.5i'],
+    ['0-j'],
+    ['0-2.5j'],
+    ['0+j'],
+    ['0+1.25j'],
+    [4],
+    [-2.5],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=IMARGUMENT(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): The Theta Argument of %s is %f radians',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/IMCONJUGATE.php b/samples/Calculations/Engineering/IMCONJUGATE.php
new file mode 100644
index 00000000..3b4429ed
--- /dev/null
+++ b/samples/Calculations/Engineering/IMCONJUGATE.php
@@ -0,0 +1,48 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'IMCONJUGATE';
+$description = 'Returns the complex conjugate of a complex number in x + yi or x + yj text format';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    ['3+4i'],
+    ['5-12i'],
+    ['3.25+7.5i'],
+    ['3.25-12.5i'],
+    ['-3.25+7.5i'],
+    ['-3.25-7.5i'],
+    ['0-j'],
+    ['0-2.5j'],
+    ['0+j'],
+    ['0+1.25j'],
+    [4],
+    [-2.5],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=IMCONJUGATE(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): The Conjugate of %s is %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/IMCOS.php b/samples/Calculations/Engineering/IMCOS.php
new file mode 100644
index 00000000..5b8f81ea
--- /dev/null
+++ b/samples/Calculations/Engineering/IMCOS.php
@@ -0,0 +1,48 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'IMCOS';
+$description = 'Returns the cosine of a complex number in x + yi or x + yj text format';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    ['3+4i'],
+    ['5-12i'],
+    ['3.25+7.5i'],
+    ['3.25-12.5i'],
+    ['-3.25+7.5i'],
+    ['-3.25-7.5i'],
+    ['0-j'],
+    ['0-2.5j'],
+    ['0+j'],
+    ['0+1.25j'],
+    [4],
+    [-2.5],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=IMCOS(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): The Cosine of %s is %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/IMCOSH.php b/samples/Calculations/Engineering/IMCOSH.php
new file mode 100644
index 00000000..9a393766
--- /dev/null
+++ b/samples/Calculations/Engineering/IMCOSH.php
@@ -0,0 +1,48 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'IMCOSH';
+$description = 'Returns the hyperbolic cosine of a complex number in x + yi or x + yj text format';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    ['3+4i'],
+    ['5-12i'],
+    ['3.25+7.5i'],
+    ['3.25-12.5i'],
+    ['-3.25+7.5i'],
+    ['-3.25-7.5i'],
+    ['0-j'],
+    ['0-2.5j'],
+    ['0+j'],
+    ['0+1.25j'],
+    [4],
+    [-2.5],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=IMCOSH(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): The Hyperbolic Cosine of %s is %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/IMCOT.php b/samples/Calculations/Engineering/IMCOT.php
new file mode 100644
index 00000000..e3d980cd
--- /dev/null
+++ b/samples/Calculations/Engineering/IMCOT.php
@@ -0,0 +1,48 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'IMCOT';
+$description = 'Returns the cotangent of a complex number in x + yi or x + yj text format';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    ['3+4i'],
+    ['5-12i'],
+    ['3.25+7.5i'],
+    ['3.25-12.5i'],
+    ['-3.25+7.5i'],
+    ['-3.25-7.5i'],
+    ['0-j'],
+    ['0-2.5j'],
+    ['0+j'],
+    ['0+1.25j'],
+    [4],
+    [-2.5],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=IMCOT(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): The Cotangent of %s is %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/IMCSC.php b/samples/Calculations/Engineering/IMCSC.php
new file mode 100644
index 00000000..ab6695d0
--- /dev/null
+++ b/samples/Calculations/Engineering/IMCSC.php
@@ -0,0 +1,48 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'IMCSC';
+$description = 'Returns the cosecant of a complex number in x + yi or x + yj text format';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    ['3+4i'],
+    ['5-12i'],
+    ['3.25+7.5i'],
+    ['3.25-12.5i'],
+    ['-3.25+7.5i'],
+    ['-3.25-7.5i'],
+    ['0-j'],
+    ['0-2.5j'],
+    ['0+j'],
+    ['0+1.25j'],
+    [4],
+    [-2.5],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=IMCSC(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): The Cosecant of %s is %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/IMCSCH.php b/samples/Calculations/Engineering/IMCSCH.php
new file mode 100644
index 00000000..4513d9e9
--- /dev/null
+++ b/samples/Calculations/Engineering/IMCSCH.php
@@ -0,0 +1,48 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'IMCSCH';
+$description = 'Returns the hyperbolic cosecant of a complex number in x + yi or x + yj text format';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    ['3+4i'],
+    ['5-12i'],
+    ['3.25+7.5i'],
+    ['3.25-12.5i'],
+    ['-3.25+7.5i'],
+    ['-3.25-7.5i'],
+    ['0-j'],
+    ['0-2.5j'],
+    ['0+j'],
+    ['0+1.25j'],
+    [4],
+    [-2.5],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=IMCSCH(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): The Hyperbolic Cosecant of %s is %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/IMDIV.php b/samples/Calculations/Engineering/IMDIV.php
new file mode 100644
index 00000000..9512be57
--- /dev/null
+++ b/samples/Calculations/Engineering/IMDIV.php
@@ -0,0 +1,42 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'IMDIV';
+$description = 'Returns the quotient of two complex numbers in x + yi or x + yj text format';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    ['3+4i', '5-3i'],
+    ['3+4i', '5+3i'],
+    ['-238+240i', '10+24i'],
+    ['1+2i', 30],
+    ['1+2i', '2i'],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('C' . $row, '=IMDIV(A' . $row . ', B' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): The Quotient of %s and %s is %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getValue(),
+        $worksheet->getCell('C' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/IMEXP.php b/samples/Calculations/Engineering/IMEXP.php
new file mode 100644
index 00000000..7f5837b2
--- /dev/null
+++ b/samples/Calculations/Engineering/IMEXP.php
@@ -0,0 +1,48 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'IMEXP';
+$description = 'Returns the exponential of a complex number in x + yi or x + yj text format';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    ['3+4i'],
+    ['5-12i'],
+    ['3.25+7.5i'],
+    ['3.25-12.5i'],
+    ['-3.25+7.5i'],
+    ['-3.25-7.5i'],
+    ['0-j'],
+    ['0-2.5j'],
+    ['0+j'],
+    ['0+1.25j'],
+    [4],
+    [-2.5],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=IMEXP(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): The Exponential of %s is %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/IMLN.php b/samples/Calculations/Engineering/IMLN.php
new file mode 100644
index 00000000..95618257
--- /dev/null
+++ b/samples/Calculations/Engineering/IMLN.php
@@ -0,0 +1,48 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'IMLN';
+$description = 'Returns the natural logarithm of a complex number in x + yi or x + yj text format';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    ['3+4i'],
+    ['5-12i'],
+    ['3.25+7.5i'],
+    ['3.25-12.5i'],
+    ['-3.25+7.5i'],
+    ['-3.25-7.5i'],
+    ['0-j'],
+    ['0-2.5j'],
+    ['0+j'],
+    ['0+1.25j'],
+    [4],
+    [-2.5],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=IMLN(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): The Natural Logarithm of %s is %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/IMLOG10.php b/samples/Calculations/Engineering/IMLOG10.php
new file mode 100644
index 00000000..d501c3de
--- /dev/null
+++ b/samples/Calculations/Engineering/IMLOG10.php
@@ -0,0 +1,48 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'IMLOG10';
+$description = 'Returns the base-10 logarithm of a complex number in x + yi or x + yj text format';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    ['3+4i'],
+    ['5-12i'],
+    ['3.25+7.5i'],
+    ['3.25-12.5i'],
+    ['-3.25+7.5i'],
+    ['-3.25-7.5i'],
+    ['0-j'],
+    ['0-2.5j'],
+    ['0+j'],
+    ['0+1.25j'],
+    [4],
+    [-2.5],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=IMLOG10(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): The Base-10 Logarithm of %s is %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/IMLOG2.php b/samples/Calculations/Engineering/IMLOG2.php
new file mode 100644
index 00000000..25986b39
--- /dev/null
+++ b/samples/Calculations/Engineering/IMLOG2.php
@@ -0,0 +1,48 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'IMLOG2';
+$description = 'Returns the base-2 logarithm of a complex number in x + yi or x + yj text format';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    ['3+4i'],
+    ['5-12i'],
+    ['3.25+7.5i'],
+    ['3.25-12.5i'],
+    ['-3.25+7.5i'],
+    ['-3.25-7.5i'],
+    ['0-j'],
+    ['0-2.5j'],
+    ['0+j'],
+    ['0+1.25j'],
+    [4],
+    [-2.5],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=IMLOG2(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): The Base-2 Logarithm of %s is %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/IMPOWER.php b/samples/Calculations/Engineering/IMPOWER.php
new file mode 100644
index 00000000..c6674fbe
--- /dev/null
+++ b/samples/Calculations/Engineering/IMPOWER.php
@@ -0,0 +1,49 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'IMPOWER';
+$description = 'Returns a complex number in x + yi or x + yj text format raised to a power';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    ['3+4i', 2],
+    ['5-12i', 2],
+    ['3.25+7.5i', 3],
+    ['3.25-12.5i', 2],
+    ['-3.25+7.5i', 3],
+    ['-3.25-7.5i', 4],
+    ['0-j', 5],
+    ['0-2.5j', 3],
+    ['0+j', 2.5],
+    ['0+1.25j', 2],
+    [4, 3],
+    [-2.5, 2],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('C' . $row, '=IMPOWER(A' . $row . ', B' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): %s raised to the power of %s is %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getValue(),
+        $worksheet->getCell('C' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/IMPRODUCT.php b/samples/Calculations/Engineering/IMPRODUCT.php
new file mode 100644
index 00000000..f81bc666
--- /dev/null
+++ b/samples/Calculations/Engineering/IMPRODUCT.php
@@ -0,0 +1,42 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'IMPRODUCT';
+$description = 'Returns the product of two or more complex numbers in x + yi or x + yj text format';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    ['3+4i', '5-3i'],
+    ['3+4i', '5+3i'],
+    ['-238+240i', '10+24i'],
+    ['1+2i', 30],
+    ['1+2i', '2i'],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('C' . $row, '=IMPRODUCT(A' . $row . ', B' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): The Product of %s and %s is %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getValue(),
+        $worksheet->getCell('C' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/IMREAL.php b/samples/Calculations/Engineering/IMREAL.php
new file mode 100644
index 00000000..4e537c0f
--- /dev/null
+++ b/samples/Calculations/Engineering/IMREAL.php
@@ -0,0 +1,48 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'IMREAL';
+$description = 'Returns the real coefficient of a complex number in x + yi or x + yj text format';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    ['3+4i'],
+    ['5-12i'],
+    ['3.25+7.5i'],
+    ['3.25-12.5i'],
+    ['-3.25+7.5i'],
+    ['-3.25-7.5i'],
+    ['0-j'],
+    ['0-2.5j'],
+    ['0+j'],
+    ['0+1.25j'],
+    [4],
+    [-2.5],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=IMREAL(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): The real component of %s is %f radians',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/IMSEC.php b/samples/Calculations/Engineering/IMSEC.php
new file mode 100644
index 00000000..e6c524b3
--- /dev/null
+++ b/samples/Calculations/Engineering/IMSEC.php
@@ -0,0 +1,48 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'IMSEC';
+$description = 'Returns the secant of a complex number in x + yi or x + yj text format';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    ['3+4i'],
+    ['5-12i'],
+    ['3.25+7.5i'],
+    ['3.25-12.5i'],
+    ['-3.25+7.5i'],
+    ['-3.25-7.5i'],
+    ['0-j'],
+    ['0-2.5j'],
+    ['0+j'],
+    ['0+1.25j'],
+    [4],
+    [-2.5],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=IMSEC(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): The Secant of %s is %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/IMSECH.php b/samples/Calculations/Engineering/IMSECH.php
new file mode 100644
index 00000000..e07b6e08
--- /dev/null
+++ b/samples/Calculations/Engineering/IMSECH.php
@@ -0,0 +1,48 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'IMSECH';
+$description = 'Returns the hyperbolic secant of a complex number in x + yi or x + yj text format';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    ['3+4i'],
+    ['5-12i'],
+    ['3.25+7.5i'],
+    ['3.25-12.5i'],
+    ['-3.25+7.5i'],
+    ['-3.25-7.5i'],
+    ['0-j'],
+    ['0-2.5j'],
+    ['0+j'],
+    ['0+1.25j'],
+    [4],
+    [-2.5],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=IMSECH(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): The Hyperbolic Secant of %s is %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/IMSIN.php b/samples/Calculations/Engineering/IMSIN.php
new file mode 100644
index 00000000..d3b8c281
--- /dev/null
+++ b/samples/Calculations/Engineering/IMSIN.php
@@ -0,0 +1,48 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'IMSIN';
+$description = 'Returns the sine of a complex number in x + yi or x + yj text format';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    ['3+4i'],
+    ['5-12i'],
+    ['3.25+7.5i'],
+    ['3.25-12.5i'],
+    ['-3.25+7.5i'],
+    ['-3.25-7.5i'],
+    ['0-j'],
+    ['0-2.5j'],
+    ['0+j'],
+    ['0+1.25j'],
+    [4],
+    [-2.5],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=IMSIN(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): The Sine of %s is %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/IMSINH.php b/samples/Calculations/Engineering/IMSINH.php
new file mode 100644
index 00000000..ac0a9039
--- /dev/null
+++ b/samples/Calculations/Engineering/IMSINH.php
@@ -0,0 +1,48 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'IMSINH';
+$description = 'Returns the hyperbolic sine of a complex number in x + yi or x + yj text format';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    ['3+4i'],
+    ['5-12i'],
+    ['3.25+7.5i'],
+    ['3.25-12.5i'],
+    ['-3.25+7.5i'],
+    ['-3.25-7.5i'],
+    ['0-j'],
+    ['0-2.5j'],
+    ['0+j'],
+    ['0+1.25j'],
+    [4],
+    [-2.5],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=IMSINH(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): The Hyperbolic Sine of %s is %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/IMSQRT.php b/samples/Calculations/Engineering/IMSQRT.php
new file mode 100644
index 00000000..c2573c91
--- /dev/null
+++ b/samples/Calculations/Engineering/IMSQRT.php
@@ -0,0 +1,48 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'IMSQRT';
+$description = 'Returns the square root of a complex number in x + yi or x + yj text format';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    ['3+4i'],
+    ['5-12i'],
+    ['3.25+7.5i'],
+    ['3.25-12.5i'],
+    ['-3.25+7.5i'],
+    ['-3.25-7.5i'],
+    ['0-j'],
+    ['0-2.5j'],
+    ['0+j'],
+    ['0+1.25j'],
+    [4],
+    [-2.5],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=IMSQRT(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): The Square Root of %s is %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/IMSUB.php b/samples/Calculations/Engineering/IMSUB.php
new file mode 100644
index 00000000..90bd27a4
--- /dev/null
+++ b/samples/Calculations/Engineering/IMSUB.php
@@ -0,0 +1,42 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'IMSUB';
+$description = 'Returns the difference of two complex numbers in x + yi or x + yj text format';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    ['3+4i', '5-3i'],
+    ['3+4i', '5+3i'],
+    ['-238+240i', '10+24i'],
+    ['1+2i', 30],
+    ['1+2i', '2i'],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('C' . $row, '=IMSUB(A' . $row . ', B' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): The Difference between %s and %s is %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getValue(),
+        $worksheet->getCell('C' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/IMSUM.php b/samples/Calculations/Engineering/IMSUM.php
new file mode 100644
index 00000000..2a8be320
--- /dev/null
+++ b/samples/Calculations/Engineering/IMSUM.php
@@ -0,0 +1,42 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'IMSUM';
+$description = 'Returns the sum of two or more complex numbers in x + yi or x + yj text format';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    ['3+4i', '5-3i'],
+    ['3+4i', '5+3i'],
+    ['-238+240i', '10+24i'],
+    ['1+2i', 30],
+    ['1+2i', '2i'],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('C' . $row, '=IMSUM(A' . $row . ', B' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): The Sum of %s and %s is %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getValue(),
+        $worksheet->getCell('C' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/IMTAN.php b/samples/Calculations/Engineering/IMTAN.php
new file mode 100644
index 00000000..ffaa53b2
--- /dev/null
+++ b/samples/Calculations/Engineering/IMTAN.php
@@ -0,0 +1,48 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'IMTAN';
+$description = 'Returns the tangent of a complex number in x + yi or x + yj text format';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    ['3+4i'],
+    ['5-12i'],
+    ['3.25+7.5i'],
+    ['3.25-12.5i'],
+    ['-3.25+7.5i'],
+    ['-3.25-7.5i'],
+    ['0-j'],
+    ['0-2.5j'],
+    ['0+j'],
+    ['0+1.25j'],
+    [4],
+    [-2.5],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=IMTAN(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(E%d): The Tangent of %s is %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/OCT2BIN.php b/samples/Calculations/Engineering/OCT2BIN.php
new file mode 100644
index 00000000..9c4bbf86
--- /dev/null
+++ b/samples/Calculations/Engineering/OCT2BIN.php
@@ -0,0 +1,47 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'OCT2BIN';
+$description = 'Converts an octal number to binary';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    [3],
+    [7],
+    [42],
+    [70],
+    [72],
+    [77],
+    [100],
+    [127],
+    [177],
+    [456],
+    [567],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=OCT2BIN(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(B%d): Octal %s is binary %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/OCT2DEC.php b/samples/Calculations/Engineering/OCT2DEC.php
new file mode 100644
index 00000000..ea6afb2f
--- /dev/null
+++ b/samples/Calculations/Engineering/OCT2DEC.php
@@ -0,0 +1,49 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'OCT2DEC';
+$description = 'Converts an octal number to decimal';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    [3],
+    [7],
+    [42],
+    [70],
+    [72],
+    [77],
+    [100],
+    [127],
+    [177],
+    [456],
+    [4567],
+    [7777700001],
+    [7777776543],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=OCT2DEC(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(B%d): Octal %s is decimal %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/samples/Calculations/Engineering/OCT2HEX.php b/samples/Calculations/Engineering/OCT2HEX.php
new file mode 100644
index 00000000..47e9b6e1
--- /dev/null
+++ b/samples/Calculations/Engineering/OCT2HEX.php
@@ -0,0 +1,49 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+require __DIR__ . '/../../Header.php';
+
+$category = 'Engineering';
+$functionName = 'OCT2HEX';
+$description = 'Converts an octal number to hexadecimal';
+
+$helper->titles($category, $functionName, $description);
+
+// Create new PhpSpreadsheet object
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->getActiveSheet();
+
+// Add some data
+$testData = [
+    [3],
+    [12],
+    [42],
+    [70],
+    [72],
+    [77],
+    [100],
+    [127],
+    [177],
+    [456],
+    [4567],
+    [7777700001],
+    [7777776543],
+];
+$testDataCount = count($testData);
+
+$worksheet->fromArray($testData, null, 'A1', true);
+
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $worksheet->setCellValue('B' . $row, '=OCT2HEX(A' . $row . ')');
+}
+
+// Test the formulae
+for ($row = 1; $row <= $testDataCount; ++$row) {
+    $helper->log(sprintf(
+        '(B%d): Octal %s is hexadecimal %s',
+        $row,
+        $worksheet->getCell('A' . $row)->getValue(),
+        $worksheet->getCell('B' . $row)->getCalculatedValue(),
+    ));
+}
diff --git a/src/PhpSpreadsheet/Calculation/Engineering/Compare.php b/src/PhpSpreadsheet/Calculation/Engineering/Compare.php
index 4d4bc07e..6aaf1faa 100644
--- a/src/PhpSpreadsheet/Calculation/Engineering/Compare.php
+++ b/src/PhpSpreadsheet/Calculation/Engineering/Compare.php
@@ -57,7 +57,7 @@ class Compare
      *
      * @param array|float $number the value to test against step
      *                      Or can be an array of values
-     * @param array|float $step The threshold value. If you omit a value for step, GESTEP uses zero.
+     * @param null|array|float $step The threshold value. If you omit a value for step, GESTEP uses zero.
      *                      Or can be an array of values
      *
      * @return array|int|string (string in the event of an error)
@@ -72,7 +72,7 @@ class Compare
 
         try {
             $number = EngineeringValidations::validateFloat($number);
-            $step = EngineeringValidations::validateFloat($step);
+            $step = EngineeringValidations::validateFloat($step ?? 0.0);
         } catch (Exception $e) {
             return $e->getMessage();
         }
diff --git a/tests/data/Calculation/DateTime/DATE.php b/tests/data/Calculation/DateTime/DATE.php
index 72816b76..d8b4303a 100644
--- a/tests/data/Calculation/DateTime/DATE.php
+++ b/tests/data/Calculation/DateTime/DATE.php
@@ -1,7 +1,9 @@
 <?php
 
 return [
-    [6890, '18, 11, 11'], // year without centure
+    [6890, '18, 11, 11'], // year less than 1900, adds 1900 (1918-11-11)
+    [44809, '122, 9, 5'], // year less than 1900, adds 1900 (2022-09-05)
+    [693845, '1899, 9, 5'], // year less than 1900, adds 1900 (3799-09-05)
     [1, '1900, 1, 1'], // Excel 1900 Calendar BaseDate
     [59, '1900, 2, 28'], // Day before Excel mythical 1900 leap day
     [60, '1900, 2, 29'], // Excel mythical 1900 leap day
@@ -15,6 +17,7 @@ return [
     [25569, '1970, 1, 1'], // Unix Timestamp Base Date
     [30292, '1982, 12, 7'],
     [39611, '2008, 6, 12'],
+    [50000, '2036, 11, 21'],
     [50424, '2038, 1, 19'], // 32-bit signed Unix Timestamp Latest Date
     [50425, '2038, 1, 20'], // Day after 32-bit signed Unix Timestamp Latest Date
     [39448, '2008, 1, 1'],
diff --git a/tests/data/Calculation/Engineering/BIN2DEC.php b/tests/data/Calculation/Engineering/BIN2DEC.php
index 4722d8e7..0e617eaf 100644
--- a/tests/data/Calculation/Engineering/BIN2DEC.php
+++ b/tests/data/Calculation/Engineering/BIN2DEC.php
@@ -7,6 +7,8 @@ return [
     ['5', '101'],
     ['2', '10'],
     ['0', '0'],
+    ['5', 101],
+    ['100', 1100100],
     ['#NUM!', '21'], // Invalid binary number
     ['#VALUE!', 'true'], // Boolean okay for ODS, not for Excel/Gnumeric
     ['#VALUE!', 'false'], // Boolean okay for ODS, not for Excel/Gnumeric

From 252474c1bd5bbe8984f4d06ac6711375bfd2fe40 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Wed, 14 Sep 2022 07:11:20 -0700
Subject: [PATCH 55/69] Scrutinizer Clean Up Tests (#3061)

* Scrutinizer Clean Up Tests

No source code involved.

* Scrutinizer Whack-a-mole

Fixed 17, added 10. Trying again.

* Simplify Some Tests

Eliminate some null assertions.

* Dead Code

Remove 2 statements.
---
 infra/DocumentGenerator.php                   |   2 +-
 ...dling_loader_exceptions_using_TryCatch.php |   2 +-
 src/PhpSpreadsheet/Spreadsheet.php            |  13 ++
 .../Engineering/ParseComplexTest.php          |   8 +-
 .../Functions/Financial/IrrTest.php           |  45 +++--
 .../Functions/LookupRef/ColumnsTest.php       |   8 +-
 .../Functions/LookupRef/IndexTest.php         |   8 +-
 .../Functions/LookupRef/RowsTest.php          |   8 +-
 .../Functions/MathTrig/RandBetweenTest.php    |   2 +-
 tests/PhpSpreadsheetTests/DefinedNameTest.php |  36 ++--
 .../Functional/PrintAreaTest.php              |   3 +-
 .../PhpSpreadsheetTests/NamedFormulaTest.php  |  12 +-
 tests/PhpSpreadsheetTests/NamedRangeTest.php  |  12 +-
 .../Reader/Csv/CsvContiguousTest.php          |  10 +-
 .../Reader/Xls/NumberFormatGeneralTest.php    |  24 +--
 .../Reader/Xls/RichTextSizeTest.php           |   3 +-
 .../Reader/Xlsx/AutoFilter2Test.php           |   9 +-
 .../Reader/Xlsx/ChartSheetTest.php            |   7 +-
 .../Reader/Xlsx/Issue2501Test.php             |  16 +-
 .../Reader/Xlsx/NamespaceNonStdTest.php       |  10 +-
 .../Reader/Xlsx/NamespaceOpenpyxl35Test.php   |  10 +-
 .../Reader/Xlsx/NamespaceStdTest.php          |  10 +-
 .../Reader/Xlsx/PageSetup2Test.php            |   3 +-
 .../Shared/PasswordHasherTest.php             |  23 ++-
 tests/PhpSpreadsheetTests/SpreadsheetTest.php | 171 ++++++++++--------
 .../ConditionalFormatting/CellMatcherTest.php |  92 ++++++----
 .../Wizard/WizardFactoryTest.php              |   9 +-
 .../Writer/Xls/VisibilityTest.php             |   2 +-
 .../Writer/Xlsx/UnparsedDataCloneTest.php     |  12 +-
 .../Writer/Xlsx/VisibilityTest.php            |   2 +-
 tests/data/Calculation/Financial/IRR.php      |   1 +
 31 files changed, 292 insertions(+), 281 deletions(-)

diff --git a/infra/DocumentGenerator.php b/infra/DocumentGenerator.php
index e2c3c86c..8a6be076 100644
--- a/infra/DocumentGenerator.php
+++ b/infra/DocumentGenerator.php
@@ -41,7 +41,7 @@ class DocumentGenerator
     private static function tableRow(array $lengths, ?array $values = null): string
     {
         $result = '';
-        foreach (array_map(null, $lengths, $values ?? []) as $i => [$length, $value]) {
+        foreach (array_map(/** @scrutinizer ignore-type */ null, $lengths, $values ?? []) as $i => [$length, $value]) {
             $pad = $value === null ? '-' : ' ';
             if ($i > 0) {
                 $result .= '|' . $pad;
diff --git a/samples/Reader/16_Handling_loader_exceptions_using_TryCatch.php b/samples/Reader/16_Handling_loader_exceptions_using_TryCatch.php
index 603f6cb8..d984b7b6 100644
--- a/samples/Reader/16_Handling_loader_exceptions_using_TryCatch.php
+++ b/samples/Reader/16_Handling_loader_exceptions_using_TryCatch.php
@@ -11,5 +11,5 @@ $helper->log('Loading file ' . /** @scrutinizer ignore-type */ pathinfo($inputFi
 try {
     $spreadsheet = IOFactory::load($inputFileName);
 } catch (ReaderException $e) {
-    $helper->log('Error loading file "' . pathinfo($inputFileName, PATHINFO_BASENAME) . '": ' . $e->getMessage());
+    $helper->log('Error loading file "' . /** @scrutinizer ignore-type */ pathinfo($inputFileName, PATHINFO_BASENAME) . '": ' . $e->getMessage());
 }
diff --git a/src/PhpSpreadsheet/Spreadsheet.php b/src/PhpSpreadsheet/Spreadsheet.php
index 4bb93987..364700e2 100644
--- a/src/PhpSpreadsheet/Spreadsheet.php
+++ b/src/PhpSpreadsheet/Spreadsheet.php
@@ -724,6 +724,19 @@ class Spreadsheet
         return null;
     }
 
+    /**
+     * Get sheet by name, throwing exception if not found.
+     */
+    public function getSheetByNameOrThrow(string $worksheetName): Worksheet
+    {
+        $worksheet = $this->getSheetByName($worksheetName);
+        if ($worksheet === null) {
+            throw new Exception("Sheet $worksheetName does not exist.");
+        }
+
+        return $worksheet;
+    }
+
     /**
      * Get index for sheet.
      *
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ParseComplexTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ParseComplexTest.php
index 1022052e..a32d946f 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ParseComplexTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ParseComplexTest.php
@@ -3,21 +3,15 @@
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Engineering;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Engineering;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PHPUnit\Framework\TestCase;
 
 class ParseComplexTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-    }
-
     public function testParseComplex(): void
     {
         [$real, $imaginary, $suffix] = [1.23e-4, 5.67e+8, 'j'];
 
-        $result = Engineering::parseComplex('1.23e-4+5.67e+8j');
+        $result = /** @scrutinizer ignore-deprecated */ Engineering::parseComplex('1.23e-4+5.67e+8j');
         self::assertArrayHasKey('real', $result);
         self::assertEquals($real, $result['real']);
         self::assertArrayHasKey('imaginary', $result);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/IrrTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/IrrTest.php
index 3c4bdb5a..2565f6c2 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/IrrTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Financial/IrrTest.php
@@ -2,26 +2,45 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Financial;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Financial;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
-use PHPUnit\Framework\TestCase;
-
-class IrrTest extends TestCase
+class IrrTest extends AllSetupTeardown
 {
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-    }
-
     /**
      * @dataProvider providerIRR
      *
      * @param mixed $expectedResult
+     * @param mixed $values
      */
-    public function testIRR($expectedResult, ...$args): void
+    public function testIRR($expectedResult, $values = null): void
     {
-        $result = Financial::IRR(...$args);
-        self::assertEqualsWithDelta($expectedResult, $result, 1E-8);
+        $this->mightHaveException($expectedResult);
+        $sheet = $this->getSheet();
+        $formula = '=IRR(';
+        if ($values !== null) {
+            if (is_array($values)) {
+                $row = 0;
+                foreach ($values as $value) {
+                    if (is_array($value)) {
+                        foreach ($value as $arrayValue) {
+                            ++$row;
+                            $sheet->getCell("A$row")->setValue($arrayValue);
+                        }
+                    } else {
+                        ++$row;
+                        $sheet->getCell("A$row")->setValue($value);
+                    }
+                }
+                $formula .= "A1:A$row";
+            } else {
+                $sheet->getCell('A1')->setValue($values);
+                $formula .= 'A1';
+            }
+        }
+        $formula .= ')';
+        $sheet->getCell('D1')->setValue($formula);
+        $result = $sheet->getCell('D1')->getCalculatedValue();
+        $this->adjustResult($result, $expectedResult);
+
+        self::assertEqualsWithDelta($expectedResult, $result, 0.1E-8);
     }
 
     public function providerIRR(): array
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/ColumnsTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/ColumnsTest.php
index f4f9bb9e..e8790cbf 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/ColumnsTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/ColumnsTest.php
@@ -3,17 +3,11 @@
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\LookupRef;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
 use PHPUnit\Framework\TestCase;
 
 class ColumnsTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-    }
-
     /**
      * @dataProvider providerCOLUMNS
      *
@@ -21,7 +15,7 @@ class ColumnsTest extends TestCase
      */
     public function testCOLUMNS($expectedResult, ...$args): void
     {
-        $result = LookupRef::COLUMNS(...$args);
+        $result = LookupRef::COLUMNS(/** @scrutinizer ignore-type */ ...$args);
         self::assertEquals($expectedResult, $result);
     }
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndexTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndexTest.php
index 03c87b50..fa3f4848 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndexTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndexTest.php
@@ -3,17 +3,11 @@
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\LookupRef;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
 use PHPUnit\Framework\TestCase;
 
 class IndexTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-    }
-
     /**
      * @dataProvider providerINDEX
      *
@@ -21,7 +15,7 @@ class IndexTest extends TestCase
      */
     public function testINDEX($expectedResult, ...$args): void
     {
-        $result = LookupRef::INDEX(...$args);
+        $result = LookupRef::INDEX(/** @scrutinizer ignore-type */ ...$args);
         self::assertEquals($expectedResult, $result);
     }
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/RowsTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/RowsTest.php
index 2155bdf1..fd9902f4 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/RowsTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/RowsTest.php
@@ -3,17 +3,11 @@
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\LookupRef;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
 use PHPUnit\Framework\TestCase;
 
 class RowsTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-    }
-
     /**
      * @dataProvider providerROWS
      *
@@ -21,7 +15,7 @@ class RowsTest extends TestCase
      */
     public function testROWS($expectedResult, ...$args): void
     {
-        $result = LookupRef::ROWS(...$args);
+        $result = LookupRef::ROWS(/** @scrutinizer ignore-type */ ...$args);
         self::assertEquals($expectedResult, $result);
     }
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/RandBetweenTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/RandBetweenTest.php
index 99cc1fa8..50b7117c 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/RandBetweenTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/RandBetweenTest.php
@@ -60,7 +60,7 @@ class RandBetweenTest extends AllSetupTeardown
         $formula = "=RandBetween({$argument1}, {$argument2})";
         $result = $calculation->_calculateFormulaValue($formula);
         self::assertIsArray($result);
-        self::assertCount($expectedRows, $result);
+        self::assertCount($expectedRows, /** @scrutinizer ignore-type */ $result);
         self::assertIsArray($result[0]);
         self::assertCount($expectedColumns, /** @scrutinizer ignore-type */ $result[0]);
     }
diff --git a/tests/PhpSpreadsheetTests/DefinedNameTest.php b/tests/PhpSpreadsheetTests/DefinedNameTest.php
index 82950880..c001f204 100644
--- a/tests/PhpSpreadsheetTests/DefinedNameTest.php
+++ b/tests/PhpSpreadsheetTests/DefinedNameTest.php
@@ -58,7 +58,7 @@ class DefinedNameTest extends TestCase
             DefinedName::createInstance('Foo', $this->spreadsheet->getActiveSheet(), '=A1')
         );
         $this->spreadsheet->addDefinedName(
-            DefinedName::createInstance('FOO', $this->spreadsheet->getSheetByName('Sheet #2'), '=B1', true)
+            DefinedName::createInstance('FOO', $this->spreadsheet->getSheetByNameOrThrow('Sheet #2'), '=B1', true)
         );
 
         self::assertCount(2, $this->spreadsheet->getDefinedNames());
@@ -66,7 +66,7 @@ class DefinedNameTest extends TestCase
         self::assertNotNull($definedName1);
         self::assertSame('=A1', $definedName1->getValue());
 
-        $definedName2 = $this->spreadsheet->getDefinedName('foo', $this->spreadsheet->getSheetByName('Sheet #2'));
+        $definedName2 = $this->spreadsheet->getDefinedName('foo', $this->spreadsheet->getSheetByNameOrThrow('Sheet #2'));
         self::assertNotNull($definedName2);
         self::assertSame('=B1', $definedName2->getValue());
     }
@@ -103,13 +103,13 @@ class DefinedNameTest extends TestCase
             DefinedName::createInstance('Foo', $this->spreadsheet->getActiveSheet(), '=A1')
         );
         $this->spreadsheet->addDefinedName(
-            DefinedName::createInstance('FOO', $this->spreadsheet->getSheetByName('Sheet #2'), '=B1', true)
+            DefinedName::createInstance('FOO', $this->spreadsheet->getSheetByNameOrThrow('Sheet #2'), '=B1', true)
         );
 
         $this->spreadsheet->removeDefinedName('Foo', $this->spreadsheet->getActiveSheet());
 
         self::assertCount(1, $this->spreadsheet->getDefinedNames());
-        $definedName = $this->spreadsheet->getDefinedName('foo', $this->spreadsheet->getSheetByName('Sheet #2'));
+        $definedName = $this->spreadsheet->getDefinedName('foo', $this->spreadsheet->getSheetByNameOrThrow('Sheet #2'));
         self::assertNotNull($definedName);
         self::assertSame('=B1', $definedName->getValue());
     }
@@ -120,10 +120,10 @@ class DefinedNameTest extends TestCase
             DefinedName::createInstance('Foo', $this->spreadsheet->getActiveSheet(), '=A1')
         );
         $this->spreadsheet->addDefinedName(
-            DefinedName::createInstance('FOO', $this->spreadsheet->getSheetByName('Sheet #2'), '=B1', true)
+            DefinedName::createInstance('FOO', $this->spreadsheet->getSheetByNameOrThrow('Sheet #2'), '=B1', true)
         );
 
-        $this->spreadsheet->removeDefinedName('Foo', $this->spreadsheet->getSheetByName('Sheet #2'));
+        $this->spreadsheet->removeDefinedName('Foo', $this->spreadsheet->getSheetByNameOrThrow('Sheet #2'));
 
         self::assertCount(1, $this->spreadsheet->getDefinedNames());
         $definedName = $this->spreadsheet->getDefinedName('foo');
@@ -154,10 +154,8 @@ class DefinedNameTest extends TestCase
 
     public function testChangeWorksheet(): void
     {
-        $sheet1 = $this->spreadsheet->getSheetByName('Sheet #1');
-        $sheet2 = $this->spreadsheet->getSheetByName('Sheet #2');
-        self::assertNotNull($sheet1);
-        self::assertNotNull($sheet2);
+        $sheet1 = $this->spreadsheet->getSheetByNameOrThrow('Sheet #1');
+        $sheet2 = $this->spreadsheet->getSheetByNameOrThrow('Sheet #2');
 
         $sheet1->getCell('A1')->setValue(1);
         $sheet2->getCell('A1')->setValue(2);
@@ -172,10 +170,8 @@ class DefinedNameTest extends TestCase
 
     public function testLocalOnly(): void
     {
-        $sheet1 = $this->spreadsheet->getSheetByName('Sheet #1');
-        $sheet2 = $this->spreadsheet->getSheetByName('Sheet #2');
-        self::assertNotNull($sheet1);
-        self::assertNotNull($sheet2);
+        $sheet1 = $this->spreadsheet->getSheetByNameOrThrow('Sheet #1');
+        $sheet2 = $this->spreadsheet->getSheetByNameOrThrow('Sheet #2');
 
         $sheet1->getCell('A1')->setValue(1);
         $sheet2->getCell('A1')->setValue(2);
@@ -190,10 +186,8 @@ class DefinedNameTest extends TestCase
 
     public function testScope(): void
     {
-        $sheet1 = $this->spreadsheet->getSheetByName('Sheet #1');
-        $sheet2 = $this->spreadsheet->getSheetByName('Sheet #2');
-        self::assertNotNull($sheet1);
-        self::assertNotNull($sheet2);
+        $sheet1 = $this->spreadsheet->getSheetByNameOrThrow('Sheet #1');
+        $sheet2 = $this->spreadsheet->getSheetByNameOrThrow('Sheet #2');
 
         $sheet1->getCell('A1')->setValue(1);
         $sheet2->getCell('A1')->setValue(2);
@@ -208,10 +202,8 @@ class DefinedNameTest extends TestCase
 
     public function testClone(): void
     {
-        $sheet1 = $this->spreadsheet->getSheetByName('Sheet #1');
-        $sheet2 = $this->spreadsheet->getSheetByName('Sheet #2');
-        self::assertNotNull($sheet1);
-        self::assertNotNull($sheet2);
+        $sheet1 = $this->spreadsheet->getSheetByNameOrThrow('Sheet #1');
+        $sheet2 = $this->spreadsheet->getSheetByNameOrThrow('Sheet #2');
 
         $sheet1->getCell('A1')->setValue(1);
         $sheet2->getCell('A1')->setValue(2);
diff --git a/tests/PhpSpreadsheetTests/Functional/PrintAreaTest.php b/tests/PhpSpreadsheetTests/Functional/PrintAreaTest.php
index 700c7c7f..921c59f5 100644
--- a/tests/PhpSpreadsheetTests/Functional/PrintAreaTest.php
+++ b/tests/PhpSpreadsheetTests/Functional/PrintAreaTest.php
@@ -58,8 +58,7 @@ class PrintAreaTest extends AbstractFunctional
 
     private static function getPrintArea(Spreadsheet $spreadsheet, string $name): string
     {
-        $sheet = $spreadsheet->getSheetByName($name);
-        self::assertNotNull($sheet, "Unable to get sheet $name");
+        $sheet = $spreadsheet->getSheetByNameOrThrow($name);
 
         return $sheet->getPageSetup()->getPrintArea();
     }
diff --git a/tests/PhpSpreadsheetTests/NamedFormulaTest.php b/tests/PhpSpreadsheetTests/NamedFormulaTest.php
index 02e9d818..28857abe 100644
--- a/tests/PhpSpreadsheetTests/NamedFormulaTest.php
+++ b/tests/PhpSpreadsheetTests/NamedFormulaTest.php
@@ -62,7 +62,7 @@ class NamedFormulaTest extends TestCase
             new NamedFormula('Foo', $this->spreadsheet->getActiveSheet(), '=19%')
         );
         $this->spreadsheet->addNamedFormula(
-            new NamedFormula('FOO', $this->spreadsheet->getSheetByName('Sheet #2'), '=16%', true)
+            new NamedFormula('FOO', $this->spreadsheet->getSheetByNameOrThrow('Sheet #2'), '=16%', true)
         );
 
         self::assertCount(2, $this->spreadsheet->getNamedFormulae());
@@ -72,7 +72,7 @@ class NamedFormulaTest extends TestCase
             '=19%',
             $formula->getValue()
         );
-        $formula = $this->spreadsheet->getNamedFormula('foo', $this->spreadsheet->getSheetByName('Sheet #2'));
+        $formula = $this->spreadsheet->getNamedFormula('foo', $this->spreadsheet->getSheetByNameOrThrow('Sheet #2'));
         self::assertNotNull($formula);
         self::assertSame(
             '=16%',
@@ -100,13 +100,13 @@ class NamedFormulaTest extends TestCase
             new NamedFormula('Foo', $this->spreadsheet->getActiveSheet(), '=19%')
         );
         $this->spreadsheet->addNamedFormula(
-            new NamedFormula('FOO', $this->spreadsheet->getSheetByName('Sheet #2'), '=16%', true)
+            new NamedFormula('FOO', $this->spreadsheet->getSheetByNameOrThrow('Sheet #2'), '=16%', true)
         );
 
         $this->spreadsheet->removeNamedFormula('Foo', $this->spreadsheet->getActiveSheet());
 
         self::assertCount(1, $this->spreadsheet->getNamedFormulae());
-        $formula = $this->spreadsheet->getNamedFormula('foo', $this->spreadsheet->getSheetByName('Sheet #2'));
+        $formula = $this->spreadsheet->getNamedFormula('foo', $this->spreadsheet->getSheetByNameOrThrow('Sheet #2'));
         self::assertNotNull($formula);
         self::assertSame(
             '=16%',
@@ -120,10 +120,10 @@ class NamedFormulaTest extends TestCase
             new NamedFormula('Foo', $this->spreadsheet->getActiveSheet(), '=19%')
         );
         $this->spreadsheet->addNamedFormula(
-            new NamedFormula('FOO', $this->spreadsheet->getSheetByName('Sheet #2'), '=16%', true)
+            new NamedFormula('FOO', $this->spreadsheet->getSheetByNameOrThrow('Sheet #2'), '=16%', true)
         );
 
-        $this->spreadsheet->removeNamedFormula('Foo', $this->spreadsheet->getSheetByName('Sheet #2'));
+        $this->spreadsheet->removeNamedFormula('Foo', $this->spreadsheet->getSheetByNameOrThrow('Sheet #2'));
 
         self::assertCount(1, $this->spreadsheet->getNamedFormulae());
         $formula = $this->spreadsheet->getNamedFormula('foo');
diff --git a/tests/PhpSpreadsheetTests/NamedRangeTest.php b/tests/PhpSpreadsheetTests/NamedRangeTest.php
index 402e7eba..9440ef21 100644
--- a/tests/PhpSpreadsheetTests/NamedRangeTest.php
+++ b/tests/PhpSpreadsheetTests/NamedRangeTest.php
@@ -62,7 +62,7 @@ class NamedRangeTest extends TestCase
             new NamedRange('Foo', $this->spreadsheet->getActiveSheet(), '=A1')
         );
         $this->spreadsheet->addNamedRange(
-            new NamedRange('FOO', $this->spreadsheet->getSheetByName('Sheet #2'), '=B1', true)
+            new NamedRange('FOO', $this->spreadsheet->getSheetByNameOrThrow('Sheet #2'), '=B1', true)
         );
 
         self::assertCount(2, $this->spreadsheet->getNamedRanges());
@@ -72,7 +72,7 @@ class NamedRangeTest extends TestCase
             '=A1',
             $range->getValue()
         );
-        $range = $this->spreadsheet->getNamedRange('foo', $this->spreadsheet->getSheetByName('Sheet #2'));
+        $range = $this->spreadsheet->getNamedRange('foo', $this->spreadsheet->getSheetByNameOrThrow('Sheet #2'));
         self::assertNotNull($range);
         self::assertSame(
             '=B1',
@@ -100,13 +100,13 @@ class NamedRangeTest extends TestCase
             new NamedRange('Foo', $this->spreadsheet->getActiveSheet(), '=A1')
         );
         $this->spreadsheet->addNamedRange(
-            new NamedRange('FOO', $this->spreadsheet->getSheetByName('Sheet #2'), '=B1', true)
+            new NamedRange('FOO', $this->spreadsheet->getSheetByNameOrThrow('Sheet #2'), '=B1', true)
         );
 
         $this->spreadsheet->removeNamedRange('Foo', $this->spreadsheet->getActiveSheet());
 
         self::assertCount(1, $this->spreadsheet->getNamedRanges());
-        $sheet = $this->spreadsheet->getNamedRange('foo', $this->spreadsheet->getSheetByName('Sheet #2'));
+        $sheet = $this->spreadsheet->getNamedRange('foo', $this->spreadsheet->getSheetByNameOrThrow('Sheet #2'));
         self::assertNotNull($sheet);
         self::assertSame(
             '=B1',
@@ -120,10 +120,10 @@ class NamedRangeTest extends TestCase
             new NamedRange('Foo', $this->spreadsheet->getActiveSheet(), '=A1')
         );
         $this->spreadsheet->addNamedRange(
-            new NamedRange('FOO', $this->spreadsheet->getSheetByName('Sheet #2'), '=B1', true)
+            new NamedRange('FOO', $this->spreadsheet->getSheetByNameOrThrow('Sheet #2'), '=B1', true)
         );
 
-        $this->spreadsheet->removeNamedRange('Foo', $this->spreadsheet->getSheetByName('Sheet #2'));
+        $this->spreadsheet->removeNamedRange('Foo', $this->spreadsheet->getSheetByNameOrThrow('Sheet #2'));
 
         self::assertCount(1, $this->spreadsheet->getNamedRanges());
         $range = $this->spreadsheet->getNamedRange('foo');
diff --git a/tests/PhpSpreadsheetTests/Reader/Csv/CsvContiguousTest.php b/tests/PhpSpreadsheetTests/Reader/Csv/CsvContiguousTest.php
index 291a29d0..8c28c1e7 100644
--- a/tests/PhpSpreadsheetTests/Reader/Csv/CsvContiguousTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Csv/CsvContiguousTest.php
@@ -56,13 +56,11 @@ class CsvContiguousTest extends TestCase
 
     private static function getCellValue(Spreadsheet $spreadsheet, string $sheetName, string $cellAddress): string
     {
-        $sheet = $spreadsheet->getSheetByName($sheetName);
+        $sheet = $spreadsheet->getSheetByNameOrThrow($sheetName);
         $result = '';
-        if ($sheet !== null) {
-            $value = $sheet->getCell($cellAddress)->getValue();
-            if (is_scalar($value) || (is_object($value) && method_exists($value, '__toString'))) {
-                $result = (string) $value;
-            }
+        $value = $sheet->getCell($cellAddress)->getValue();
+        if (is_scalar($value) || (is_object($value) && method_exists($value, '__toString'))) {
+            $result = (string) $value;
         }
 
         return $result;
diff --git a/tests/PhpSpreadsheetTests/Reader/Xls/NumberFormatGeneralTest.php b/tests/PhpSpreadsheetTests/Reader/Xls/NumberFormatGeneralTest.php
index a67fbb34..80867892 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xls/NumberFormatGeneralTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xls/NumberFormatGeneralTest.php
@@ -15,20 +15,16 @@ class NumberFormatGeneralTest extends AbstractFunctional
 
         $reader = new Xls();
         $spreadsheet = $reader->load($filename);
-        $sheet = $spreadsheet->getSheetByName('Blad1');
-        if ($sheet === null) {
-            self::fail('Expected to find sheet Blad1');
-        } else {
-            $array = $sheet->toArray();
-            self::assertSame('€ 2.95', $array[1][3]);
-            self::assertSame(2.95, $sheet->getCell('D2')->getValue());
-            self::assertSame(2.95, $sheet->getCell('D2')->getCalculatedValue());
-            self::assertSame('€ 2.95', $sheet->getCell('D2')->getFormattedValue());
-            self::assertSame(21, $array[1][4]);
-            self::assertSame(21, $sheet->getCell('E2')->getValue());
-            self::assertSame(21, $sheet->getCell('E2')->getCalculatedValue());
-            self::assertSame('21', $sheet->getCell('E2')->getFormattedValue());
-        }
+        $sheet = $spreadsheet->getSheetByNameOrThrow('Blad1');
+        $array = $sheet->toArray();
+        self::assertSame('€ 2.95', $array[1][3]);
+        self::assertSame(2.95, $sheet->getCell('D2')->getValue());
+        self::assertSame(2.95, $sheet->getCell('D2')->getCalculatedValue());
+        self::assertSame('€ 2.95', $sheet->getCell('D2')->getFormattedValue());
+        self::assertSame(21, $array[1][4]);
+        self::assertSame(21, $sheet->getCell('E2')->getValue());
+        self::assertSame(21, $sheet->getCell('E2')->getCalculatedValue());
+        self::assertSame('21', $sheet->getCell('E2')->getFormattedValue());
         $spreadsheet->disconnectWorksheets();
     }
 }
diff --git a/tests/PhpSpreadsheetTests/Reader/Xls/RichTextSizeTest.php b/tests/PhpSpreadsheetTests/Reader/Xls/RichTextSizeTest.php
index 54274e8c..cf45dec1 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xls/RichTextSizeTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xls/RichTextSizeTest.php
@@ -12,8 +12,7 @@ class RichTextSizeTest extends AbstractFunctional
         $filename = 'tests/data/Reader/XLS/RichTextFontSize.xls';
         $reader = new Xls();
         $spreadsheet = $reader->load($filename);
-        $sheet = $spreadsheet->getSheetByName('橱柜门板');
-        self::assertNotNull($sheet);
+        $sheet = $spreadsheet->getSheetByNameOrThrow('橱柜门板');
         $text = $sheet->getCell('L15')->getValue();
         $elements = $text->getRichTextElements();
         self::assertEquals(10, $elements[2]->getFont()->getSize());
diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/AutoFilter2Test.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/AutoFilter2Test.php
index 57c09de5..06d6b562 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xlsx/AutoFilter2Test.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/AutoFilter2Test.php
@@ -28,8 +28,7 @@ class AutoFilter2Test extends TestCase
     public function testReadDateRange(): void
     {
         $spreadsheet = IOFactory::load(self::TESTBOOK);
-        $sheet = $spreadsheet->getSheetByName('daterange');
-        self::assertNotNull($sheet);
+        $sheet = $spreadsheet->getSheetByNameOrThrow('daterange');
         $filter = $sheet->getAutoFilter();
         $maxRow = 30;
         self::assertSame("A1:A$maxRow", $filter->getRange());
@@ -61,8 +60,7 @@ class AutoFilter2Test extends TestCase
     public function testReadTopTen(): void
     {
         $spreadsheet = IOFactory::load(self::TESTBOOK);
-        $sheet = $spreadsheet->getSheetByName('top10');
-        self::assertNotNull($sheet);
+        $sheet = $spreadsheet->getSheetByNameOrThrow('top10');
         $filter = $sheet->getAutoFilter();
         $maxRow = 65;
         self::assertSame("A1:A$maxRow", $filter->getRange());
@@ -87,8 +85,7 @@ class AutoFilter2Test extends TestCase
     public function testReadDynamic(): void
     {
         $spreadsheet = IOFactory::load(self::TESTBOOK);
-        $sheet = $spreadsheet->getSheetByName('dynamic');
-        self::assertNotNull($sheet);
+        $sheet = $spreadsheet->getSheetByNameOrThrow('dynamic');
         $filter = $sheet->getAutoFilter();
         $maxRow = 30;
         self::assertSame("A1:A$maxRow", $filter->getRange());
diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/ChartSheetTest.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/ChartSheetTest.php
index 0f1605ff..e7862697 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xlsx/ChartSheetTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/ChartSheetTest.php
@@ -3,7 +3,6 @@
 namespace PhpOffice\PhpSpreadsheetTests\Reader\Xlsx;
 
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
-use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use PHPUnit\Framework\TestCase;
 
 class ChartSheetTest extends TestCase
@@ -16,8 +15,7 @@ class ChartSheetTest extends TestCase
         $spreadsheet = $reader->load($filename);
 
         self::assertCount(2, $spreadsheet->getAllSheets());
-        $chartSheet = $spreadsheet->getSheetByName('Chart1');
-        self::assertInstanceOf(Worksheet::class, $chartSheet);
+        $chartSheet = $spreadsheet->getSheetByNameOrThrow('Chart1');
         self::assertSame(1, $chartSheet->getChartCount());
     }
 
@@ -29,7 +27,6 @@ class ChartSheetTest extends TestCase
         $spreadsheet = $reader->load($filename);
 
         self::assertCount(1, $spreadsheet->getAllSheets());
-        $chartSheet = $spreadsheet->getSheetByName('Chart1');
-        self::assertNull($chartSheet);
+        self::assertNull($spreadsheet->getSheetByName('Chart1'));
     }
 }
diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/Issue2501Test.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/Issue2501Test.php
index 6b090fe8..57958245 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xlsx/Issue2501Test.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/Issue2501Test.php
@@ -42,28 +42,20 @@ class Issue2501Test extends TestCase
         $filename = self::$testbook;
         $reader = IOFactory::createReader('Xlsx');
         $spreadsheet = $reader->load($filename);
-        $sheet = $spreadsheet->getSheetByName('Columns');
+        $sheet = $spreadsheet->getSheetByNameOrThrow('Columns');
         $expected = [
             'A1:A1048576',
             'B1:D1048576',
             'E2:E4',
         ];
-        if ($sheet === null) {
-            self::fail('Unable to find sheet Columns');
-        } else {
-            self::assertSame($expected, array_values($sheet->getMergeCells()));
-        }
-        $sheet = $spreadsheet->getSheetByName('Rows');
+        self::assertSame($expected, array_values($sheet->getMergeCells()));
+        $sheet = $spreadsheet->getSheetByNameOrThrow('Rows');
         $expected = [
             'A1:XFD1',
             'A2:XFD4',
             'B5:D5',
         ];
-        if ($sheet === null) {
-            self::fail('Unable to find sheet Rows');
-        } else {
-            self::assertSame($expected, array_values($sheet->getMergeCells()));
-        }
+        self::assertSame($expected, array_values($sheet->getMergeCells()));
 
         $spreadsheet->disconnectWorksheets();
     }
diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespaceNonStdTest.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespaceNonStdTest.php
index 1849c5bd..cc2c03dc 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespaceNonStdTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespaceNonStdTest.php
@@ -62,13 +62,9 @@ class NamespaceNonStdTest extends \PHPUnit\Framework\TestCase
         self::assertSame('A2', $sheet->getFreezePane());
         self::assertSame('A2', $sheet->getTopLeftCell());
         self::assertSame('B3', $sheet->getSelectedCells());
-        $sheet = $spreadsheet->getSheetByName('SylkTest');
-        if ($sheet === null) {
-            self::fail('Unable to load expected sheet');
-        } else {
-            self::assertNull($sheet->getFreezePane());
-            self::assertNull($sheet->getTopLeftCell());
-        }
+        $sheet = $spreadsheet->getSheetByNameOrThrow('SylkTest');
+        self::assertNull($sheet->getFreezePane());
+        self::assertNull($sheet->getTopLeftCell());
     }
 
     public function testLoadXlsx(): void
diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespaceOpenpyxl35Test.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespaceOpenpyxl35Test.php
index 1b1743c9..afb36862 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespaceOpenpyxl35Test.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespaceOpenpyxl35Test.php
@@ -100,13 +100,9 @@ class NamespaceOpenpyxl35Test extends \PHPUnit\Framework\TestCase
             ],
         ];
         foreach ($expectedArray as $sheetName => $array1) {
-            $sheet = $spreadsheet->getSheetByName($sheetName);
-            if ($sheet === null) {
-                self::fail("Unable to find sheet $sheetName");
-            } else {
-                foreach ($array1 as $key => $value) {
-                    self::assertSame($value, self::getCellValue($sheet, $key), "error in sheet $sheetName cell $key");
-                }
+            $sheet = $spreadsheet->getSheetByNameOrThrow($sheetName);
+            foreach ($array1 as $key => $value) {
+                self::assertSame($value, self::getCellValue($sheet, $key), "error in sheet $sheetName cell $key");
             }
         }
         $spreadsheet->disconnectWorksheets();
diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespaceStdTest.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespaceStdTest.php
index 8b47d141..5f8c8bc3 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespaceStdTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/NamespaceStdTest.php
@@ -62,13 +62,9 @@ class NamespaceStdTest extends \PHPUnit\Framework\TestCase
         self::assertSame('A2', $sheet->getFreezePane());
         self::assertSame('A2', $sheet->getTopLeftCell());
         self::assertSame('B3', $sheet->getSelectedCells());
-        $sheet = $spreadsheet->getSheetByName('SylkTest');
-        if ($sheet === null) {
-            self::fail('Unable to load expected sheet');
-        } else {
-            self::assertNull($sheet->getFreezePane());
-            self::assertNull($sheet->getTopLeftCell());
-        }
+        $sheet = $spreadsheet->getSheetByNameOrThrow('SylkTest');
+        self::assertNull($sheet->getFreezePane());
+        self::assertNull($sheet->getTopLeftCell());
     }
 
     public function testLoadXlsx(): void
diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/PageSetup2Test.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/PageSetup2Test.php
index 1bbc88ac..12675b41 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xlsx/PageSetup2Test.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/PageSetup2Test.php
@@ -28,8 +28,7 @@ class PageSetup2Test extends TestCase
     public function testColumnBreak(): void
     {
         $spreadsheet = IOFactory::load(self::TESTBOOK);
-        $sheet = $spreadsheet->getSheetByName('colbreak');
-        self::assertNotNull($sheet);
+        $sheet = $spreadsheet->getSheetByNameOrThrow('colbreak');
         $breaks = $sheet->getBreaks();
         self::assertCount(1, $breaks);
         $break = $breaks['D1'] ?? null;
diff --git a/tests/PhpSpreadsheetTests/Shared/PasswordHasherTest.php b/tests/PhpSpreadsheetTests/Shared/PasswordHasherTest.php
index 4b7923d8..c9912b8c 100644
--- a/tests/PhpSpreadsheetTests/Shared/PasswordHasherTest.php
+++ b/tests/PhpSpreadsheetTests/Shared/PasswordHasherTest.php
@@ -10,16 +10,27 @@ class PasswordHasherTest extends TestCase
 {
     /**
      * @dataProvider providerHashPassword
-     *
-     * @param mixed $expectedResult
      */
-    public function testHashPassword($expectedResult, ...$args): void
-    {
+    public function testHashPassword(
+        string $expectedResult,
+        string $password,
+        ?string $algorithm = null,
+        ?string $salt = null,
+        ?int $spinCount = null
+    ): void {
         if ($expectedResult === 'exception') {
             $this->expectException(SpException::class);
         }
-        $result = PasswordHasher::hashPassword(...$args);
-        self::assertEquals($expectedResult, $result);
+        if ($algorithm === null) {
+            $result = PasswordHasher::hashPassword($password);
+        } elseif ($salt === null) {
+            $result = PasswordHasher::hashPassword($password, $algorithm);
+        } elseif ($spinCount === null) {
+            $result = PasswordHasher::hashPassword($password, $algorithm, $salt);
+        } else {
+            $result = PasswordHasher::hashPassword($password, $algorithm, $salt, $spinCount);
+        }
+        self::assertSame($expectedResult, $result);
     }
 
     public function providerHashPassword(): array
diff --git a/tests/PhpSpreadsheetTests/SpreadsheetTest.php b/tests/PhpSpreadsheetTests/SpreadsheetTest.php
index 11fb56e4..76e28b3d 100644
--- a/tests/PhpSpreadsheetTests/SpreadsheetTest.php
+++ b/tests/PhpSpreadsheetTests/SpreadsheetTest.php
@@ -2,28 +2,38 @@
 
 namespace PhpOffice\PhpSpreadsheetTests;
 
+use PhpOffice\PhpSpreadsheet\Exception as ssException;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use PHPUnit\Framework\TestCase;
 
 class SpreadsheetTest extends TestCase
 {
-    /** @var Spreadsheet */
-    private $object;
+    /** @var ?Spreadsheet */
+    private $spreadsheet;
 
-    protected function setUp(): void
+    protected function tearDown(): void
     {
-        parent::setUp();
-        $this->object = new Spreadsheet();
-        $sheet = $this->object->getActiveSheet();
+        if ($this->spreadsheet !== null) {
+            $this->spreadsheet->disconnectWorksheets();
+            $this->spreadsheet = null;
+        }
+    }
+
+    private function getSpreadsheet(): Spreadsheet
+    {
+        $this->spreadsheet = $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
 
         $sheet->setTitle('someSheet1');
         $sheet = new Worksheet();
         $sheet->setTitle('someSheet2');
-        $this->object->addSheet($sheet);
+        $spreadsheet->addSheet($sheet);
         $sheet = new Worksheet();
         $sheet->setTitle('someSheet 3');
-        $this->object->addSheet($sheet);
+        $spreadsheet->addSheet($sheet);
+
+        return $spreadsheet;
     }
 
     public function dataProviderForSheetNames(): array
@@ -35,6 +45,7 @@ class SpreadsheetTest extends TestCase
             [1, "'someSheet2'"],
             [2, 'someSheet 3'],
             [2, "'someSheet 3'"],
+            [null, 'someSheet 33'],
         ];
 
         return $array;
@@ -43,135 +54,153 @@ class SpreadsheetTest extends TestCase
     /**
      * @dataProvider dataProviderForSheetNames
      */
-    public function testGetSheetByName(int $index, string $sheetName): void
+    public function testGetSheetByName(?int $index, string $sheetName): void
     {
-        self::assertSame($this->object->getSheet($index), $this->object->getSheetByName($sheetName));
+        $spreadsheet = $this->getSpreadsheet();
+        if ($index === null) {
+            self::assertNull($spreadsheet->getSheetByName($sheetName));
+        } else {
+            self::assertSame($spreadsheet->getSheet($index), $spreadsheet->getSheetByName($sheetName));
+        }
     }
 
     public function testAddSheetDuplicateTitle(): void
     {
-        $this->expectException(\PhpOffice\PhpSpreadsheet\Exception::class);
+        $spreadsheet = $this->getSpreadsheet();
+        $this->expectException(ssException::class);
         $sheet = new Worksheet();
         $sheet->setTitle('someSheet2');
-        $this->object->addSheet($sheet);
+        $spreadsheet->addSheet($sheet);
     }
 
     public function testAddSheetNoAdjustActive(): void
     {
-        $this->object->setActiveSheetIndex(2);
-        self::assertEquals(2, $this->object->getActiveSheetIndex());
+        $spreadsheet = $this->getSpreadsheet();
+        $spreadsheet->setActiveSheetIndex(2);
+        self::assertEquals(2, $spreadsheet->getActiveSheetIndex());
         $sheet = new Worksheet();
         $sheet->setTitle('someSheet4');
-        $this->object->addSheet($sheet);
-        self::assertEquals(2, $this->object->getActiveSheetIndex());
+        $spreadsheet->addSheet($sheet);
+        self::assertEquals(2, $spreadsheet->getActiveSheetIndex());
     }
 
     public function testAddSheetAdjustActive(): void
     {
-        $this->object->setActiveSheetIndex(2);
-        self::assertEquals(2, $this->object->getActiveSheetIndex());
+        $spreadsheet = $this->getSpreadsheet();
+        $spreadsheet->setActiveSheetIndex(2);
+        self::assertEquals(2, $spreadsheet->getActiveSheetIndex());
         $sheet = new Worksheet();
         $sheet->setTitle('someSheet0');
-        $this->object->addSheet($sheet, 0);
-        self::assertEquals(3, $this->object->getActiveSheetIndex());
+        $spreadsheet->addSheet($sheet, 0);
+        self::assertEquals(3, $spreadsheet->getActiveSheetIndex());
     }
 
     public function testRemoveSheetIndexTooHigh(): void
     {
-        $this->expectException(\PhpOffice\PhpSpreadsheet\Exception::class);
-        $this->object->removeSheetByIndex(4);
+        $spreadsheet = $this->getSpreadsheet();
+        $this->expectException(ssException::class);
+        $spreadsheet->removeSheetByIndex(4);
     }
 
     public function testRemoveSheetNoAdjustActive(): void
     {
-        $this->object->setActiveSheetIndex(1);
-        self::assertEquals(1, $this->object->getActiveSheetIndex());
-        $this->object->removeSheetByIndex(2);
-        self::assertEquals(1, $this->object->getActiveSheetIndex());
+        $spreadsheet = $this->getSpreadsheet();
+        $spreadsheet->setActiveSheetIndex(1);
+        self::assertEquals(1, $spreadsheet->getActiveSheetIndex());
+        $spreadsheet->removeSheetByIndex(2);
+        self::assertEquals(1, $spreadsheet->getActiveSheetIndex());
     }
 
     public function testRemoveSheetAdjustActive(): void
     {
-        $this->object->setActiveSheetIndex(2);
-        self::assertEquals(2, $this->object->getActiveSheetIndex());
-        $this->object->removeSheetByIndex(1);
-        self::assertEquals(1, $this->object->getActiveSheetIndex());
+        $spreadsheet = $this->getSpreadsheet();
+        $spreadsheet->setActiveSheetIndex(2);
+        self::assertEquals(2, $spreadsheet->getActiveSheetIndex());
+        $spreadsheet->removeSheetByIndex(1);
+        self::assertEquals(1, $spreadsheet->getActiveSheetIndex());
     }
 
     public function testGetSheetIndexTooHigh(): void
     {
-        $this->expectException(\PhpOffice\PhpSpreadsheet\Exception::class);
-        $this->object->getSheet(4);
+        $spreadsheet = $this->getSpreadsheet();
+        $this->expectException(ssException::class);
+        $spreadsheet->getSheet(4);
     }
 
     public function testGetIndexNonExistent(): void
     {
-        $this->expectException(\PhpOffice\PhpSpreadsheet\Exception::class);
+        $spreadsheet = $this->getSpreadsheet();
+        $this->expectException(ssException::class);
         $sheet = new Worksheet();
         $sheet->setTitle('someSheet4');
-        $this->object->getIndex($sheet);
+        $spreadsheet->getIndex($sheet);
     }
 
     public function testSetIndexByName(): void
     {
-        $this->object->setIndexByName('someSheet1', 1);
-        self::assertEquals('someSheet2', $this->object->getSheet(0)->getTitle());
-        self::assertEquals('someSheet1', $this->object->getSheet(1)->getTitle());
-        self::assertEquals('someSheet 3', $this->object->getSheet(2)->getTitle());
+        $spreadsheet = $this->getSpreadsheet();
+        $spreadsheet->setIndexByName('someSheet1', 1);
+        self::assertEquals('someSheet2', $spreadsheet->getSheet(0)->getTitle());
+        self::assertEquals('someSheet1', $spreadsheet->getSheet(1)->getTitle());
+        self::assertEquals('someSheet 3', $spreadsheet->getSheet(2)->getTitle());
     }
 
     public function testRemoveAllSheets(): void
     {
-        $this->object->setActiveSheetIndex(2);
-        self::assertEquals(2, $this->object->getActiveSheetIndex());
-        $this->object->removeSheetByIndex(0);
-        self::assertEquals(1, $this->object->getActiveSheetIndex());
-        $this->object->removeSheetByIndex(0);
-        self::assertEquals(0, $this->object->getActiveSheetIndex());
-        $this->object->removeSheetByIndex(0);
-        self::assertEquals(-1, $this->object->getActiveSheetIndex());
+        $spreadsheet = $this->getSpreadsheet();
+        $spreadsheet->setActiveSheetIndex(2);
+        self::assertEquals(2, $spreadsheet->getActiveSheetIndex());
+        $spreadsheet->removeSheetByIndex(0);
+        self::assertEquals(1, $spreadsheet->getActiveSheetIndex());
+        $spreadsheet->removeSheetByIndex(0);
+        self::assertEquals(0, $spreadsheet->getActiveSheetIndex());
+        $spreadsheet->removeSheetByIndex(0);
+        self::assertEquals(-1, $spreadsheet->getActiveSheetIndex());
         $sheet = new Worksheet();
         $sheet->setTitle('someSheet4');
-        $this->object->addSheet($sheet);
-        self::assertEquals(0, $this->object->getActiveSheetIndex());
+        $spreadsheet->addSheet($sheet);
+        self::assertEquals(0, $spreadsheet->getActiveSheetIndex());
     }
 
     public function testBug1735(): void
     {
-        $spreadsheet = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
-        $spreadsheet->createSheet()->setTitle('addedsheet');
-        $spreadsheet->setActiveSheetIndex(1);
-        $spreadsheet->removeSheetByIndex(0);
-        $sheet = $spreadsheet->getActiveSheet();
+        $spreadsheet1 = new Spreadsheet();
+        $spreadsheet1->createSheet()->setTitle('addedsheet');
+        $spreadsheet1->setActiveSheetIndex(1);
+        $spreadsheet1->removeSheetByIndex(0);
+        $sheet = $spreadsheet1->getActiveSheet();
         self::assertEquals('addedsheet', $sheet->getTitle());
     }
 
     public function testSetActiveSheetIndexTooHigh(): void
     {
-        $this->expectException(\PhpOffice\PhpSpreadsheet\Exception::class);
-        $this->object->setActiveSheetIndex(4);
+        $spreadsheet = $this->getSpreadsheet();
+        $this->expectException(ssException::class);
+        $spreadsheet->setActiveSheetIndex(4);
     }
 
     public function testSetActiveSheetNoSuchName(): void
     {
-        $this->expectException(\PhpOffice\PhpSpreadsheet\Exception::class);
-        $this->object->setActiveSheetIndexByName('unknown');
+        $spreadsheet = $this->getSpreadsheet();
+        $this->expectException(ssException::class);
+        $spreadsheet->setActiveSheetIndexByName('unknown');
     }
 
     public function testAddExternal(): void
     {
-        $spreadsheet = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
-        $sheet = $spreadsheet->createSheet()->setTitle('someSheet19');
+        $spreadsheet = $this->getSpreadsheet();
+        $spreadsheet1 = new Spreadsheet();
+        $sheet = $spreadsheet1->createSheet()->setTitle('someSheet19');
         $sheet->getCell('A1')->setValue(1);
         $sheet->getCell('A1')->getStyle()->getFont()->setBold(true);
         $sheet->getCell('B1')->getStyle()->getFont()->setSuperscript(true);
         $sheet->getCell('C1')->getStyle()->getFont()->setSubscript(true);
-        self::assertCount(4, $spreadsheet->getCellXfCollection());
+        self::assertCount(4, $spreadsheet1->getCellXfCollection());
         self::assertEquals(1, $sheet->getCell('A1')->getXfIndex());
-        $this->object->getActiveSheet()->getCell('A1')->getStyle()->getFont()->setBold(true);
-        self::assertCount(2, $this->object->getCellXfCollection());
-        $sheet3 = $this->object->addExternalSheet($sheet);
-        self::assertCount(6, $this->object->getCellXfCollection());
+        $spreadsheet->getActiveSheet()->getCell('A1')->getStyle()->getFont()->setBold(true);
+        self::assertCount(2, $spreadsheet->getCellXfCollection());
+        $sheet3 = $spreadsheet->addExternalSheet($sheet);
+        self::assertCount(6, $spreadsheet->getCellXfCollection());
         self::assertEquals('someSheet19', $sheet3->getTitle());
         self::assertEquals(1, $sheet3->getCell('A1')->getValue());
         self::assertTrue($sheet3->getCell('A1')->getStyle()->getFont()->getBold());
@@ -181,17 +210,17 @@ class SpreadsheetTest extends TestCase
 
     public function testAddExternalDuplicateName(): void
     {
-        $this->expectException(\PhpOffice\PhpSpreadsheet\Exception::class);
-        $spreadsheet = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
+        $this->expectException(ssException::class);
+        $spreadsheet = new Spreadsheet();
         $sheet = $spreadsheet->createSheet()->setTitle('someSheet1');
         $sheet->getCell('A1')->setValue(1);
         $sheet->getCell('A1')->getStyle()->getFont()->setBold(true);
-        $this->object->addExternalSheet($sheet);
+        $spreadsheet->addExternalSheet($sheet);
     }
 
     public function testAddExternalColumnDimensionStyles(): void
     {
-        $spreadsheet1 = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
+        $spreadsheet1 = new Spreadsheet();
         $sheet1 = $spreadsheet1->createSheet()->setTitle('sheetWithColumnDimension');
         $sheet1->getCell('A1')->setValue(1);
         $sheet1->getCell('A1')->getStyle()->getFont()->setItalic(true);
@@ -200,7 +229,7 @@ class SpreadsheetTest extends TestCase
         self::assertEquals(1, $index);
         self::assertCount(2, $spreadsheet1->getCellXfCollection());
 
-        $spreadsheet2 = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
+        $spreadsheet2 = new Spreadsheet();
         $sheet2 = $spreadsheet2->createSheet()->setTitle('sheetWithTwoStyles');
         $sheet2->getCell('A1')->setValue(1);
         $sheet2->getCell('A1')->getStyle()->getFont()->setBold(true);
@@ -220,7 +249,7 @@ class SpreadsheetTest extends TestCase
 
     public function testAddExternalRowDimensionStyles(): void
     {
-        $spreadsheet1 = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
+        $spreadsheet1 = new Spreadsheet();
         $sheet1 = $spreadsheet1->createSheet()->setTitle('sheetWithColumnDimension');
         $sheet1->getCell('A1')->setValue(1);
         $sheet1->getCell('A1')->getStyle()->getFont()->setItalic(true);
@@ -229,7 +258,7 @@ class SpreadsheetTest extends TestCase
         self::assertEquals(1, $index);
         self::assertCount(2, $spreadsheet1->getCellXfCollection());
 
-        $spreadsheet2 = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
+        $spreadsheet2 = new Spreadsheet();
         $sheet2 = $spreadsheet2->createSheet()->setTitle('sheetWithTwoStyles');
         $sheet2->getCell('A1')->setValue(1);
         $sheet2->getCell('A1')->getStyle()->getFont()->setBold(true);
diff --git a/tests/PhpSpreadsheetTests/Style/ConditionalFormatting/CellMatcherTest.php b/tests/PhpSpreadsheetTests/Style/ConditionalFormatting/CellMatcherTest.php
index 2c6d0da8..decbad5b 100644
--- a/tests/PhpSpreadsheetTests/Style/ConditionalFormatting/CellMatcherTest.php
+++ b/tests/PhpSpreadsheetTests/Style/ConditionalFormatting/CellMatcherTest.php
@@ -2,9 +2,12 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Style\ConditionalFormatting;
 
+use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Exception as ssException;
 use PhpOffice\PhpSpreadsheet\IOFactory;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\CellMatcher;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use PHPUnit\Framework\TestCase;
 
 class CellMatcherTest extends TestCase
@@ -30,18 +33,26 @@ class CellMatcherTest extends TestCase
         }
     }
 
+    private function confirmString(Worksheet $worksheet, Cell $cell, string $cellAddress): string
+    {
+        $cfRange = $worksheet->getConditionalRange($cell->getCoordinate()) ?? '';
+        if ($cfRange === '') {
+            self::fail("{$cellAddress} is not in a Conditional Format range");
+        }
+
+        return $cfRange;
+    }
+
     /**
      * @dataProvider basicCellIsComparisonDataProvider
      */
     public function testBasicCellIsComparison(string $sheetname, string $cellAddress, array $expectedMatches): void
     {
         $this->spreadsheet = $this->loadSpreadsheet();
-        $worksheet = $this->spreadsheet->getSheetByName($sheetname);
-        self::assertNotNull($worksheet, "$sheetname not found in test workbook");
+        $worksheet = $this->spreadsheet->getSheetByNameOrThrow($sheetname);
         $cell = $worksheet->getCell($cellAddress);
 
-        $cfRange = $worksheet->getConditionalRange($cell->getCoordinate());
-        self::assertNotNull($cfRange, "{$cellAddress} is not in a Conditional Format range");
+        $cfRange = $this->confirmString($worksheet, $cell, $cellAddress);
         $cfStyles = $worksheet->getConditionalStyles($cell->getCoordinate());
 
         $matcher = new CellMatcher($cell, $cfRange);
@@ -83,18 +94,35 @@ class CellMatcherTest extends TestCase
         ];
     }
 
+    public function testNotInRange(): void
+    {
+        $this->spreadsheet = $this->loadSpreadsheet();
+        $sheetname = 'cellIs Comparison';
+        $worksheet = $this->spreadsheet->getSheetByNameOrThrow($sheetname);
+        $cell = $worksheet->getCell('J20');
+
+        $cfRange = $worksheet->getConditionalRange($cell->getCoordinate());
+        self::assertNull($cfRange);
+    }
+
+    public function testUnknownSheet(): void
+    {
+        $this->expectException(ssException::class);
+        $this->spreadsheet = $this->loadSpreadsheet();
+        $sheetname = 'cellIs Comparisonxxx';
+        $this->spreadsheet->getSheetByNameOrThrow($sheetname);
+    }
+
     /**
      * @dataProvider rangeCellIsComparisonDataProvider
      */
     public function testRangeCellIsComparison(string $sheetname, string $cellAddress, bool $expectedMatch): void
     {
         $this->spreadsheet = $this->loadSpreadsheet();
-        $worksheet = $this->spreadsheet->getSheetByName($sheetname);
-        self::assertNotNull($worksheet, "$sheetname not found in test workbook");
+        $worksheet = $this->spreadsheet->getSheetByNameOrThrow($sheetname);
         $cell = $worksheet->getCell($cellAddress);
 
-        $cfRange = $worksheet->getConditionalRange($cell->getCoordinate());
-        self::assertNotNull($cfRange, "$cellAddress is not in a Conditional Format range");
+        $cfRange = $this->confirmString($worksheet, $cell, $cellAddress);
         $cfStyle = $worksheet->getConditionalStyles($cell->getCoordinate());
 
         $matcher = new CellMatcher($cell, $cfRange);
@@ -132,12 +160,10 @@ class CellMatcherTest extends TestCase
     public function testCellIsMultipleExpression(string $sheetname, string $cellAddress, array $expectedMatches): void
     {
         $this->spreadsheet = $this->loadSpreadsheet();
-        $worksheet = $this->spreadsheet->getSheetByName($sheetname);
-        self::assertNotNull($worksheet, "$sheetname not found in test workbook");
+        $worksheet = $this->spreadsheet->getSheetByNameOrThrow($sheetname);
         $cell = $worksheet->getCell($cellAddress);
 
-        $cfRange = $worksheet->getConditionalRange($cell->getCoordinate());
-        self::assertNotNull($cfRange, "$cellAddress is not in a Conditional Format range");
+        $cfRange = $this->confirmString($worksheet, $cell, $cellAddress);
         $cfStyles = $worksheet->getConditionalStyles($cell->getCoordinate());
 
         $matcher = new CellMatcher($cell, $cfRange);
@@ -168,12 +194,10 @@ class CellMatcherTest extends TestCase
     public function testCellIsExpression(string $sheetname, string $cellAddress, bool $expectedMatch): void
     {
         $this->spreadsheet = $this->loadSpreadsheet();
-        $worksheet = $this->spreadsheet->getSheetByName($sheetname);
-        self::assertNotNull($worksheet, "$sheetname not found in test workbook");
+        $worksheet = $this->spreadsheet->getSheetByNameOrThrow($sheetname);
         $cell = $worksheet->getCell($cellAddress);
 
-        $cfRange = $worksheet->getConditionalRange($cell->getCoordinate());
-        self::assertNotNull($cfRange, "$cellAddress is not in a Conditional Format range");
+        $cfRange = $this->confirmString($worksheet, $cell, $cellAddress);
         $cfStyle = $worksheet->getConditionalStyles($cell->getCoordinate());
 
         $matcher = new CellMatcher($cell, $cfRange);
@@ -214,12 +238,10 @@ class CellMatcherTest extends TestCase
     public function testTextExpressions(string $sheetname, string $cellAddress, bool $expectedMatch): void
     {
         $this->spreadsheet = $this->loadSpreadsheet();
-        $worksheet = $this->spreadsheet->getSheetByName($sheetname);
-        self::assertNotNull($worksheet, "$sheetname not found in test workbook");
+        $worksheet = $this->spreadsheet->getSheetByNameOrThrow($sheetname);
         $cell = $worksheet->getCell($cellAddress);
 
-        $cfRange = $worksheet->getConditionalRange($cell->getCoordinate());
-        self::assertNotNull($cfRange, "$cellAddress is not in a Conditional Format range");
+        $cfRange = $this->confirmString($worksheet, $cell, $cellAddress);
         $cfStyle = $worksheet->getConditionalStyles($cell->getCoordinate());
 
         $matcher = new CellMatcher($cell, $cfRange);
@@ -324,12 +346,10 @@ class CellMatcherTest extends TestCase
     public function testBlankExpressions(string $sheetname, string $cellAddress, array $expectedMatches): void
     {
         $this->spreadsheet = $this->loadSpreadsheet();
-        $worksheet = $this->spreadsheet->getSheetByName($sheetname);
-        self::assertNotNull($worksheet, "$sheetname not found in test workbook");
+        $worksheet = $this->spreadsheet->getSheetByNameOrThrow($sheetname);
         $cell = $worksheet->getCell($cellAddress);
 
-        $cfRange = $worksheet->getConditionalRange($cell->getCoordinate());
-        self::assertNotNull($cfRange, "$cellAddress is not in a Conditional Format range");
+        $cfRange = $this->confirmString($worksheet, $cell, $cellAddress);
         $cfStyles = $worksheet->getConditionalStyles($cell->getCoordinate());
 
         $matcher = new CellMatcher($cell, $cfRange);
@@ -357,12 +377,10 @@ class CellMatcherTest extends TestCase
     public function testErrorExpressions(string $sheetname, string $cellAddress, array $expectedMatches): void
     {
         $this->spreadsheet = $this->loadSpreadsheet();
-        $worksheet = $this->spreadsheet->getSheetByName($sheetname);
-        self::assertNotNull($worksheet, "$sheetname not found in test workbook");
+        $worksheet = $this->spreadsheet->getSheetByNameOrThrow($sheetname);
         $cell = $worksheet->getCell($cellAddress);
 
-        $cfRange = $worksheet->getConditionalRange($cell->getCoordinate());
-        self::assertNotNull($cfRange, "$cellAddress is not in a Conditional Format range");
+        $cfRange = $this->confirmString($worksheet, $cell, $cellAddress);
         $cfStyles = $worksheet->getConditionalStyles($cell->getCoordinate());
 
         $matcher = new CellMatcher($cell, $cfRange);
@@ -389,12 +407,10 @@ class CellMatcherTest extends TestCase
     public function testDateOccurringExpressions(string $sheetname, string $cellAddress, bool $expectedMatch): void
     {
         $this->spreadsheet = $this->loadSpreadsheet();
-        $worksheet = $this->spreadsheet->getSheetByName($sheetname);
-        self::assertNotNull($worksheet, "$sheetname not found in test workbook");
+        $worksheet = $this->spreadsheet->getSheetByNameOrThrow($sheetname);
         $cell = $worksheet->getCell($cellAddress);
 
-        $cfRange = $worksheet->getConditionalRange($cell->getCoordinate());
-        self::assertNotNull($cfRange, "$cellAddress is not in a Conditional Format range");
+        $cfRange = $this->confirmString($worksheet, $cell, $cellAddress);
         $cfStyle = $worksheet->getConditionalStyles($cell->getCoordinate());
 
         $matcher = new CellMatcher($cell, $cfRange);
@@ -433,12 +449,10 @@ class CellMatcherTest extends TestCase
     public function testDuplicatesExpressions(string $sheetname, string $cellAddress, array $expectedMatches): void
     {
         $this->spreadsheet = $this->loadSpreadsheet();
-        $worksheet = $this->spreadsheet->getSheetByName($sheetname);
-        self::assertNotNull($worksheet, "$sheetname not found in test workbook");
+        $worksheet = $this->spreadsheet->getSheetByNameOrThrow($sheetname);
         $cell = $worksheet->getCell($cellAddress);
 
-        $cfRange = $worksheet->getConditionalRange($cell->getCoordinate());
-        self::AssertNotNull($cfRange, "$cellAddress is not in a Conditional Format range");
+        $cfRange = $this->confirmString($worksheet, $cell, $cellAddress);
         $cfStyles = $worksheet->getConditionalStyles($cell->getCoordinate());
 
         $matcher = new CellMatcher($cell, $cfRange);
@@ -469,12 +483,10 @@ class CellMatcherTest extends TestCase
     public function testCrossWorksheetExpressions(string $sheetname, string $cellAddress, bool $expectedMatch): void
     {
         $this->spreadsheet = $this->loadSpreadsheet();
-        $worksheet = $this->spreadsheet->getSheetByName($sheetname);
-        self::assertNotNull($worksheet, "$sheetname not found in test workbook");
+        $worksheet = $this->spreadsheet->getSheetByNameOrThrow($sheetname);
         $cell = $worksheet->getCell($cellAddress);
 
-        $cfRange = $worksheet->getConditionalRange($cell->getCoordinate());
-        self::assertNotNull($cfRange, "$cellAddress is not in a Conditional Format range");
+        $cfRange = $this->confirmString($worksheet, $cell, $cellAddress);
         $cfStyle = $worksheet->getConditionalStyles($cell->getCoordinate());
 
         $matcher = new CellMatcher($cell, $cfRange);
diff --git a/tests/PhpSpreadsheetTests/Style/ConditionalFormatting/Wizard/WizardFactoryTest.php b/tests/PhpSpreadsheetTests/Style/ConditionalFormatting/Wizard/WizardFactoryTest.php
index c35c626e..2d4991a4 100644
--- a/tests/PhpSpreadsheetTests/Style/ConditionalFormatting/Wizard/WizardFactoryTest.php
+++ b/tests/PhpSpreadsheetTests/Style/ConditionalFormatting/Wizard/WizardFactoryTest.php
@@ -24,9 +24,9 @@ class WizardFactoryTest extends TestCase
     /**
      * @dataProvider basicWizardFactoryProvider
      *
-     * @param class-string<object> $expectedWizard
+     * @psalm-param class-string<object> $expectedWizard
      */
-    public function testBasicWizardFactory(string $ruleType, $expectedWizard): void
+    public function testBasicWizardFactory(string $ruleType, string $expectedWizard): void
     {
         $wizard = $this->wizardFactory->newRule($ruleType);
         self::assertInstanceOf($expectedWizard, $wizard);
@@ -54,10 +54,7 @@ class WizardFactoryTest extends TestCase
         $filename = 'tests/data/Style/ConditionalFormatting/CellMatcher.xlsx';
         $reader = IOFactory::createReader('Xlsx');
         $spreadsheet = $reader->load($filename);
-        $worksheet = $spreadsheet->getSheetByName($sheetName);
-        if ($worksheet === null) {
-            self::markTestSkipped("{$sheetName} not found in test workbook");
-        }
+        $worksheet = $spreadsheet->getSheetByNameOrThrow($sheetName);
         $cell = $worksheet->getCell($cellAddress);
 
         $cfRange = $worksheet->getConditionalRange($cell->getCoordinate());
diff --git a/tests/PhpSpreadsheetTests/Writer/Xls/VisibilityTest.php b/tests/PhpSpreadsheetTests/Writer/Xls/VisibilityTest.php
index 7de39328..8c4aa1b9 100644
--- a/tests/PhpSpreadsheetTests/Writer/Xls/VisibilityTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Xls/VisibilityTest.php
@@ -79,7 +79,7 @@ class VisibilityTest extends AbstractFunctional
 
         $reloadedSpreadsheet = $this->writeAndReload($spreadsheet, 'Xls');
         foreach ($visibleSheets as $sheetName => $visibility) {
-            $reloadedWorksheet = $reloadedSpreadsheet->getSheetByName($sheetName) ?? new Worksheet();
+            $reloadedWorksheet = $reloadedSpreadsheet->getSheetByNameOrThrow($sheetName);
             self::assertSame($visibility, $reloadedWorksheet->getSheetState());
         }
     }
diff --git a/tests/PhpSpreadsheetTests/Writer/Xlsx/UnparsedDataCloneTest.php b/tests/PhpSpreadsheetTests/Writer/Xlsx/UnparsedDataCloneTest.php
index f9535714..eba7288f 100644
--- a/tests/PhpSpreadsheetTests/Writer/Xlsx/UnparsedDataCloneTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Xlsx/UnparsedDataCloneTest.php
@@ -77,19 +77,15 @@ class UnparsedDataCloneTest extends TestCase
         $reader1 = new \PhpOffice\PhpSpreadsheet\Reader\Xlsx();
         $spreadsheet1 = $reader1->load($resultFilename1);
         unlink($resultFilename1);
-        $sheet1c = $spreadsheet1->getSheetByName('Clone');
-        self::assertNotNull($sheet1c);
-        $sheet1o = $spreadsheet1->getSheetByName('Original');
-        self::assertNotNull($sheet1o);
+        $sheet1c = $spreadsheet1->getSheetByNameOrThrow('Clone');
+        $sheet1o = $spreadsheet1->getSheetByNameOrThrow('Original');
 
         $writer->save($resultFilename2);
         $reader2 = new \PhpOffice\PhpSpreadsheet\Reader\Xlsx();
         $spreadsheet2 = $reader2->load($resultFilename2);
         unlink($resultFilename2);
-        $sheet2c = $spreadsheet2->getSheetByName('Clone');
-        self::assertNotNull($sheet2c);
-        $sheet2o = $spreadsheet2->getSheetByName('Original');
-        self::assertNotNull($sheet2o);
+        $sheet2c = $spreadsheet2->getSheetByNameOrThrow('Clone');
+        $sheet2o = $spreadsheet2->getSheetByNameOrThrow('Original');
 
         self::assertEquals($spreadsheet1->getSheetCount(), $spreadsheet2->getSheetCount());
         self::assertCount(1, $sheet1c->getDrawingCollection());
diff --git a/tests/PhpSpreadsheetTests/Writer/Xlsx/VisibilityTest.php b/tests/PhpSpreadsheetTests/Writer/Xlsx/VisibilityTest.php
index 7e1ca967..ec2534fd 100644
--- a/tests/PhpSpreadsheetTests/Writer/Xlsx/VisibilityTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Xlsx/VisibilityTest.php
@@ -79,7 +79,7 @@ class VisibilityTest extends AbstractFunctional
 
         $reloadedSpreadsheet = $this->writeAndReload($spreadsheet, 'Xlsx');
         foreach ($visibleSheets as $sheetName => $visibility) {
-            $reloadedWorksheet = $reloadedSpreadsheet->getSheetByName($sheetName) ?? new Worksheet();
+            $reloadedWorksheet = $reloadedSpreadsheet->getSheetByNameOrThrow($sheetName);
             self::assertSame($visibility, $reloadedWorksheet->getSheetState());
         }
     }
diff --git a/tests/data/Calculation/Financial/IRR.php b/tests/data/Calculation/Financial/IRR.php
index f6c24c13..5051182a 100644
--- a/tests/data/Calculation/Financial/IRR.php
+++ b/tests/data/Calculation/Financial/IRR.php
@@ -83,4 +83,5 @@ return [
             -21000,
         ],
     ],
+    'no arguments' => ['exception'],
 ];

From 6c1651e9955982186be45f578ce9c94cb61bfce4 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Wed, 14 Sep 2022 09:05:01 -0700
Subject: [PATCH 56/69] Floating-point Equality in Two Tests (#3064)

* Floating-point Equality in Two Tests

Merging a change today, Git reported failures that did not occur during "normal" unit testing. The merge still succeeded, but ... The problem was an error comparing float values for equal, and the inequality occurred beyond the 14th decimal digit. Change the tests in question, which incidentally were not part of the merged changed, to use assertEqualsWithDelta.

* Egad - 112 More Precision-related Problems

Spread across 9 test members.
---
 .../Functions/Engineering/ConvertUoMTest.php           | 10 +++-------
 .../Calculation/Functions/Engineering/ErfCTest.php     |  9 +--------
 .../Functions/Engineering/ErfPreciseTest.php           |  9 +--------
 .../Calculation/Functions/Engineering/ErfTest.php      |  9 +--------
 .../Calculation/Functions/MathTrig/FactTest.php        |  6 ++++--
 .../Calculation/Functions/MathTrig/MUnitTest.php       |  4 +++-
 .../Calculation/Functions/TextData/NumberValueTest.php |  6 ++++--
 .../Cell/AdvancedValueBinderTest.php                   |  4 +++-
 tests/PhpSpreadsheetTests/Reader/Xlsx/XlsxTest.php     | 10 ++++++----
 tests/PhpSpreadsheetTests/Shared/FontTest.php          |  6 ++++--
 .../Shared/Trend/LinearBestFitTest.php                 | 10 ++++++----
 11 files changed, 36 insertions(+), 47 deletions(-)

diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ConvertUoMTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ConvertUoMTest.php
index 9a448824..f15725cb 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ConvertUoMTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ConvertUoMTest.php
@@ -4,15 +4,11 @@ namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Engineering;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Calculation\Engineering;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PHPUnit\Framework\TestCase;
 
 class ConvertUoMTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-    }
+    const UOM_PRECISION = 1E-12;
 
     public function testGetConversionGroups(): void
     {
@@ -52,7 +48,7 @@ class ConvertUoMTest extends TestCase
     public function testCONVERTUOM($expectedResult, ...$args): void
     {
         $result = Engineering::CONVERTUOM(...$args);
-        self::assertEquals($expectedResult, $result);
+        self::assertEqualsWithDelta($expectedResult, $result, self::UOM_PRECISION);
     }
 
     public function providerCONVERTUOM(): array
@@ -69,7 +65,7 @@ class ConvertUoMTest extends TestCase
 
         $formula = "=CONVERT({$value}, {$fromUoM}, {$toUoM})";
         $result = $calculation->_calculateFormulaValue($formula);
-        self::assertEqualsWithDelta($expectedResult, $result, 1.0e-14);
+        self::assertEqualsWithDelta($expectedResult, $result, self::UOM_PRECISION);
     }
 
     public function providerConvertUoMArray(): array
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfCTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfCTest.php
index f0a721c7..88e808ab 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfCTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfCTest.php
@@ -4,18 +4,12 @@ namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Engineering;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Calculation\Engineering;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PHPUnit\Framework\TestCase;
 
 class ErfCTest extends TestCase
 {
     const ERF_PRECISION = 1E-12;
 
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-    }
-
     /**
      * @dataProvider providerERFC
      *
@@ -25,7 +19,6 @@ class ErfCTest extends TestCase
     public function testERFC($expectedResult, $lower): void
     {
         $result = Engineering::ERFC($lower);
-        self::assertEquals($expectedResult, $result);
         self::assertEqualsWithDelta($expectedResult, $result, self::ERF_PRECISION);
     }
 
@@ -43,7 +36,7 @@ class ErfCTest extends TestCase
 
         $formula = "=ERFC({$lower})";
         $result = $calculation->_calculateFormulaValue($formula);
-        self::assertEqualsWithDelta($expectedResult, $result, 1.0e-14);
+        self::assertEqualsWithDelta($expectedResult, $result, self::ERF_PRECISION);
     }
 
     public function providerErfCArray(): array
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfPreciseTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfPreciseTest.php
index dc3ee84c..8a069ff1 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfPreciseTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfPreciseTest.php
@@ -4,18 +4,12 @@ namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Engineering;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Calculation\Engineering;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PHPUnit\Framework\TestCase;
 
 class ErfPreciseTest extends TestCase
 {
     const ERF_PRECISION = 1E-12;
 
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-    }
-
     /**
      * @dataProvider providerERFPRECISE
      *
@@ -25,7 +19,6 @@ class ErfPreciseTest extends TestCase
     public function testERFPRECISE($expectedResult, $limit): void
     {
         $result = Engineering::ERFPRECISE($limit);
-        self::assertEquals($expectedResult, $result);
         self::assertEqualsWithDelta($expectedResult, $result, self::ERF_PRECISION);
     }
 
@@ -43,7 +36,7 @@ class ErfPreciseTest extends TestCase
 
         $formula = "=ERF.PRECISE({$limit})";
         $result = $calculation->_calculateFormulaValue($formula);
-        self::assertEqualsWithDelta($expectedResult, $result, 1.0e-14);
+        self::assertEqualsWithDelta($expectedResult, $result, self::ERF_PRECISION);
     }
 
     public function providerErfPreciseArray(): array
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfTest.php
index 4d13d47d..26e0381c 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Engineering/ErfTest.php
@@ -4,18 +4,12 @@ namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Engineering;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Calculation\Engineering;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PHPUnit\Framework\TestCase;
 
 class ErfTest extends TestCase
 {
     const ERF_PRECISION = 1E-12;
 
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-    }
-
     /**
      * @dataProvider providerERF
      *
@@ -26,7 +20,6 @@ class ErfTest extends TestCase
     public function testERF($expectedResult, $lower, $upper = null): void
     {
         $result = Engineering::ERF($lower, $upper);
-        self::assertEquals($expectedResult, $result);
         self::assertEqualsWithDelta($expectedResult, $result, self::ERF_PRECISION);
     }
 
@@ -44,7 +37,7 @@ class ErfTest extends TestCase
 
         $formula = "=ERF({$lower}, {$upper})";
         $result = $calculation->_calculateFormulaValue($formula);
-        self::assertEqualsWithDelta($expectedResult, $result, 1.0e-14);
+        self::assertEqualsWithDelta($expectedResult, $result, self::ERF_PRECISION);
     }
 
     public function providerErfArray(): array
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/FactTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/FactTest.php
index 328773e0..6bdfa570 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/FactTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/FactTest.php
@@ -6,6 +6,8 @@ use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 
 class FactTest extends AllSetupTeardown
 {
+    const FACT_PRECISION = 1E-12;
+
     /**
      * @dataProvider providerFACT
      *
@@ -53,7 +55,7 @@ class FactTest extends AllSetupTeardown
             $sheet->getCell('B1')->setValue('=FACT(A1)');
         }
         $result = $sheet->getCell('B1')->getCalculatedValue();
-        self::assertEquals($expectedResult, $result);
+        self::assertEqualsWithDelta($expectedResult, $result, self::FACT_PRECISION);
     }
 
     public function providerFACTGnumeric(): array
@@ -70,7 +72,7 @@ class FactTest extends AllSetupTeardown
 
         $formula = "=FACT({$array})";
         $result = $calculation->_calculateFormulaValue($formula);
-        self::assertEqualsWithDelta($expectedResult, $result, 1.0e-14);
+        self::assertEqualsWithDelta($expectedResult, $result, self::FACT_PRECISION);
     }
 
     public function providerFactArray(): array
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/MUnitTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/MUnitTest.php
index 96ebc45b..9ac68ee5 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/MUnitTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/MathTrig/MUnitTest.php
@@ -6,6 +6,8 @@ use PhpOffice\PhpSpreadsheet\Calculation\MathTrig\MatrixFunctions;
 
 class MUnitTest extends AllSetupTeardown
 {
+    const MU_PRECISION = 1.0E-12;
+
     public function testMUNIT(): void
     {
         $identity = MatrixFunctions::identity(3);
@@ -15,7 +17,7 @@ class MUnitTest extends AllSetupTeardown
         self::assertEquals($startArray, $resultArray);
         $inverseArray = MatrixFunctions::inverse($startArray);
         $resultArray = MatrixFunctions::multiply($startArray, $inverseArray);
-        self::assertEquals($identity, $resultArray);
+        self::assertEqualsWithDelta($identity, $resultArray, self::MU_PRECISION);
         self::assertEquals('#VALUE!', MatrixFunctions::identity(0));
         self::assertEquals('#VALUE!', MatrixFunctions::identity(-1));
         self::assertEquals('#VALUE!', MatrixFunctions::identity('X'));
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/NumberValueTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/NumberValueTest.php
index a100695f..1a909932 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/NumberValueTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/NumberValueTest.php
@@ -6,6 +6,8 @@ use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 
 class NumberValueTest extends AllSetupTeardown
 {
+    const NV_PRECISION = 1.0E-8;
+
     /**
      * @dataProvider providerNUMBERVALUE
      *
@@ -34,7 +36,7 @@ class NumberValueTest extends AllSetupTeardown
             $sheet->getCell('B1')->setValue('=NUMBERVALUE(A1, A2, A3)');
         }
         $result = $sheet->getCell('B1')->getCalculatedValue();
-        self::assertEquals($expectedResult, $result);
+        self::assertEqualsWithDelta($expectedResult, $result, self::NV_PRECISION);
     }
 
     public function providerNUMBERVALUE(): array
@@ -51,7 +53,7 @@ class NumberValueTest extends AllSetupTeardown
 
         $formula = "=NumberValue({$argument1}, {$argument2}, {$argument3})";
         $result = $calculation->_calculateFormulaValue($formula);
-        self::assertEqualsWithDelta($expectedResult, $result, 1.0e-14);
+        self::assertEqualsWithDelta($expectedResult, $result, self::NV_PRECISION);
     }
 
     public function providerNumberValueArray(): array
diff --git a/tests/PhpSpreadsheetTests/Cell/AdvancedValueBinderTest.php b/tests/PhpSpreadsheetTests/Cell/AdvancedValueBinderTest.php
index 34ff2121..54f3e0cd 100644
--- a/tests/PhpSpreadsheetTests/Cell/AdvancedValueBinderTest.php
+++ b/tests/PhpSpreadsheetTests/Cell/AdvancedValueBinderTest.php
@@ -11,6 +11,8 @@ use PHPUnit\Framework\TestCase;
 
 class AdvancedValueBinderTest extends TestCase
 {
+    const AVB_PRECISION = 1.0E-8;
+
     /**
      * @var string
      */
@@ -161,7 +163,7 @@ class AdvancedValueBinderTest extends TestCase
         $spreadsheet = new Spreadsheet();
         $sheet = $spreadsheet->getActiveSheet();
         $sheet->getCell('A1')->setValue($value);
-        self::assertEquals($valueBinded, $sheet->getCell('A1')->getValue());
+        self::assertEqualsWithDelta($valueBinded, $sheet->getCell('A1')->getValue(), self::AVB_PRECISION);
         $spreadsheet->disconnectWorksheets();
     }
 
diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/XlsxTest.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/XlsxTest.php
index e1271b9a..6b0ebf67 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xlsx/XlsxTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/XlsxTest.php
@@ -15,6 +15,8 @@ use PHPUnit\Framework\TestCase;
 
 class XlsxTest extends TestCase
 {
+    const XLSX_PRECISION = 1.0E-8;
+
     public function testLoadXlsxRowColumnAttributes(): void
     {
         $filename = 'tests/data/Reader/XLSX/rowColumnAttributeTest.xlsx';
@@ -133,10 +135,10 @@ class XlsxTest extends TestCase
 
         $pageMargins = $worksheet->getPageMargins();
         // Convert from inches to cm for testing
-        self::assertEquals(2.5, $pageMargins->getTop() * 2.54);
-        self::assertEquals(3.3, $pageMargins->getLeft() * 2.54);
-        self::assertEquals(3.3, $pageMargins->getRight() * 2.54);
-        self::assertEquals(1.3, $pageMargins->getHeader() * 2.54);
+        self::assertEqualsWithDelta(2.5, $pageMargins->getTop() * 2.54, self::XLSX_PRECISION);
+        self::assertEqualsWithDelta(3.3, $pageMargins->getLeft() * 2.54, self::XLSX_PRECISION);
+        self::assertEqualsWithDelta(3.3, $pageMargins->getRight() * 2.54, self::XLSX_PRECISION);
+        self::assertEqualsWithDelta(1.3, $pageMargins->getHeader() * 2.54, self::XLSX_PRECISION);
 
         self::assertEquals(PageSetup::PAPERSIZE_A4, $worksheet->getPageSetup()->getPaperSize());
         self::assertEquals(['A10', 'A20', 'A30', 'A40', 'A50'], array_keys($worksheet->getBreaks()));
diff --git a/tests/PhpSpreadsheetTests/Shared/FontTest.php b/tests/PhpSpreadsheetTests/Shared/FontTest.php
index c733f8ee..2d5feb6e 100644
--- a/tests/PhpSpreadsheetTests/Shared/FontTest.php
+++ b/tests/PhpSpreadsheetTests/Shared/FontTest.php
@@ -8,6 +8,8 @@ use PHPUnit\Framework\TestCase;
 
 class FontTest extends TestCase
 {
+    const FONT_PRECISION = 1.0E-12;
+
     public function testGetAutoSizeMethod(): void
     {
         $expectedResult = Font::AUTOSIZE_METHOD_APPROX;
@@ -63,7 +65,7 @@ class FontTest extends TestCase
     public function testInchSizeToPixels($expectedResult, $size): void
     {
         $result = Font::inchSizeToPixels($size);
-        self::assertEquals($expectedResult, $result);
+        self::assertEqualsWithDelta($expectedResult, $result, self::FONT_PRECISION);
     }
 
     public function providerInchSizeToPixels(): array
@@ -80,7 +82,7 @@ class FontTest extends TestCase
     public function testCentimeterSizeToPixels($expectedResult, $size): void
     {
         $result = Font::centimeterSizeToPixels($size);
-        self::assertEquals($expectedResult, $result);
+        self::assertEqualsWithDelta($expectedResult, $result, self::FONT_PRECISION);
     }
 
     public function providerCentimeterSizeToPixels(): array
diff --git a/tests/PhpSpreadsheetTests/Shared/Trend/LinearBestFitTest.php b/tests/PhpSpreadsheetTests/Shared/Trend/LinearBestFitTest.php
index 9ada87a5..34321227 100644
--- a/tests/PhpSpreadsheetTests/Shared/Trend/LinearBestFitTest.php
+++ b/tests/PhpSpreadsheetTests/Shared/Trend/LinearBestFitTest.php
@@ -7,6 +7,8 @@ use PHPUnit\Framework\TestCase;
 
 class LinearBestFitTest extends TestCase
 {
+    const LBF_PRECISION = 1.0E-8;
+
     /**
      * @dataProvider providerLinearBestFit
      *
@@ -27,13 +29,13 @@ class LinearBestFitTest extends TestCase
     ): void {
         $bestFit = new LinearBestFit($yValues, $xValues);
         $slope = $bestFit->getSlope(1);
-        self::assertEquals($expectedSlope[0], $slope);
+        self::assertEqualsWithDelta($expectedSlope[0], $slope, self::LBF_PRECISION);
         $slope = $bestFit->getSlope();
-        self::assertEquals($expectedSlope[1], $slope);
+        self::assertEqualsWithDelta($expectedSlope[1], $slope, self::LBF_PRECISION);
         $intersect = $bestFit->getIntersect(1);
-        self::assertEquals($expectedIntersect[0], $intersect);
+        self::assertEqualsWithDelta($expectedIntersect[0], $intersect, self::LBF_PRECISION);
         $intersect = $bestFit->getIntersect();
-        self::assertEquals($expectedIntersect[1], $intersect);
+        self::assertEqualsWithDelta($expectedIntersect[1], $intersect, self::LBF_PRECISION);
 
         $equation = $bestFit->getEquation(2);
         self::assertEquals($expectedEquation, $equation);

From 8513c6418c61b41eebda73c4b9faaad85dd273bf Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Wed, 14 Sep 2022 10:12:53 -0700
Subject: [PATCH 57/69] Memory Leak in Sample35 (#3062)

* Memory Leak in Sample35

All but 6 chart samples can be rendered by Sample35. Of those 6, 3 of the problems are because the script runs out of memory processing them. Adopting a suggestion from @MAKS-dev in issue #2092, adding a call to gc_collect_cycles after the charts from each spreadsheet is rendered appears to make it possible to include those 3 spreadsheets in Sample35 after all.

Also take advantage of this opportunity to correct a number (hopefully all) of Scrutinizer problems with JpgraphRendererBases.

* Minor Fix

Problem running 8.1 unit tests.

* Resolve Problems with Pie 3D Charts

Minor fix, leaving only one spreadsheet unusable in Sample35. The reasons for its unusability are now documented in the code.

* Mitoteam Made Changes

Discussing this problem with them, they decided they should make a change for Pie3D rather than forcing us to use the workaround pushed earlier. Change to require mitoteam 10.2.3, revert workaround.
---
 composer.json                                 |  2 +-
 composer.lock                                 | 16 ++---
 samples/Chart/35_Chart_render.php             | 13 ++--
 .../Chart/Renderer/JpGraphRendererBase.php    | 61 +++++++------------
 4 files changed, 38 insertions(+), 54 deletions(-)

diff --git a/composer.json b/composer.json
index 6835b05b..a4b033cd 100644
--- a/composer.json
+++ b/composer.json
@@ -81,7 +81,7 @@
         "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
         "dompdf/dompdf": "^1.0 || ^2.0",
         "friendsofphp/php-cs-fixer": "^3.2",
-        "mitoteam/jpgraph": "10.2.2",
+        "mitoteam/jpgraph": "10.2.3",
         "mpdf/mpdf": "8.1.1",
         "phpcompatibility/php-compatibility": "^9.3",
         "phpstan/phpstan": "^1.1",
diff --git a/composer.lock b/composer.lock
index 4097420d..508733ee 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "8512207f173cb137bc2085b7fdf698bc",
+    "content-hash": "b5bdb9f96d18ce59557436521053fdd9",
     "packages": [
         {
             "name": "ezyang/htmlpurifier",
@@ -1342,16 +1342,16 @@
         },
         {
             "name": "mitoteam/jpgraph",
-            "version": "10.2.2",
+            "version": "10.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mitoteam/jpgraph.git",
-                "reference": "6d87fc342afaf8a9a898a3122b5f0f34fc82c4cf"
+                "reference": "21121535537e05c32e7964327b80746462a6057d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mitoteam/jpgraph/zipball/6d87fc342afaf8a9a898a3122b5f0f34fc82c4cf",
-                "reference": "6d87fc342afaf8a9a898a3122b5f0f34fc82c4cf",
+                "url": "https://api.github.com/repos/mitoteam/jpgraph/zipball/21121535537e05c32e7964327b80746462a6057d",
+                "reference": "21121535537e05c32e7964327b80746462a6057d",
                 "shasum": ""
             },
             "require": {
@@ -1375,16 +1375,16 @@
                     "name": "JpGraph team"
                 }
             ],
-            "description": "Composer compatible version of JpGraph library with PHP 8.2 support",
+            "description": "JpGraph library composer package with PHP 8.2 support",
             "homepage": "https://github.com/mitoteam/jpgraph",
             "keywords": [
                 "jpgraph"
             ],
             "support": {
                 "issues": "https://github.com/mitoteam/jpgraph/issues",
-                "source": "https://github.com/mitoteam/jpgraph/tree/10.2.2"
+                "source": "https://github.com/mitoteam/jpgraph/tree/10.2.3"
             },
-            "time": "2022-09-09T08:16:10+00:00"
+            "time": "2022-09-14T04:02:09+00:00"
         },
         {
             "name": "mpdf/mpdf",
diff --git a/samples/Chart/35_Chart_render.php b/samples/Chart/35_Chart_render.php
index 891cd27c..f6dfeb46 100644
--- a/samples/Chart/35_Chart_render.php
+++ b/samples/Chart/35_Chart_render.php
@@ -25,12 +25,10 @@ if (count($inputFileNames) === 1) {
     $unresolvedErrors = [];
 } else {
     $unresolvedErrors = [
+        // The following spreadsheet was created by 3rd party software,
+        // and doesn't include the data that usually accompanies a chart.
+        // That is good enough for Excel, but not for JpGraph.
         '32readwriteBubbleChart2.xlsx',
-        '32readwritePieChart3.xlsx',
-        '32readwritePieChart4.xlsx',
-        '32readwritePieChart3D1.xlsx',
-        '32readwritePieChartExploded1.xlsx',
-        '32readwritePieChartExploded3D1.xlsx',
     ];
 }
 foreach ($inputFileNames as $inputFileName) {
@@ -42,7 +40,9 @@ foreach ($inputFileNames as $inputFileName) {
         continue;
     }
     if (in_array($inputFileNameShort, $unresolvedErrors, true)) {
-        $helper->log('File ' . $inputFileNameShort . ' does not yet work with this script');
+        $helper->log('*****');
+        $helper->log('***** File ' . $inputFileNameShort . ' does not yet work with this script');
+        $helper->log('*****');
 
         continue;
     }
@@ -92,6 +92,7 @@ foreach ($inputFileNames as $inputFileName) {
 
     $spreadsheet->disconnectWorksheets();
     unset($spreadsheet);
+    gc_collect_cycles();
 }
 
 $helper->log('Done rendering charts as images');
diff --git a/src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php b/src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php
index d31a55b3..cb9b544b 100644
--- a/src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php
+++ b/src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php
@@ -102,13 +102,11 @@ abstract class JpGraphRendererBase implements IRenderer
         return $seriesPlot;
     }
 
-    private function formatDataSetLabels($groupID, $datasetLabels, $labelCount, $rotation = '')
+    private function formatDataSetLabels($groupID, $datasetLabels, $rotation = '')
     {
-        $datasetLabelFormatCode = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getFormatCode();
-        if ($datasetLabelFormatCode !== null) {
-            //    Retrieve any label formatting code
-            $datasetLabelFormatCode = stripslashes($datasetLabelFormatCode);
-        }
+        $datasetLabelFormatCode = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getFormatCode() ?? '';
+        //    Retrieve any label formatting code
+        $datasetLabelFormatCode = stripslashes($datasetLabelFormatCode);
 
         $testCurrentIndex = 0;
         foreach ($datasetLabels as $i => $datasetLabel) {
@@ -273,7 +271,7 @@ abstract class JpGraphRendererBase implements IRenderer
         $this->renderTitle();
     }
 
-    private function renderPlotLine($groupID, $filled = false, $combination = false, $dimensions = '2d'): void
+    private function renderPlotLine($groupID, $filled = false, $combination = false): void
     {
         $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
 
@@ -281,7 +279,7 @@ abstract class JpGraphRendererBase implements IRenderer
         $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($index)->getPointCount();
         if ($labelCount > 0) {
             $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
-            $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels, $labelCount);
+            $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels);
             $this->graph->xaxis->SetTickLabels($datasetLabels);
         }
 
@@ -353,7 +351,7 @@ abstract class JpGraphRendererBase implements IRenderer
         $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($index)->getPointCount();
         if ($labelCount > 0) {
             $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
-            $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels, $labelCount, $rotation);
+            $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels, $rotation);
             //    Rotate for bar rather than column chart
             if ($rotation == 'bar') {
                 $datasetLabels = array_reverse($datasetLabels);
@@ -430,11 +428,9 @@ abstract class JpGraphRendererBase implements IRenderer
 
     private function renderPlotScatter($groupID, $bubble): void
     {
-        $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
         $scatterStyle = $bubbleSize = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
 
         $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-        $seriesPlots = [];
 
         //    Loop through each data series in turn
         for ($i = 0; $i < $seriesCount; ++$i) {
@@ -478,7 +474,6 @@ abstract class JpGraphRendererBase implements IRenderer
         $radarStyle = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
 
         $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-        $seriesPlots = [];
 
         //    Loop through each data series in turn
         for ($i = 0; $i < $seriesCount; ++$i) {
@@ -513,15 +508,11 @@ abstract class JpGraphRendererBase implements IRenderer
 
     private function renderPlotContour($groupID): void
     {
-        $contourStyle = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
-
         $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-        $seriesPlots = [];
 
         $dataValues = [];
         //    Loop through each data series in turn
         for ($i = 0; $i < $seriesCount; ++$i) {
-            $dataValuesY = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex($i)->getDataValues();
             $dataValuesX = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getDataValues();
 
             $dataValues[$i] = $dataValuesX;
@@ -565,7 +556,7 @@ abstract class JpGraphRendererBase implements IRenderer
         $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount();
         if ($labelCount > 0) {
             $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
-            $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels, $labelCount);
+            $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels);
             $this->graph->xaxis->SetTickLabels($datasetLabels);
         }
 
@@ -575,21 +566,21 @@ abstract class JpGraphRendererBase implements IRenderer
         $this->graph->Add($seriesPlot);
     }
 
-    private function renderAreaChart($groupCount, $dimensions = '2d'): void
+    private function renderAreaChart($groupCount): void
     {
         $this->renderCartesianPlotArea();
 
         for ($i = 0; $i < $groupCount; ++$i) {
-            $this->renderPlotLine($i, true, false, $dimensions);
+            $this->renderPlotLine($i, true, false);
         }
     }
 
-    private function renderLineChart($groupCount, $dimensions = '2d'): void
+    private function renderLineChart($groupCount): void
     {
         $this->renderCartesianPlotArea();
 
         for ($i = 0; $i < $groupCount; ++$i) {
-            $this->renderPlotLine($i, false, false, $dimensions);
+            $this->renderPlotLine($i, false, false);
         }
     }
 
@@ -626,19 +617,17 @@ abstract class JpGraphRendererBase implements IRenderer
 
         $iLimit = ($multiplePlots) ? $groupCount : 1;
         for ($groupID = 0; $groupID < $iLimit; ++$groupID) {
-            $grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
             $exploded = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotStyle();
             $datasetLabels = [];
             if ($groupID == 0) {
                 $labelCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex(0)->getPointCount();
                 if ($labelCount > 0) {
                     $datasetLabels = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotCategoryByIndex(0)->getDataValues();
-                    $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels, $labelCount);
+                    $datasetLabels = $this->formatDataSetLabels($groupID, $datasetLabels);
                 }
             }
 
             $seriesCount = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotSeriesCount();
-            $seriesPlots = [];
             //    For pie charts, we only display the first series: doughnut charts generally display all series
             $jLimit = ($multiplePlots) ? $seriesCount : 1;
             //    Loop through each data series in turn
@@ -669,7 +658,7 @@ abstract class JpGraphRendererBase implements IRenderer
                     $seriesPlot->SetSize(($jLimit - $j) / ($jLimit * 4));
                 }
 
-                if ($doughnut) {
+                if ($doughnut && method_exists($seriesPlot, 'SetMidColor')) {
                     $seriesPlot->SetMidColor('white');
                 }
 
@@ -710,7 +699,7 @@ abstract class JpGraphRendererBase implements IRenderer
         }
     }
 
-    private function renderContourChart($groupCount, $dimensions): void
+    private function renderContourChart($groupCount): void
     {
         $this->renderCartesianPlotArea('intint');
 
@@ -719,7 +708,7 @@ abstract class JpGraphRendererBase implements IRenderer
         }
     }
 
-    private function renderCombinationChart($groupCount, $dimensions, $outputDestination)
+    private function renderCombinationChart($groupCount, $outputDestination)
     {
         $this->renderCartesianPlotArea();
 
@@ -728,10 +717,8 @@ abstract class JpGraphRendererBase implements IRenderer
             $chartType = $this->chart->getPlotArea()->getPlotGroupByIndex($i)->getPlotType();
             switch ($chartType) {
                 case 'area3DChart':
-                    $dimensions = '3d';
-                    // no break
                 case 'areaChart':
-                    $this->renderPlotLine($i, true, true, $dimensions);
+                    $this->renderPlotLine($i, true, true);
 
                     break;
                 case 'bar3DChart':
@@ -742,10 +729,8 @@ abstract class JpGraphRendererBase implements IRenderer
 
                     break;
                 case 'line3DChart':
-                    $dimensions = '3d';
-                    // no break
                 case 'lineChart':
-                    $this->renderPlotLine($i, false, true, $dimensions);
+                    $this->renderPlotLine($i, false, true);
 
                     break;
                 case 'scatterChart':
@@ -792,7 +777,7 @@ abstract class JpGraphRendererBase implements IRenderer
 
                 return false;
             } else {
-                return $this->renderCombinationChart($groupCount, $dimensions, $outputDestination);
+                return $this->renderCombinationChart($groupCount, $outputDestination);
             }
         }
 
@@ -801,7 +786,7 @@ abstract class JpGraphRendererBase implements IRenderer
                 $dimensions = '3d';
                 // no break
             case 'areaChart':
-                $this->renderAreaChart($groupCount, $dimensions);
+                $this->renderAreaChart($groupCount);
 
                 break;
             case 'bar3DChart':
@@ -815,7 +800,7 @@ abstract class JpGraphRendererBase implements IRenderer
                 $dimensions = '3d';
                 // no break
             case 'lineChart':
-                $this->renderLineChart($groupCount, $dimensions);
+                $this->renderLineChart($groupCount);
 
                 break;
             case 'pie3DChart':
@@ -845,10 +830,8 @@ abstract class JpGraphRendererBase implements IRenderer
 
                 break;
             case 'surface3DChart':
-                $dimensions = '3d';
-                // no break
             case 'surfaceChart':
-                $this->renderContourChart($groupCount, $dimensions);
+                $this->renderContourChart($groupCount);
 
                 break;
             case 'stockChart':

From 8ecf69a5c4469111ed5adb58421e442f5eadfdbe Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Thu, 15 Sep 2022 21:07:31 +0200
Subject: [PATCH 58/69] Handle additional merge options like those provide in
 OpenOffice or LibreOffice to hide cell values in a merge range rather than
 empty them, or to merge the values as well as the cells This includes reading
 hidden values in merge ranges, so that Unmerging can restore their visibility

---
 CHANGELOG.md                                  |   6 +-
 .../images/12-01-MergeCells-Options-2.png     | Bin 0 -> 3313 bytes
 .../images/12-01-MergeCells-Options-3.png     | Bin 0 -> 5029 bytes
 .../images/12-01-MergeCells-Options.png       | Bin 0 -> 22477 bytes
 docs/topics/recipes.md                        |  60 ++++++-
 src/PhpSpreadsheet/Reader/Gnumeric.php        |   2 +-
 src/PhpSpreadsheet/Reader/Ods.php             |   3 +-
 src/PhpSpreadsheet/Reader/Xls.php             |   2 +-
 src/PhpSpreadsheet/Reader/Xlsx.php            |   2 +-
 src/PhpSpreadsheet/Reader/Xml.php             |   3 +-
 src/PhpSpreadsheet/Worksheet/Worksheet.php    |  76 ++++++--
 .../Worksheet/MergeBehaviourTest.php          | 166 ++++++++++++++++++
 12 files changed, 291 insertions(+), 29 deletions(-)
 create mode 100644 docs/topics/images/12-01-MergeCells-Options-2.png
 create mode 100644 docs/topics/images/12-01-MergeCells-Options-3.png
 create mode 100644 docs/topics/images/12-01-MergeCells-Options.png
 create mode 100644 tests/PhpSpreadsheetTests/Worksheet/MergeBehaviourTest.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc17d852..f15e9d5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,7 +17,11 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Changed
 
-- Nothing
+- Allow variant behaviour when merging cells [Issue #3065](https://github.com/PHPOffice/PhpSpreadsheet/issues/3065)
+  - Merge methods now allow an additional `$behaviour` argument. Permitted values are:
+    - Worksheet::MERGE_CELL_CONTENT_EMPTY - Empty the content of the hidden cells (the default behaviour)
+    - Worksheet::MERGE_CELL_CONTENT_HIDE - Keep the content of the hidden cells
+    - Worksheet::MERGE_CELL_CONTENT_MERGE - Move the content of the hidden cells into the first cell
 
 ### Deprecated
 
diff --git a/docs/topics/images/12-01-MergeCells-Options-2.png b/docs/topics/images/12-01-MergeCells-Options-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e745fc934dc88c114b39dc1a45a48ddd88ad0aa
GIT binary patch
literal 3313
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

literal 0
HcmV?d00001

diff --git a/docs/topics/images/12-01-MergeCells-Options-3.png b/docs/topics/images/12-01-MergeCells-Options-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..30ad346eac43344b9200a9c49928209a71663e35
GIT binary patch
literal 5029
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

literal 0
HcmV?d00001

diff --git a/docs/topics/images/12-01-MergeCells-Options.png b/docs/topics/images/12-01-MergeCells-Options.png
new file mode 100644
index 0000000000000000000000000000000000000000..34c8f5e3e6c54a021b8fc11de86ba5d3ba4e81b7
GIT binary patch
literal 22477
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
Qf|tw0@Tft#zFXY?0K=D0BLDyZ

literal 0
HcmV?d00001

diff --git a/docs/topics/recipes.md b/docs/topics/recipes.md
index afa3dcc8..04a4e6aa 100644
--- a/docs/topics/recipes.md
+++ b/docs/topics/recipes.md
@@ -1332,22 +1332,72 @@ rows (default), or above. The following code adds the summary above:
 $spreadsheet->getActiveSheet()->setShowSummaryBelow(false);
 ```
 
-## Merge/unmerge cells
+## Merge/Unmerge cells
 
-If you have a big piece of data you want to display in a worksheet, you
-can merge two or more cells together, to become one cell. This can be
-done using the following code:
+If you have a big piece of data you want to display in a worksheet, or a
+heading that needs to span multiple sub-heading columns, you can merge
+two or more cells together, to become one cell. This can be done using
+the following code:
 
 ```php
 $spreadsheet->getActiveSheet()->mergeCells('A18:E22');
 ```
 
-Removing a merge can be done using the unmergeCells method:
+Removing a merge can be done using the `unmergeCells()` method:
 
 ```php
 $spreadsheet->getActiveSheet()->unmergeCells('A18:E22');
 ```
 
+MS Excel itself doesn't yet offer the functionality to simply hide the merged cells, or to merge the content of cells into a single cell, but it is available in Open/Libre Office.
+
+### Merge with MERGE_CELL_CONTENT_EMPTY
+
+The default behaviour is to empty all cells except for the top-left corner cell in the merge range; and this is also the default behaviour for the `mergeCells()` method in PhpSpreadsheet.
+When this behaviour is applied, those cell values will be set to null; and if they are subsequently Unmerged, they will be empty cells.
+
+Passing an extra flag value to the `mergeCells()` method in PhpSpreadsheet can change this behaviour.
+
+![12-01-MergeCells-Options.png](./images/12-01-MergeCells-Options.png)
+
+Possible flag values are:
+- Worksheet::MERGE_CELL_CONTENT_EMPTY (the default)
+- Worksheet::MERGE_CELL_CONTENT_HIDE
+- Worksheet::MERGE_CELL_CONTENT_MERGE
+
+### Merge with MERGE_CELL_CONTENT_HIDE
+
+The first alternative, available only in OpenOffice, is to hide those cells, but to leave their content intact.
+When a file saved as `Xlsx` in those applications is opened in MS Excel, and those cells are unmerged, the original content will still be present.
+
+```php
+$spreadsheet->getActiveSheet()->mergeCells('A1:C3', Worksheet::MERGE_CELL_CONTENT_HIDE);
+```
+
+Will replicate that behaviour.
+
+### Merge with MERGE_CELL_CONTENT_MERGE
+
+The second alternative, available in both OpenOffice and LibreOffice is to merge the content of every cell in the merge range into the top-left cell, while setting those hidden cells to empty.
+
+```php
+$spreadsheet->getActiveSheet()->mergeCells('A1:C3', Worksheet::MERGE_CELL_CONTENT_MERGE);
+```
+
+Particularly when the merged cells contain formulae, the logic for this merge seems strange:
+walking through the merge range, each cell is calculated in turn, and appended to the "master" cell, then it is emptied, so any subsequent calculations that reference the cell see an empty cell, not the pre-merge value. 
+For example, suppose our spreadsheet contains
+
+![12-01-MergeCells-Options-2.png](./images/12-01-MergeCells-Options-2.png)
+
+where `B2` is the formula `=5-B1` and `C2` is the formula `=A2/B2`,
+and we want to merge cells `A2` to `C2` with all the cell values merged.
+The result is:
+
+![12-01-MergeCells-Options-3.png](./images/12-01-MergeCells-Options-3.png)
+
+The cell value `12` from cell `A2` is fixed; the value from `B2` is the result of the formula `=5-B1` (`4`, which is appended to our merged value), and cell `B2` is then emptied, so when we evaluate cell `C2` with the formula `=A2/B2` it gives us `12 / 0` which results in a `#DIV/0!` error (so the error `#DIV/0!` is appended to our merged value rather than the original calculation result of `3`).
+
 ## Inserting or Removing rows/columns
 
 You can insert/remove rows/columns at a specific position. The following
diff --git a/src/PhpSpreadsheet/Reader/Gnumeric.php b/src/PhpSpreadsheet/Reader/Gnumeric.php
index ca087e61..1dcb0a12 100644
--- a/src/PhpSpreadsheet/Reader/Gnumeric.php
+++ b/src/PhpSpreadsheet/Reader/Gnumeric.php
@@ -363,7 +363,7 @@ class Gnumeric extends BaseReader
         if ($sheet !== null && isset($sheet->MergedRegions)) {
             foreach ($sheet->MergedRegions->Merge as $mergeCells) {
                 if (strpos((string) $mergeCells, ':') !== false) {
-                    $this->spreadsheet->getActiveSheet()->mergeCells($mergeCells);
+                    $this->spreadsheet->getActiveSheet()->mergeCells($mergeCells, Worksheet::MERGE_CELL_CONTENT_HIDE);
                 }
             }
         }
diff --git a/src/PhpSpreadsheet/Reader/Ods.php b/src/PhpSpreadsheet/Reader/Ods.php
index 7e776ab7..e3de4731 100644
--- a/src/PhpSpreadsheet/Reader/Ods.php
+++ b/src/PhpSpreadsheet/Reader/Ods.php
@@ -20,6 +20,7 @@ use PhpOffice\PhpSpreadsheet\Shared\Date;
 use PhpOffice\PhpSpreadsheet\Shared\File;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use Throwable;
 use XMLReader;
 use ZipArchive;
@@ -759,7 +760,7 @@ class Ods extends BaseReader
                 }
 
                 $cellRange = $columnID . $rowID . ':' . $columnTo . $rowTo;
-                $spreadsheet->getActiveSheet()->mergeCells($cellRange);
+                $spreadsheet->getActiveSheet()->mergeCells($cellRange, Worksheet::MERGE_CELL_CONTENT_HIDE);
             }
         }
     }
diff --git a/src/PhpSpreadsheet/Reader/Xls.php b/src/PhpSpreadsheet/Reader/Xls.php
index 71496ece..a8de5228 100644
--- a/src/PhpSpreadsheet/Reader/Xls.php
+++ b/src/PhpSpreadsheet/Reader/Xls.php
@@ -4585,7 +4585,7 @@ class Xls extends BaseReader
                     (strpos($cellRangeAddress, ':') !== false) &&
                     ($this->includeCellRangeFiltered($cellRangeAddress))
                 ) {
-                    $this->phpSheet->mergeCells($cellRangeAddress);
+                    $this->phpSheet->mergeCells($cellRangeAddress, Worksheet::MERGE_CELL_CONTENT_HIDE);
                 }
             }
         }
diff --git a/src/PhpSpreadsheet/Reader/Xlsx.php b/src/PhpSpreadsheet/Reader/Xlsx.php
index fc38375a..26cd1af3 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx.php
@@ -914,7 +914,7 @@ class Xlsx extends BaseReader
                                 foreach ($xmlSheet->mergeCells->mergeCell as $mergeCell) {
                                     $mergeRef = (string) $mergeCell['ref'];
                                     if (strpos($mergeRef, ':') !== false) {
-                                        $docSheet->mergeCells((string) $mergeCell['ref']);
+                                        $docSheet->mergeCells((string) $mergeCell['ref'], Worksheet::MERGE_CELL_CONTENT_HIDE);
                                     }
                                 }
                             }
diff --git a/src/PhpSpreadsheet/Reader/Xml.php b/src/PhpSpreadsheet/Reader/Xml.php
index 0b5e0966..d8f0d9dc 100644
--- a/src/PhpSpreadsheet/Reader/Xml.php
+++ b/src/PhpSpreadsheet/Reader/Xml.php
@@ -18,6 +18,7 @@ use PhpOffice\PhpSpreadsheet\Shared\Date;
 use PhpOffice\PhpSpreadsheet\Shared\File;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use SimpleXMLElement;
 
 /**
@@ -364,7 +365,7 @@ class Xml extends BaseReader
                                 $rowTo = $rowTo + $cell_ss['MergeDown'];
                             }
                             $cellRange .= ':' . $columnTo . $rowTo;
-                            $spreadsheet->getActiveSheet()->mergeCells($cellRange);
+                            $spreadsheet->getActiveSheet()->mergeCells($cellRange, Worksheet::MERGE_CELL_CONTENT_HIDE);
                         }
 
                         $hasCalculatedValue = false;
diff --git a/src/PhpSpreadsheet/Worksheet/Worksheet.php b/src/PhpSpreadsheet/Worksheet/Worksheet.php
index d13d4141..55327932 100644
--- a/src/PhpSpreadsheet/Worksheet/Worksheet.php
+++ b/src/PhpSpreadsheet/Worksheet/Worksheet.php
@@ -41,6 +41,10 @@ class Worksheet implements IComparable
     public const SHEETSTATE_HIDDEN = 'hidden';
     public const SHEETSTATE_VERYHIDDEN = 'veryHidden';
 
+    public const MERGE_CELL_CONTENT_EMPTY = 'empty';
+    public const MERGE_CELL_CONTENT_HIDE = 'hide';
+    public const MERGE_CELL_CONTENT_MERGE = 'merge';
+
     protected const SHEET_NAME_REQUIRES_NO_QUOTES = '/^[_\p{L}][_\p{L}\p{N}]*$/mui';
 
     /**
@@ -1758,10 +1762,15 @@ class Worksheet implements IComparable
      * @param AddressRange|array<int>|string $range A simple string containing a Cell range like 'A1:E10'
      *              or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
      *              or an AddressRange.
+     * @param string $behaviour How the merged cells should behave.
+     *               Possible values are:
+     *                   MERGE_CELL_CONTENT_EMPTY - Empty the content of the hidden cells
+     *                   MERGE_CELL_CONTENT_HIDE - Keep the content of the hidden cells
+     *                   MERGE_CELL_CONTENT_MERGE - Move the content of the hidden cells into the first cell
      *
      * @return $this
      */
-    public function mergeCells($range)
+    public function mergeCells($range, $behaviour = self::MERGE_CELL_CONTENT_EMPTY)
     {
         $range = Functions::trimSheetFromCellReference(Validations::validateCellRange($range));
 
@@ -1793,18 +1802,22 @@ class Worksheet implements IComparable
             $this->getCell($upperLeft)->setValueExplicit(null, DataType::TYPE_NULL);
         }
 
-        // Blank out the rest of the cells in the range (if they exist)
-        if ($numberRows > $numberColumns) {
-            $this->clearMergeCellsByColumn($firstColumn, $lastColumn, $firstRow, $lastRow, $upperLeft);
-        } else {
-            $this->clearMergeCellsByRow($firstColumn, $lastColumnIndex, $firstRow, $lastRow, $upperLeft);
+        if ($behaviour !== self::MERGE_CELL_CONTENT_HIDE) {
+            // Blank out the rest of the cells in the range (if they exist)
+            if ($numberRows > $numberColumns) {
+                $this->clearMergeCellsByColumn($firstColumn, $lastColumn, $firstRow, $lastRow, $upperLeft, $behaviour);
+            } else {
+                $this->clearMergeCellsByRow($firstColumn, $lastColumnIndex, $firstRow, $lastRow, $upperLeft, $behaviour);
+            }
         }
 
         return $this;
     }
 
-    private function clearMergeCellsByColumn(string $firstColumn, string $lastColumn, int $firstRow, int $lastRow, string $upperLeft): void
+    private function clearMergeCellsByColumn(string $firstColumn, string $lastColumn, int $firstRow, int $lastRow, string $upperLeft, string $behaviour): void
     {
+        $leftCellValue = [$this->getCell($upperLeft)->getFormattedValue()];
+
         foreach ($this->getColumnIterator($firstColumn, $lastColumn) as $column) {
             $iterator = $column->getCellIterator($firstRow);
             $iterator->setIterateOnlyExistingCells(true);
@@ -1814,17 +1827,21 @@ class Worksheet implements IComparable
                     if ($row > $lastRow) {
                         break;
                     }
-                    $thisCell = $cell->getColumn() . $row;
-                    if ($upperLeft !== $thisCell) {
-                        $cell->setValueExplicit(null, DataType::TYPE_NULL);
-                    }
+                    $leftCellValue = $this->mergeCellBehaviour($cell, $upperLeft, $behaviour, $leftCellValue);
                 }
             }
         }
+
+        $leftCellValue = implode(' ', $leftCellValue);
+        if ($behaviour === self::MERGE_CELL_CONTENT_MERGE) {
+            $this->getCell($upperLeft)->setValueExplicit($leftCellValue, DataType::TYPE_STRING);
+        }
     }
 
-    private function clearMergeCellsByRow(string $firstColumn, int $lastColumnIndex, int $firstRow, int $lastRow, string $upperLeft): void
+    private function clearMergeCellsByRow(string $firstColumn, int $lastColumnIndex, int $firstRow, int $lastRow, string $upperLeft, string $behaviour): void
     {
+        $leftCellValue = [$this->getCell($upperLeft)->getFormattedValue()];
+
         foreach ($this->getRowIterator($firstRow, $lastRow) as $row) {
             $iterator = $row->getCellIterator($firstColumn);
             $iterator->setIterateOnlyExistingCells(true);
@@ -1835,13 +1852,31 @@ class Worksheet implements IComparable
                     if ($columnIndex > $lastColumnIndex) {
                         break;
                     }
-                    $thisCell = $column . $cell->getRow();
-                    if ($upperLeft !== $thisCell) {
-                        $cell->setValueExplicit(null, DataType::TYPE_NULL);
-                    }
+                    $leftCellValue = $this->mergeCellBehaviour($cell, $upperLeft, $behaviour, $leftCellValue);
                 }
             }
         }
+
+        $leftCellValue = implode(' ', $leftCellValue);
+        if ($behaviour === self::MERGE_CELL_CONTENT_MERGE) {
+            $this->getCell($upperLeft)->setValueExplicit($leftCellValue, DataType::TYPE_STRING);
+        }
+    }
+
+    public function mergeCellBehaviour(Cell $cell, string $upperLeft, string $behaviour, array $leftCellValue): array
+    {
+        if ($cell->getCoordinate() !== $upperLeft) {
+            Calculation::getInstance($cell->getWorksheet()->getParent())->flushInstance();
+            if ($behaviour === self::MERGE_CELL_CONTENT_MERGE) {
+                $cellValue = $cell->getFormattedValue();
+                if ($cellValue !== '') {
+                    $leftCellValue[] = $cellValue;
+                }
+            }
+            $cell->setValueExplicit(null, DataType::TYPE_NULL);
+        }
+
+        return $leftCellValue;
     }
 
     /**
@@ -1856,17 +1891,22 @@ class Worksheet implements IComparable
      * @param int $row1 Numeric row coordinate of the first cell
      * @param int $columnIndex2 Numeric column coordinate of the last cell
      * @param int $row2 Numeric row coordinate of the last cell
+     * @param string $behaviour How the merged cells should behave.
+     *               Possible values are:
+     *                   MERGE_CELL_CONTENT_EMPTY - Empty the content of the hidden cells
+     *                   MERGE_CELL_CONTENT_HIDE - Keep the content of the hidden cells
+     *                   MERGE_CELL_CONTENT_MERGE - Move the content of the hidden cells into the first cell
      *
      * @return $this
      */
-    public function mergeCellsByColumnAndRow($columnIndex1, $row1, $columnIndex2, $row2)
+    public function mergeCellsByColumnAndRow($columnIndex1, $row1, $columnIndex2, $row2, $behaviour = self::MERGE_CELL_CONTENT_EMPTY)
     {
         $cellRange = new CellRange(
             CellAddress::fromColumnAndRow($columnIndex1, $row1),
             CellAddress::fromColumnAndRow($columnIndex2, $row2)
         );
 
-        return $this->mergeCells($cellRange);
+        return $this->mergeCells($cellRange, $behaviour);
     }
 
     /**
diff --git a/tests/PhpSpreadsheetTests/Worksheet/MergeBehaviourTest.php b/tests/PhpSpreadsheetTests/Worksheet/MergeBehaviourTest.php
new file mode 100644
index 00000000..68c9d87a
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Worksheet/MergeBehaviourTest.php
@@ -0,0 +1,166 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Worksheet;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use PhpOffice\PhpSpreadsheetTests\Functional\AbstractFunctional;
+
+class MergeBehaviourTest extends AbstractFunctional
+{
+    /**
+     * @var array
+     */
+    private $testDataRaw = [
+        [1.1, 2.2, '=ROUND(A1+B1, 1)'],
+        [4.4, 5.5, '=ROUND(A2+B2, 1)'],
+        ['=ROUND(A1+A2, 1)', '=ROUND(B1+B2, 1)', '=ROUND(A3+B3, 1)'],
+    ];
+
+    /**
+     * @var array
+     */
+    private $testDataFormatted = [
+        ['=DATE(1960, 12, 19)', '=DATE(2022, 09, 15)'],
+    ];
+
+    public function testMergeCellsDefaultBehaviour(): void
+    {
+        $expectedResult = [
+            [1.1, null, null],
+            [null, null, null],
+            [null, null, null],
+        ];
+
+        $mergeRange = 'A1:C3';
+        $spreadsheet = new Spreadsheet();
+        $worksheet = $spreadsheet->getActiveSheet();
+        $worksheet->fromArray($this->testDataRaw, null, 'A1', true);
+        $worksheet->mergeCells($mergeRange);
+
+        $mergeResult = $worksheet->toArray(null, true, true, false);
+        self::assertSame($expectedResult, $mergeResult);
+    }
+
+    public function testMergeCellsDefaultBehaviourFormatted(): void
+    {
+        $expectedResult = [
+            ['1960-12-19', null],
+        ];
+
+        $mergeRange = 'A1:B1';
+        $spreadsheet = new Spreadsheet();
+        $worksheet = $spreadsheet->getActiveSheet();
+        $worksheet->fromArray($this->testDataFormatted, null, 'A1', true);
+        $worksheet->getStyle($mergeRange)->getNumberFormat()->setFormatCode('yyyy-mm-dd');
+        $worksheet->mergeCells($mergeRange);
+
+        $mergeResult = $worksheet->toArray(null, true, true, false);
+        self::assertSame($expectedResult, $mergeResult);
+    }
+
+    public function testMergeCellsHideBehaviour(): void
+    {
+        $expectedResult = [
+            [1.1, 2.2, 3.3],
+            [4.4, 5.5, 9.9],
+            [5.5, 7.7, 13.2],
+        ];
+
+        $mergeRange = 'A1:C3';
+        $spreadsheet = new Spreadsheet();
+        $worksheet = $spreadsheet->getActiveSheet();
+        $worksheet->fromArray($this->testDataRaw, null, 'A1', true);
+        $worksheet->mergeCells($mergeRange, Worksheet::MERGE_CELL_CONTENT_HIDE);
+
+        $mergeResult = $worksheet->toArray(null, true, true, false);
+        self::assertSame($expectedResult, $mergeResult);
+    }
+
+    public function testMergeCellsHideBehaviourFormatted(): void
+    {
+        $expectedResult = [
+            ['1960-12-19', '2022-09-15'],
+        ];
+
+        $mergeRange = 'A1:B1';
+        $spreadsheet = new Spreadsheet();
+        $worksheet = $spreadsheet->getActiveSheet();
+        $worksheet->fromArray($this->testDataFormatted, null, 'A1', true);
+        $worksheet->getStyle($mergeRange)->getNumberFormat()->setFormatCode('yyyy-mm-dd');
+        $worksheet->mergeCells($mergeRange, Worksheet::MERGE_CELL_CONTENT_HIDE);
+
+        $mergeResult = $worksheet->toArray(null, true, true, false);
+        self::assertSame($expectedResult, $mergeResult);
+    }
+
+    /**
+     * @dataProvider mergeCellsMergeBehaviourProvider
+     */
+    public function testMergeCellsMergeBehaviour(array $testData, string $mergeRange, array $expectedResult): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $worksheet = $spreadsheet->getActiveSheet();
+        $worksheet->fromArray($testData, null, 'A1', true);
+        // Force a precalculation to populate the calculation cache, so that we can verify that it is being cleared
+        $worksheet->toArray();
+        $worksheet->mergeCells($mergeRange, Worksheet::MERGE_CELL_CONTENT_MERGE);
+
+        $mergeResult = $worksheet->toArray(null, true, true, false);
+        self::assertSame($expectedResult, $mergeResult);
+    }
+
+    public function mergeCellsMergeBehaviourProvider(): array
+    {
+        return [
+            'With Calculated Values' => [
+                $this->testDataRaw,
+                'A1:C3',
+                [
+                    ['1.1 2.2 1.1 4.4 5.5 0 1.1 0 0', null, null],
+                    [null, null, null],
+                    [null, null, null],
+                ],
+            ],
+            'With Empty Cells' => [
+                [
+                    [1, '', 2],
+                    [null, 3, null],
+                    [4, null, 5],
+                ],
+                'A1:C3',
+                [
+                    ['1 2 3 4 5', null, null],
+                    [null, null, null],
+                    [null, null, null],
+                ],
+            ],
+            [
+                [
+                    [12, '=5+1', '=A1/A2'],
+                ],
+                'A1:C1',
+                [
+                    ['12 6 #DIV/0!', null, null],
+                ],
+            ],
+        ];
+    }
+
+    public function testMergeCellsMergeBehaviourFormatted(): void
+    {
+        $expectedResult = [
+            ['1960-12-19 2022-09-15', null],
+        ];
+
+        $mergeRange = 'A1:B1';
+        $spreadsheet = new Spreadsheet();
+        $worksheet = $spreadsheet->getActiveSheet();
+        $worksheet->fromArray($this->testDataFormatted, null, 'A1', true);
+        $worksheet->getStyle($mergeRange)->getNumberFormat()->setFormatCode('yyyy-mm-dd');
+        $worksheet->mergeCells($mergeRange, Worksheet::MERGE_CELL_CONTENT_MERGE);
+
+        $mergeResult = $worksheet->toArray(null, true, true, false);
+        self::assertSame($expectedResult, $mergeResult);
+    }
+}

From 84d6d983482adfc094cca24087cac454244c2d11 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Fri, 16 Sep 2022 01:55:36 +0200
Subject: [PATCH 59/69] Unit tests for correctly handling hidden merged cells
 in Readers

---
 .../Reader/Ods/HiddenMergeCellsTest.php       |  48 ++++++++++++++++++
 .../Reader/Xls/HiddenMergeCellsTest.php       |  48 ++++++++++++++++++
 .../Reader/Xlsx/HiddenMergeCellsTest.php      |  48 ++++++++++++++++++
 .../data/Reader/Ods/HiddenMergeCellsTest.ods  | Bin 0 -> 8045 bytes
 .../data/Reader/XLS/HiddenMergeCellsTest.xls  | Bin 0 -> 5632 bytes
 .../Reader/XLSX/HiddenMergeCellsTest.xlsx     | Bin 0 -> 4576 bytes
 6 files changed, 144 insertions(+)
 create mode 100644 tests/PhpSpreadsheetTests/Reader/Ods/HiddenMergeCellsTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Reader/Xls/HiddenMergeCellsTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Reader/Xlsx/HiddenMergeCellsTest.php
 create mode 100644 tests/data/Reader/Ods/HiddenMergeCellsTest.ods
 create mode 100644 tests/data/Reader/XLS/HiddenMergeCellsTest.xls
 create mode 100644 tests/data/Reader/XLSX/HiddenMergeCellsTest.xlsx

diff --git a/tests/PhpSpreadsheetTests/Reader/Ods/HiddenMergeCellsTest.php b/tests/PhpSpreadsheetTests/Reader/Ods/HiddenMergeCellsTest.php
new file mode 100644
index 00000000..710b292a
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Reader/Ods/HiddenMergeCellsTest.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Ods;
+
+use PhpOffice\PhpSpreadsheet\Reader\Ods;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PHPUnit\Framework\TestCase;
+
+class HiddenMergeCellsTest extends TestCase
+{
+    /**
+     * @var Spreadsheet
+     */
+    private $spreadsheet;
+
+    protected function setup(): void
+    {
+        $filename = 'tests/data/Reader/Ods/HiddenMergeCellsTest.ods';
+        $reader = new Ods();
+        $this->spreadsheet = $reader->load($filename);
+    }
+
+    public function testHiddenMergeCells(): void
+    {
+        $c2InMergeRange = $this->spreadsheet->getActiveSheet()->getCell('C2')->isInMergeRange();
+        self::assertTrue($c2InMergeRange);
+        $a2InMergeRange = $this->spreadsheet->getActiveSheet()->getCell('A2')->isInMergeRange();
+        self::assertTrue($a2InMergeRange);
+        $a2MergeRangeValue = $this->spreadsheet->getActiveSheet()->getCell('A2')->isMergeRangeValueCell();
+        self::assertTrue($a2MergeRangeValue);
+
+        $cellArray = $this->spreadsheet->getActiveSheet()->rangeToArray('A2:C2');
+        self::assertSame([[12, 4, 3]], $cellArray);
+    }
+
+    public function testUnmergeHiddenMergeCells(): void
+    {
+        $this->spreadsheet->getActiveSheet()->unmergeCells('A2:C2');
+
+        $c2InMergeRange = $this->spreadsheet->getActiveSheet()->getCell('C2')->isInMergeRange();
+        self::assertFalse($c2InMergeRange);
+        $a2InMergeRange = $this->spreadsheet->getActiveSheet()->getCell('A2')->isInMergeRange();
+        self::assertFalse($a2InMergeRange);
+
+        $cellArray = $this->spreadsheet->getActiveSheet()->rangeToArray('A2:C2', null, false, false, false);
+        self::assertSame([[12, '=6-B1', '=A2/B2']], $cellArray);
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Reader/Xls/HiddenMergeCellsTest.php b/tests/PhpSpreadsheetTests/Reader/Xls/HiddenMergeCellsTest.php
new file mode 100644
index 00000000..c7085281
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Reader/Xls/HiddenMergeCellsTest.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xls;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xls;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PHPUnit\Framework\TestCase;
+
+class HiddenMergeCellsTest extends TestCase
+{
+    /**
+     * @var Spreadsheet
+     */
+    private $spreadsheet;
+
+    protected function setup(): void
+    {
+        $filename = 'tests/data/Reader/XLS/HiddenMergeCellsTest.xls';
+        $reader = new Xls();
+        $this->spreadsheet = $reader->load($filename);
+    }
+
+    public function testHiddenMergeCells(): void
+    {
+        $c2InMergeRange = $this->spreadsheet->getActiveSheet()->getCell('C2')->isInMergeRange();
+        self::assertTrue($c2InMergeRange);
+        $a2InMergeRange = $this->spreadsheet->getActiveSheet()->getCell('A2')->isInMergeRange();
+        self::assertTrue($a2InMergeRange);
+        $a2MergeRangeValue = $this->spreadsheet->getActiveSheet()->getCell('A2')->isMergeRangeValueCell();
+        self::assertTrue($a2MergeRangeValue);
+
+        $cellArray = $this->spreadsheet->getActiveSheet()->rangeToArray('A2:C2');
+        self::assertSame([[12, 4, 3]], $cellArray);
+    }
+
+    public function testUnmergeHiddenMergeCells(): void
+    {
+        $this->spreadsheet->getActiveSheet()->unmergeCells('A2:C2');
+
+        $c2InMergeRange = $this->spreadsheet->getActiveSheet()->getCell('C2')->isInMergeRange();
+        self::assertFalse($c2InMergeRange);
+        $a2InMergeRange = $this->spreadsheet->getActiveSheet()->getCell('A2')->isInMergeRange();
+        self::assertFalse($a2InMergeRange);
+
+        $cellArray = $this->spreadsheet->getActiveSheet()->rangeToArray('A2:C2', null, false, false, false);
+        self::assertSame([[12, '=6-B1', '=A2/B2']], $cellArray);
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/HiddenMergeCellsTest.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/HiddenMergeCellsTest.php
new file mode 100644
index 00000000..4919cd27
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/HiddenMergeCellsTest.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PHPUnit\Framework\TestCase;
+
+class HiddenMergeCellsTest extends TestCase
+{
+    /**
+     * @var Spreadsheet
+     */
+    private $spreadsheet;
+
+    protected function setup(): void
+    {
+        $filename = 'tests/data/Reader/XLSX/HiddenMergeCellsTest.xlsx';
+        $reader = new Xlsx();
+        $this->spreadsheet = $reader->load($filename);
+    }
+
+    public function testHiddenMergeCells(): void
+    {
+        $c2InMergeRange = $this->spreadsheet->getActiveSheet()->getCell('C2')->isInMergeRange();
+        self::assertTrue($c2InMergeRange);
+        $a2InMergeRange = $this->spreadsheet->getActiveSheet()->getCell('A2')->isInMergeRange();
+        self::assertTrue($a2InMergeRange);
+        $a2MergeRangeValue = $this->spreadsheet->getActiveSheet()->getCell('A2')->isMergeRangeValueCell();
+        self::assertTrue($a2MergeRangeValue);
+
+        $cellArray = $this->spreadsheet->getActiveSheet()->rangeToArray('A2:C2');
+        self::assertSame([[12, 4, 3]], $cellArray);
+    }
+
+    public function testUnmergeHiddenMergeCells(): void
+    {
+        $this->spreadsheet->getActiveSheet()->unmergeCells('A2:C2');
+
+        $c2InMergeRange = $this->spreadsheet->getActiveSheet()->getCell('C2')->isInMergeRange();
+        self::assertFalse($c2InMergeRange);
+        $a2InMergeRange = $this->spreadsheet->getActiveSheet()->getCell('A2')->isInMergeRange();
+        self::assertFalse($a2InMergeRange);
+
+        $cellArray = $this->spreadsheet->getActiveSheet()->rangeToArray('A2:C2', null, false, false, false);
+        self::assertSame([[12, '=6-B1', '=A2/B2']], $cellArray);
+    }
+}
diff --git a/tests/data/Reader/Ods/HiddenMergeCellsTest.ods b/tests/data/Reader/Ods/HiddenMergeCellsTest.ods
new file mode 100644
index 0000000000000000000000000000000000000000..b8beb972c568a6702fa7e36c61d245776fa8c798
GIT binary patch
literal 8045
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

literal 0
HcmV?d00001

diff --git a/tests/data/Reader/XLS/HiddenMergeCellsTest.xls b/tests/data/Reader/XLS/HiddenMergeCellsTest.xls
new file mode 100644
index 0000000000000000000000000000000000000000..fefbcecc802d7aafa01a4321bd6667e1a9adcfc5
GIT binary patch
literal 5632
zcmeHLU1(fY5T3i)-QN5(*`!I;)}}X6w@I@R(-y2qn{Cso1#3eZ|4PAbHaBVPCR@@J
z75v$z78ER0`ru2U6!Id9KM4Au;O0%iq6mfPgQNu?iau<mA_bfE`{v$FuIp~Hkx;2*
zmN`Fj=bV`{XU@zy``x#-(-%Hob6N7>VJVZDY`FwIbOUWO*AI#K&?apro6Y9PXfDHT
zWPzKmuG~XEHZcI?p05CsR_@lf(UO)`U4#XCB#GacSh8D2P>;$>*zwX~H9W>Eu9T79
zcu@-fLOjdz=Pa<0t@zz*f5vad@iJik`Dd)>`L6(00;_;4fz`koAX0$T0_%XQfc3xz
z;A-F<z&n9=0oMT60x5T$TeEGU-Q@P~aqGF2EVpij1<FnAVlW_|ul$A~Ut|Aec*IBk
zN%e~>pdFN>^o_1qB5vI(*r__i4EkmoPPz>(L(YL(EgvfN3oW;)_kk%Y)>c%!kz6;T
zs{3gzo3*S)X~<_f=0~M;z%Rc7fA+OA?jZ;mI}rbdBqj;T`wG6L`r7EPk_qP5N9_@N
zG?tjwb2A~o>v`Y`2x*ISDyH=7N?edmYZc-zM(3=B`2WB33E0%)@?6N-xy`XdCZFC~
zgdQnE-&llRUXU*E1cM&TP^yr&&iZiHQj%pIN|k9{n+j@Om-1`9Dz!rE`cxo$NPYSg
z&czS|I8N~X!?r!v@fOZ(1iwkc1d8;YHslvMz{s8HQCYzZBQ%dT{e!;d#m!QgVPyXj
zcYae&7{~->8YfH4s5D-q!pH?Ca)OCiZ~lQb#LWhY&pr^GTmUxlF@ZRNCiJ&JQw72O
zP>4sfR+R`r)SvHO`+jd<cjt3TPt83!<UX1PTAsj{N&iM2(Wd3N^480}(j*e@3ODx-
z4co`8C+rujp5$<BB+_FK9#6zZo5LNO!aEwIRl*DMb;ky6E8Klj1-!0h7|Lu`xZ1hF
z({4fgWc$>3`&6d0)ziKp&B&nrSRQ}l5-}o1ZhWpb<VnnJ$}5^*#dx!lxfS4Jo^|%d
z$<L;bRyU{#HwtBqkj4)3_blyIHMjx8((vr@Q-f?m8I<+t8Jefjl~9x=^L%4ac43mV
zKL{IA2va!$`>jwZyD(20g^>>ajJY`vXZFdj(#>tmJcb^&FheI$b+BJGQkHoD{TlIS
zT9jU%nRR#cbKsK-9Y=rUD`dN`PCnJ=XEeuxdL8G}sb|Fx!T|?8ZU=8-=Hwu*e||7<
zD=7mTM}$nC11wQXd4zYCy+iTQ<gw(yn6>-GxSg;bda%7W)@LUYHcTn9b7)||NjuJ%
zMVDBLBXrRtodGjgr+P%*c$#SX)cN0T>^mHK?`>1sHhl5}cj09q73X&<&ih>yNJ~8q
z<UQ{hAn$tpK;HL`0;%NHn<9;Fy90F;nA$%46e?}ACPaaUwlw|p?AKF_7jov}8(R*b
zjpjd~nEsUKyL9o=x%=0K&b|ZvBR4*PdrBaWb`Ug1F-}gTXK^fbEk?)ZWpFL9l<z;a
zf8H4?WN5@H$MH}-jo0U>9FabKhaM@!J}<2fyUqPZ(9knHFSF<46^$(PnJ!2khL7)q
z4$pfyN^4R+*TeWhC}q^$VA|s{8jzb1yOd!Cc`6{^k?fQOnevD{!+fg|0<vF@WBtRp
z_44h%2mb;L=$?==hTCuwl;Y6h%4ftbb^YtX`@TD607)k)an-@re;^j8&(?pj{$|J?
SbLB5ZwOIRm-{1eW{J#K-K`LPY

literal 0
HcmV?d00001

diff --git a/tests/data/Reader/XLSX/HiddenMergeCellsTest.xlsx b/tests/data/Reader/XLSX/HiddenMergeCellsTest.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..124f05618963a47ab3b175cc42da355e8366a735
GIT binary patch
literal 4576
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
Q06>DfPH<J~`c=690;}1$%K!iX

literal 0
HcmV?d00001


From 90422bf1d2e3b53b5cb00b79328885a0544df5b6 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Fri, 16 Sep 2022 08:25:26 -0700
Subject: [PATCH 60/69] R1C1 Format and Internationalization, plus Relative
 Offsets (#3052)

* R1C1 Format and Internationalization, plus Relative Offsets

Fix #1704, albeit imperfectly. Excel's implementation of this feature makes it impossible to fix perfectly. I don't know why it was necessary to internationalize R1C1 in the first place - the benefits are so minimal,and the result is worksheets that break when opened in different locales. Ugh. I can't even find complete documentation about the format in different languages; I am using https://answers.microsoft.com/en-us/officeinsider/forum/all/indirect-function-is-broken-at-least-for-excel-in/1fcbcf20-a103-4172-abf1-2c0dfe848e60 as my definitive reference.

This fix concentrates on the original report, using the INDIRECT function; there may be other areas similarly affected. As with ambiguous date formats, PhpSpreadsheet will do a little better than Excel itself when reading spreadsheets with internationalized R1C1 by trying all possibilities before giving up. When it does give up, it will now return `#REF!`, as Excel does, rather than throwing an exception, which is certainly friendlier. Although read now works better, when writing it will use whatever the user specified, so spreadsheets breaking in the wrong locale will still happen.

There were some bugs that turned up as I added test cases, all of them concerning relative addressing in R1C1 format, e.g. `R[+1]C[-1]`. The regexp for validating the format allowed for minus signs, but not plus signs. Also, the relevant functions did not allow for passing the current cell address, which made relative addressing impossible. The code now allows these, and suitable test cases are added.

* Use Locale for Formats, but Not for XML

Implementing a suggestion from @MarkBaker to use the system locale for determining R1C1 format rather than looping through a set of regexes and accepting any that work. This is closer to how Excel itself operates. The assumption we are making is to use the first character of the translated ROW and COLUMN functions. This will not work for Russian or Bulgarian, where each starts with the same letter, but it appears that Russian, at least, still uses R1C1. So our algorithm will not use non-ASCII characters, nor characters where ROW and COLUMN start with the same letter, falling back to R/C in those cases. Turkish falls into that category. Czech uses an accented character for one of the functions, and I'm guessing to use the unaccented character in that case. Polish COLUMN function is NR.KOLUMNY, and I'm guessing to use K in that case.

The function that converts R1C1 references is also used by the XML reader *where the format is always R1C1*, not locale-based (confirmed by successfully opening in Excel an XML spreadsheet when my language is set to French). The conversion code now handles that distinction through the use of an extra parameter. Xml Reader Load Test is duplicated to confirm that spreadsheet is loaded properly whether the locale is English or French. (No, I did not add an INDIRECT function to the Xml spreadsheet.)

Tests CsvIssue2232Test and TranslationTest both changed locale without resetting it when done. That omission was exposed by the new code, and both are now corrected.

* OpenOffice and Gnumeric

OpenOffice and Gnumeric make it much easier to test with other languages - they can be handled with an environment variable. Sensibly, they require R and C as the characters for R1C1 notation regardless of the language. Change code to recognize this difference from Excel.

* Handle Output of ADDRESS Function

One other function has to deal with R1C1 format as a string. Unlike INDIRECT, which receives the string on input, ADDRESS generates the string on output. Ensure that the ADDRESS output is consistent with the INDIRECT input.

ADDRESS expects its 4th arg to be bool, but it can also accept int, and many examples on the net supply it as an int. This had not been handled properly, but is now corrected.

* More Structured Test

I earlier introduced a new test for relative R1C1 addressing. Rewrite it to be clearer.

* Add Row for This to Locale Spreadsheet

It took a while for me to figure out how it all works. I have added a new row (with English value `*RC`) to Translations.xlsx, in the "Lookup and Reference" section of sheet "Excel Functions". By starting the "function name" with an asterisk, it will not be confused with a "real" function (confirmed by a new test). This approach also gives us the flexibility to do something similar if another surprise case occurs in future; in particular, I think this is more flexible than adding this as another option on the "Excel Localisation" sheet. It also means that any errors or omissions in the list below will be handled as with any other translation problem, by updating the spreadsheet without needing to touch any code.

The spreadsheet has the following entries in the *RC row:
- first letter of ROW/COLUMN functions for da, de, es, fi, fr, hu, nl, nb, pt, pt_br, sv
- no value for locales where ROW/COLUMN functions start with same letter - bg, ru, tr
- no value for locales with a multi-part name for ROW and/or COLUMN - it, pl (I had not previously noted Italian as an exception)
- no value for locales where ROW and/or COLUMN starts with a non-ASCII character - cs (this would also apply to bg and ru which are already included under "same letter")
- it does nothing for locales which are defined on the "Excel Localisation" sheet but have no entries yet on the "Excel Functions" sheet (e.g. eu)

Note that all but the first bullet item will continue to use R/C, which leaves them no worse off than they were before this change.
---
 infra/LocaleGenerator.php                     |   2 +-
 .../Calculation/Calculation.php               |   2 +-
 .../Calculation/LookupRef/Address.php         |   7 +-
 .../Calculation/LookupRef/Helpers.php         |  10 +-
 .../Calculation/LookupRef/Indirect.php        |   9 +-
 .../Calculation/locale/Translations.xlsx      | Bin 110548 -> 111436 bytes
 .../Calculation/locale/da/functions           |   1 +
 .../Calculation/locale/de/functions           |   1 +
 .../Calculation/locale/es/functions           |   1 +
 .../Calculation/locale/fi/functions           |   1 +
 .../Calculation/locale/fr/functions           |   1 +
 .../Calculation/locale/hu/functions           |   1 +
 .../Calculation/locale/nb/functions           |   1 +
 .../Calculation/locale/nl/functions           |   1 +
 .../Calculation/locale/pt/br/functions        |   1 +
 .../Calculation/locale/pt/functions           |   1 +
 .../Calculation/locale/sv/functions           |   1 +
 src/PhpSpreadsheet/Cell/AddressHelper.php     |  29 +++-
 .../LookupRef/AddressInternationalTest.php    |  79 +++++++++++
 .../Functions/LookupRef/AddressTest.php       |   6 -
 .../LookupRef/IndirectInternationalTest.php   | 132 ++++++++++++++++++
 .../Functions/LookupRef/IndirectTest.php      |  44 ++++++
 .../Calculation/TranslationTest.php           |   5 +
 .../LocaleGeneratorTest.php                   |  42 +++++-
 .../Reader/Csv/CsvIssue2232Test.php           |   9 +-
 .../Reader/Xml/PageSetupTest.php              |  18 ++-
 .../Reader/Xml/XmlLoadTest.php                |  43 +++++-
 tests/data/Calculation/LookupRef/ADDRESS.php  |  16 +++
 tests/data/Calculation/Translations.php       |  10 ++
 29 files changed, 436 insertions(+), 38 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/AddressInternationalTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndirectInternationalTest.php

diff --git a/infra/LocaleGenerator.php b/infra/LocaleGenerator.php
index bb97754d..992bde17 100644
--- a/infra/LocaleGenerator.php
+++ b/infra/LocaleGenerator.php
@@ -146,7 +146,7 @@ class LocaleGenerator
             $translationValue = $translationCell->getValue();
             if ($this->isFunctionCategoryEntry($translationCell)) {
                 $this->writeFileSectionHeader($functionFile, "{$translationValue} ({$functionName})");
-            } elseif (!array_key_exists($functionName, $this->phpSpreadsheetFunctions)) {
+            } elseif (!array_key_exists($functionName, $this->phpSpreadsheetFunctions) && substr($functionName, 0, 1) !== '*') {
                 $this->log("Function {$functionName} is not defined in PhpSpreadsheet");
             } elseif (!empty($translationValue)) {
                 $functionTranslation = "{$functionName} = {$translationValue}" . self::EOL;
diff --git a/src/PhpSpreadsheet/Calculation/Calculation.php b/src/PhpSpreadsheet/Calculation/Calculation.php
index b5a26f62..94eadd85 100644
--- a/src/PhpSpreadsheet/Calculation/Calculation.php
+++ b/src/PhpSpreadsheet/Calculation/Calculation.php
@@ -3110,7 +3110,7 @@ class Calculation
                     [$localeFunction] = explode('##', $localeFunction); //    Strip out comments
                     if (strpos($localeFunction, '=') !== false) {
                         [$fName, $lfName] = array_map('trim', explode('=', $localeFunction));
-                        if ((isset(self::$phpSpreadsheetFunctions[$fName])) && ($lfName != '') && ($fName != $lfName)) {
+                        if ((substr($fName, 0, 1) === '*' || isset(self::$phpSpreadsheetFunctions[$fName])) && ($lfName != '') && ($fName != $lfName)) {
                             self::$localeFunctions[$fName] = $lfName;
                         }
                     }
diff --git a/src/PhpSpreadsheet/Calculation/LookupRef/Address.php b/src/PhpSpreadsheet/Calculation/LookupRef/Address.php
index c8cdf2dd..0d2db8b2 100644
--- a/src/PhpSpreadsheet/Calculation/LookupRef/Address.php
+++ b/src/PhpSpreadsheet/Calculation/LookupRef/Address.php
@@ -4,6 +4,7 @@ namespace PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
 
 use PhpOffice\PhpSpreadsheet\Calculation\ArrayEnabled;
 use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
+use PhpOffice\PhpSpreadsheet\Cell\AddressHelper;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 
 class Address
@@ -72,6 +73,9 @@ class Address
 
         $sheetName = self::sheetName($sheetName);
 
+        if (is_int($referenceStyle)) {
+            $referenceStyle = (bool) $referenceStyle;
+        }
         if ((!is_bool($referenceStyle)) || $referenceStyle === self::REFERENCE_STYLE_A1) {
             return self::formatAsA1($row, $column, $relativity, $sheetName);
         }
@@ -113,7 +117,8 @@ class Address
         if (($relativity == self::ADDRESS_ROW_RELATIVE) || ($relativity == self::ADDRESS_RELATIVE)) {
             $row = "[{$row}]";
         }
+        [$rowChar, $colChar] = AddressHelper::getRowAndColumnChars();
 
-        return "{$sheetName}R{$row}C{$column}";
+        return "{$sheetName}$rowChar{$row}$colChar{$column}";
     }
 }
diff --git a/src/PhpSpreadsheet/Calculation/LookupRef/Helpers.php b/src/PhpSpreadsheet/Calculation/LookupRef/Helpers.php
index 7408a66e..76a194b3 100644
--- a/src/PhpSpreadsheet/Calculation/LookupRef/Helpers.php
+++ b/src/PhpSpreadsheet/Calculation/LookupRef/Helpers.php
@@ -13,12 +13,12 @@ class Helpers
 
     public const CELLADDRESS_USE_R1C1 = false;
 
-    private static function convertR1C1(string &$cellAddress1, ?string &$cellAddress2, bool $a1): string
+    private static function convertR1C1(string &$cellAddress1, ?string &$cellAddress2, bool $a1, ?int $baseRow = null, ?int $baseCol = null): string
     {
         if ($a1 === self::CELLADDRESS_USE_R1C1) {
-            $cellAddress1 = AddressHelper::convertToA1($cellAddress1);
+            $cellAddress1 = AddressHelper::convertToA1($cellAddress1, $baseRow ?? 1, $baseCol ?? 1);
             if ($cellAddress2) {
-                $cellAddress2 = AddressHelper::convertToA1($cellAddress2);
+                $cellAddress2 = AddressHelper::convertToA1($cellAddress2, $baseRow ?? 1, $baseCol ?? 1);
             }
         }
 
@@ -35,7 +35,7 @@ class Helpers
         }
     }
 
-    public static function extractCellAddresses(string $cellAddress, bool $a1, Worksheet $sheet, string $sheetName = ''): array
+    public static function extractCellAddresses(string $cellAddress, bool $a1, Worksheet $sheet, string $sheetName = '', ?int $baseRow = null, ?int $baseCol = null): array
     {
         $cellAddress1 = $cellAddress;
         $cellAddress2 = null;
@@ -52,7 +52,7 @@ class Helpers
         if (strpos($cellAddress, ':') !== false) {
             [$cellAddress1, $cellAddress2] = explode(':', $cellAddress);
         }
-        $cellAddress = self::convertR1C1($cellAddress1, $cellAddress2, $a1);
+        $cellAddress = self::convertR1C1($cellAddress1, $cellAddress2, $a1, $baseRow, $baseCol);
 
         return [$cellAddress1, $cellAddress2, $cellAddress];
     }
diff --git a/src/PhpSpreadsheet/Calculation/LookupRef/Indirect.php b/src/PhpSpreadsheet/Calculation/LookupRef/Indirect.php
index 417a1f79..91a14491 100644
--- a/src/PhpSpreadsheet/Calculation/LookupRef/Indirect.php
+++ b/src/PhpSpreadsheet/Calculation/LookupRef/Indirect.php
@@ -7,6 +7,7 @@ use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 
 class Indirect
@@ -63,6 +64,8 @@ class Indirect
      */
     public static function INDIRECT($cellAddress, $a1fmt, Cell $cell)
     {
+        [$baseCol, $baseRow] = Coordinate::indexesFromString($cell->getCoordinate());
+
         try {
             $a1 = self::a1Format($a1fmt);
             $cellAddress = self::validateAddress($cellAddress);
@@ -78,7 +81,11 @@ class Indirect
             $cellAddress = self::handleRowColumnRanges($worksheet, ...explode(':', $cellAddress));
         }
 
-        [$cellAddress1, $cellAddress2, $cellAddress] = Helpers::extractCellAddresses($cellAddress, $a1, $cell->getWorkSheet(), $sheetName);
+        try {
+            [$cellAddress1, $cellAddress2, $cellAddress] = Helpers::extractCellAddresses($cellAddress, $a1, $cell->getWorkSheet(), $sheetName, $baseRow, $baseCol);
+        } catch (Exception $e) {
+            return ExcelError::REF();
+        }
 
         if (
             (!preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/miu', $cellAddress1, $matches)) ||
diff --git a/src/PhpSpreadsheet/Calculation/locale/Translations.xlsx b/src/PhpSpreadsheet/Calculation/locale/Translations.xlsx
index d013aee0f1a2dea934a0a215e5aaa1e3202bbecb..7b9fb0dddfff921e9831507af3b0dfd53a8ee10a 100644
GIT binary patch
delta 97055
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
aY;M+8O0usI{{<s@d5&IkQl&3k0R0aY=>4An

delta 96406
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
ADgXcg

diff --git a/src/PhpSpreadsheet/Calculation/locale/da/functions b/src/PhpSpreadsheet/Calculation/locale/da/functions
index 6260760b..03b68c9b 100644
--- a/src/PhpSpreadsheet/Calculation/locale/da/functions
+++ b/src/PhpSpreadsheet/Calculation/locale/da/functions
@@ -245,6 +245,7 @@ ROWS = RÆKKER
 RTD = RTD
 TRANSPOSE = TRANSPONER
 VLOOKUP = LOPSLAG
+*RC = RK
 
 ##
 ## Matematiske og trigonometriske funktioner (Math & Trig Functions)
diff --git a/src/PhpSpreadsheet/Calculation/locale/de/functions b/src/PhpSpreadsheet/Calculation/locale/de/functions
index 331232f7..d49fc5f1 100644
--- a/src/PhpSpreadsheet/Calculation/locale/de/functions
+++ b/src/PhpSpreadsheet/Calculation/locale/de/functions
@@ -243,6 +243,7 @@ ROWS = ZEILEN
 RTD = RTD
 TRANSPOSE = MTRANS
 VLOOKUP = SVERWEIS
+*RC = ZS
 
 ##
 ## Mathematische und trigonometrische Funktionen (Math & Trig Functions)
diff --git a/src/PhpSpreadsheet/Calculation/locale/es/functions b/src/PhpSpreadsheet/Calculation/locale/es/functions
index 1f9f2891..88012aa1 100644
--- a/src/PhpSpreadsheet/Calculation/locale/es/functions
+++ b/src/PhpSpreadsheet/Calculation/locale/es/functions
@@ -245,6 +245,7 @@ ROWS = FILAS
 RTD = RDTR
 TRANSPOSE = TRANSPONER
 VLOOKUP = BUSCARV
+*RC = FC
 
 ##
 ## Funciones matemáticas y trigonométricas (Math & Trig Functions)
diff --git a/src/PhpSpreadsheet/Calculation/locale/fi/functions b/src/PhpSpreadsheet/Calculation/locale/fi/functions
index 33068d93..18f7c8c8 100644
--- a/src/PhpSpreadsheet/Calculation/locale/fi/functions
+++ b/src/PhpSpreadsheet/Calculation/locale/fi/functions
@@ -245,6 +245,7 @@ ROWS = RIVIT
 RTD = RTD
 TRANSPOSE = TRANSPONOI
 VLOOKUP = PHAKU
+*RC = RS
 
 ##
 ## Matemaattiset ja trigonometriset funktiot (Math & Trig Functions)
diff --git a/src/PhpSpreadsheet/Calculation/locale/fr/functions b/src/PhpSpreadsheet/Calculation/locale/fr/functions
index 78b603e9..621cb0db 100644
--- a/src/PhpSpreadsheet/Calculation/locale/fr/functions
+++ b/src/PhpSpreadsheet/Calculation/locale/fr/functions
@@ -240,6 +240,7 @@ ROWS = LIGNES
 RTD = RTD
 TRANSPOSE = TRANSPOSE
 VLOOKUP = RECHERCHEV
+*RC = LC
 
 ##
 ## Fonctions mathématiques et trigonométriques (Math & Trig Functions)
diff --git a/src/PhpSpreadsheet/Calculation/locale/hu/functions b/src/PhpSpreadsheet/Calculation/locale/hu/functions
index 46b30127..4a375ea2 100644
--- a/src/PhpSpreadsheet/Calculation/locale/hu/functions
+++ b/src/PhpSpreadsheet/Calculation/locale/hu/functions
@@ -245,6 +245,7 @@ ROWS = SOROK
 RTD = VIA
 TRANSPOSE = TRANSZPONÁLÁS
 VLOOKUP = FKERES
+*RC = SO
 
 ##
 ## Matematikai és trigonometrikus függvények (Math & Trig Functions)
diff --git a/src/PhpSpreadsheet/Calculation/locale/nb/functions b/src/PhpSpreadsheet/Calculation/locale/nb/functions
index b0a0f949..d352e1f4 100644
--- a/src/PhpSpreadsheet/Calculation/locale/nb/functions
+++ b/src/PhpSpreadsheet/Calculation/locale/nb/functions
@@ -245,6 +245,7 @@ ROWS = RADER
 RTD = RTD
 TRANSPOSE = TRANSPONER
 VLOOKUP = FINN.RAD
+*RC = RK
 
 ##
 ## Matematikk- og trigonometrifunksjoner (Math & Trig Functions)
diff --git a/src/PhpSpreadsheet/Calculation/locale/nl/functions b/src/PhpSpreadsheet/Calculation/locale/nl/functions
index 0e4f1597..ce0b30cc 100644
--- a/src/PhpSpreadsheet/Calculation/locale/nl/functions
+++ b/src/PhpSpreadsheet/Calculation/locale/nl/functions
@@ -244,6 +244,7 @@ ROWS = RIJEN
 RTD = RTG
 TRANSPOSE = TRANSPONEREN
 VLOOKUP = VERT.ZOEKEN
+*RC = RK
 
 ##
 ## Wiskundige en trigonometrische functies (Math & Trig Functions)
diff --git a/src/PhpSpreadsheet/Calculation/locale/pt/br/functions b/src/PhpSpreadsheet/Calculation/locale/pt/br/functions
index feba30d9..5781b0c7 100644
--- a/src/PhpSpreadsheet/Calculation/locale/pt/br/functions
+++ b/src/PhpSpreadsheet/Calculation/locale/pt/br/functions
@@ -242,6 +242,7 @@ ROWS = LINS
 RTD = RTD
 TRANSPOSE = TRANSPOR
 VLOOKUP = PROCV
+*RC = LC
 
 ##
 ## Funções matemáticas e trigonométricas (Math & Trig Functions)
diff --git a/src/PhpSpreadsheet/Calculation/locale/pt/functions b/src/PhpSpreadsheet/Calculation/locale/pt/functions
index 8a94d826..70a3bb0c 100644
--- a/src/PhpSpreadsheet/Calculation/locale/pt/functions
+++ b/src/PhpSpreadsheet/Calculation/locale/pt/functions
@@ -245,6 +245,7 @@ ROWS = LINS
 RTD = RTD
 TRANSPOSE = TRANSPOR
 VLOOKUP = PROCV
+*RC = LC
 
 ##
 ## Funções matemáticas e trigonométricas (Math & Trig Functions)
diff --git a/src/PhpSpreadsheet/Calculation/locale/sv/functions b/src/PhpSpreadsheet/Calculation/locale/sv/functions
index 2531b4c1..491ecfb9 100644
--- a/src/PhpSpreadsheet/Calculation/locale/sv/functions
+++ b/src/PhpSpreadsheet/Calculation/locale/sv/functions
@@ -243,6 +243,7 @@ ROWS = RADER
 RTD = RTD
 TRANSPOSE = TRANSPONERA
 VLOOKUP = LETARAD
+*RC = RK
 
 ##
 ## Matematiska och trigonometriska funktioner (Math & Trig Functions)
diff --git a/src/PhpSpreadsheet/Cell/AddressHelper.php b/src/PhpSpreadsheet/Cell/AddressHelper.php
index 535bdee0..a23a78b6 100644
--- a/src/PhpSpreadsheet/Cell/AddressHelper.php
+++ b/src/PhpSpreadsheet/Cell/AddressHelper.php
@@ -2,23 +2,44 @@
 
 namespace PhpOffice\PhpSpreadsheet\Cell;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Exception;
 
 class AddressHelper
 {
     public const R1C1_COORDINATE_REGEX = '/(R((?:\[-?\d*\])|(?:\d*))?)(C((?:\[-?\d*\])|(?:\d*))?)/i';
 
+    /** @return string[] */
+    public static function getRowAndColumnChars()
+    {
+        $rowChar = 'R';
+        $colChar = 'C';
+        if (Functions::getCompatibilityMode() === Functions::COMPATIBILITY_EXCEL) {
+            $rowColChars = Calculation::localeFunc('*RC');
+            if (mb_strlen($rowColChars) === 2) {
+                $rowChar = mb_substr($rowColChars, 0, 1);
+                $colChar = mb_substr($rowColChars, 1, 1);
+            }
+        }
+
+        return [$rowChar, $colChar];
+    }
+
     /**
      * Converts an R1C1 format cell address to an A1 format cell address.
      */
     public static function convertToA1(
         string $address,
         int $currentRowNumber = 1,
-        int $currentColumnNumber = 1
+        int $currentColumnNumber = 1,
+        bool $useLocale = true
     ): string {
-        $validityCheck = preg_match('/^(R(\[?-?\d*\]?))(C(\[?-?\d*\]?))$/i', $address, $cellReference);
+        [$rowChar, $colChar] = $useLocale ? self::getRowAndColumnChars() : ['R', 'C'];
+        $regex = '/^(' . $rowChar . '(\[?[-+]?\d*\]?))(' . $colChar . '(\[?[-+]?\d*\]?))$/i';
+        $validityCheck = preg_match($regex, $address, $cellReference);
 
-        if ($validityCheck === 0) {
+        if (empty($validityCheck)) {
             throw new Exception('Invalid R1C1-format Cell Reference');
         }
 
@@ -92,7 +113,7 @@ class AddressHelper
                 //    Loop through each R1C1 style reference in turn, converting it to its A1 style equivalent,
                 //        then modify the formula to use that new reference
                 foreach ($cellReferences as $cellReference) {
-                    $A1CellReference = self::convertToA1($cellReference[0][0], $currentRowNumber, $currentColumnNumber);
+                    $A1CellReference = self::convertToA1($cellReference[0][0], $currentRowNumber, $currentColumnNumber, false);
                     $value = substr_replace($value, $A1CellReference, $cellReference[0][1], strlen($cellReference[0][0]));
                 }
             }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/AddressInternationalTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/AddressInternationalTest.php
new file mode 100644
index 00000000..87e0bb4e
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/AddressInternationalTest.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Settings;
+
+class AddressInternationalTest extends AllSetupTeardown
+{
+    /** @var string */
+    private $locale;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->locale = Settings::getLocale();
+    }
+
+    protected function tearDown(): void
+    {
+        Settings::setLocale($this->locale);
+        // CompatibilityMode is restored in parent
+        parent::tearDown();
+    }
+
+    /**
+     * @dataProvider providerInternational
+     */
+    public function testR1C1International(string $locale, string $r, string $c): void
+    {
+        if ($locale !== '') {
+            Settings::setLocale($locale);
+        }
+        $sheet = $this->getSheet();
+        $sheet->getCell('A1')->setValue('=LEFT(ADDRESS(1,1,1,0),1)');
+        $sheet->getCell('A2')->setValue('=MID(ADDRESS(1,1,1,0),3,1)');
+        self::assertSame($r, $sheet->getCell('A1')->getCalculatedValue());
+        self::assertSame($c, $sheet->getCell('A2')->getCalculatedValue());
+    }
+
+    public function providerInternational(): array
+    {
+        return [
+            'Default' => ['', 'R', 'C'],
+            'English' => ['en', 'R', 'C'],
+            'French' => ['fr', 'L', 'C'],
+            'German' => ['de', 'Z', 'S'],
+            'Made-up' => ['xx', 'R', 'C'],
+            'Spanish' => ['es', 'F', 'C'],
+            'Bulgarian' => ['bg', 'R', 'C'],
+            'Czech' => ['cs', 'R', 'C'], // maybe should be R/S
+            'Polish' => ['pl', 'R', 'C'], // maybe should be W/K
+            'Turkish' => ['tr', 'R', 'C'],
+        ];
+    }
+
+    /**
+     * @dataProvider providerCompatibility
+     */
+    public function testCompatibilityInternational(string $compatibilityMode, string $r, string $c): void
+    {
+        Functions::setCompatibilityMode($compatibilityMode);
+        Settings::setLocale('de');
+        $sheet = $this->getSheet();
+        $sheet->getCell('A1')->setValue('=LEFT(ADDRESS(1,1,1,0),1)');
+        $sheet->getCell('A2')->setValue('=MID(ADDRESS(1,1,1,0),3,1)');
+        self::assertSame($r, $sheet->getCell('A1')->getCalculatedValue());
+        self::assertSame($c, $sheet->getCell('A2')->getCalculatedValue());
+    }
+
+    public function providerCompatibility(): array
+    {
+        return [
+            [Functions::COMPATIBILITY_EXCEL, 'Z', 'S'],
+            [Functions::COMPATIBILITY_OPENOFFICE, 'R', 'C'],
+            [Functions::COMPATIBILITY_GNUMERIC, 'R', 'C'],
+        ];
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/AddressTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/AddressTest.php
index 2b92030e..2a6ae883 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/AddressTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/AddressTest.php
@@ -3,17 +3,11 @@
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\LookupRef;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\LookupRef;
 use PHPUnit\Framework\TestCase;
 
 class AddressTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-    }
-
     /**
      * @dataProvider providerADDRESS
      *
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndirectInternationalTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndirectInternationalTest.php
new file mode 100644
index 00000000..7d6d0a65
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndirectInternationalTest.php
@@ -0,0 +1,132 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\LookupRef;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Settings;
+
+class IndirectInternationalTest extends AllSetupTeardown
+{
+    /** @var string */
+    private $locale;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->locale = Settings::getLocale();
+    }
+
+    protected function tearDown(): void
+    {
+        Settings::setLocale($this->locale);
+        // CompatibilityMode is restored in parent
+        parent::tearDown();
+    }
+
+    /**
+     * @dataProvider providerInternational
+     */
+    public function testR1C1International(string $locale): void
+    {
+        Settings::setLocale($locale);
+        $sameAsEnglish = ['en', 'xx', 'ru', 'tr', 'cs', 'pl'];
+        $sheet = $this->getSheet();
+        $sheet->getCell('C1')->setValue('text');
+        $sheet->getCell('A2')->setValue('en');
+        $sheet->getCell('B2')->setValue('=INDIRECT("R1C3", false)');
+        $sheet->getCell('A3')->setValue('fr');
+        $sheet->getCell('B3')->setValue('=INDIRECT("L1C3", false)');
+        $sheet->getCell('A4')->setValue('de');
+        $sheet->getCell('B4')->setValue('=INDIRECT("Z1S3", false)');
+        $sheet->getCell('A5')->setValue('es');
+        $sheet->getCell('B5')->setValue('=INDIRECT("F1C3", false)');
+        $sheet->getCell('A6')->setValue('xx');
+        $sheet->getCell('B6')->setValue('=INDIRECT("R1C3", false)');
+        $sheet->getCell('A7')->setValue('ru');
+        $sheet->getCell('B7')->setValue('=INDIRECT("R1C3", false)');
+        $sheet->getCell('A8')->setValue('cs');
+        $sheet->getCell('B8')->setValue('=INDIRECT("R1C3", false)');
+        $sheet->getCell('A9')->setValue('tr');
+        $sheet->getCell('B9')->setValue('=INDIRECT("R1C3", false)');
+        $sheet->getCell('A10')->setValue('pl');
+        $sheet->getCell('B10')->setValue('=INDIRECT("R1C3", false)');
+        $maxRow = $sheet->getHighestRow();
+        for ($row = 2; $row <= $maxRow; ++$row) {
+            $rowLocale = $sheet->getCell("A$row")->getValue();
+            if (in_array($rowLocale, $sameAsEnglish, true) && in_array($locale, $sameAsEnglish, true)) {
+                $expectedResult = 'text';
+            } else {
+                $expectedResult = ($locale === $sheet->getCell("A$row")->getValue()) ? 'text' : '#REF!';
+            }
+            self::assertSame($expectedResult, $sheet->getCell("B$row")->getCalculatedValue(), "Locale $locale error in cell B$row $rowLocale");
+        }
+    }
+
+    public function providerInternational(): array
+    {
+        return [
+            'English' => ['en'],
+            'French' => ['fr'],
+            'German' => ['de'],
+            'Made-up' => ['xx'],
+            'Spanish' => ['es'],
+            'Russian' => ['ru'],
+            'Czech' => ['cs'],
+            'Polish' => ['pl'],
+            'Turkish' => ['tr'],
+        ];
+    }
+
+    /**
+     * @dataProvider providerRelativeInternational
+     */
+    public function testRelativeInternational(string $locale, string $cell, string $relative): void
+    {
+        Settings::setLocale($locale);
+        $sheet = $this->getSheet();
+        $sheet->getCell('C3')->setValue('text');
+        $sheet->getCell($cell)->setValue("=INDIRECT(\"$relative\", false)");
+        self::assertSame('text', $sheet->getCell($cell)->getCalculatedValue());
+    }
+
+    public function providerRelativeInternational(): array
+    {
+        return [
+            'English A3' => ['en', 'A3', 'R[]C[+2]'],
+            'French B4' => ['fr', 'B4', 'L[-1]C[+1]'],
+            'German C5' => ['de', 'C5', 'Z[-2]S[]'],
+            'Spanish E1' => ['es', 'E1', 'F[+2]C[-2]'],
+        ];
+    }
+
+    /**
+     * @dataProvider providerCompatibility
+     */
+    public function testCompatibilityInternational(string $compatibilityMode): void
+    {
+        Functions::setCompatibilityMode($compatibilityMode);
+        if ($compatibilityMode === Functions::COMPATIBILITY_EXCEL) {
+            $expected1 = '#REF!';
+            $expected2 = 'text';
+        } else {
+            $expected2 = '#REF!';
+            $expected1 = 'text';
+        }
+        Settings::setLocale('fr');
+        $sheet = $this->getSheet();
+        $sheet->getCell('C3')->setValue('text');
+        $sheet->getCell('A1')->setValue('=INDIRECT("R3C3", false)');
+        $sheet->getCell('A2')->setValue('=INDIRECT("L3C3", false)');
+        self::assertSame($expected1, $sheet->getCell('A1')->getCalculatedValue());
+        self::assertSame($expected2, $sheet->getCell('A2')->getCalculatedValue());
+    }
+
+    public function providerCompatibility(): array
+    {
+        return [
+            [Functions::COMPATIBILITY_EXCEL],
+            [Functions::COMPATIBILITY_OPENOFFICE],
+            [Functions::COMPATIBILITY_GNUMERIC],
+        ];
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndirectTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndirectTest.php
index 7601e336..accfc058 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndirectTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/IndirectTest.php
@@ -132,4 +132,48 @@ class IndirectTest extends AllSetupTeardown
         $result = \PhpOffice\PhpSpreadsheet\Calculation\Functions::flattenSingleValue($result);
         self::assertSame('This is it', $result);
     }
+
+    /**
+     * @param null|int|string $expectedResult
+     *
+     * @dataProvider providerRelative
+     */
+    public function testR1C1Relative($expectedResult, string $address): void
+    {
+        $sheet = $this->getSheet();
+        $sheet->fromArray([
+            ['a1', 'b1', 'c1'],
+            ['a2', 'b2', 'c2'],
+            ['a3', 'b3', 'c3'],
+            ['a4', 'b4', 'c4'],
+        ]);
+        $sheet->getCell('B2')->setValue('=INDIRECT("' . $address . '", false)');
+        self::assertSame($expectedResult, $sheet->getCell('B2')->getCalculatedValue());
+    }
+
+    public function providerRelative(): array
+    {
+        return [
+            'same row with bracket next column' => ['c2', 'R[]C[+1]'],
+            'same row without bracket next column' => ['c2', 'RC[+1]'],
+            'same row without bracket next column no plus sign' => ['c2', 'RC[1]'],
+            'same row previous column' => ['a2', 'RC[-1]'],
+            'previous row previous column' => ['a1', 'R[-1]C[-1]'],
+            'previous row same column with bracket' => ['b1', 'R[-1]C[]'],
+            'previous row same column without bracket' => ['b1', 'R[-1]C'],
+            'previous row next column' => ['c1', 'R[-1]C[+1]'],
+            'next row no plus sign previous column' => ['a3', 'R[1]C[-1]'],
+            'next row previous column' => ['a3', 'R[+1]C[-1]'],
+            'next row same column' => ['b3', 'R[+1]C'],
+            'next row next column' => ['c3', 'R[+1]C[+1]'],
+            'two rows down same column' => ['b4', 'R[+2]C'],
+            'invalid row' => ['#REF!', 'R[-2]C'],
+            'invalid column' => ['#REF!', 'RC[-2]'],
+            'circular reference' => [0, 'RC'], // matches Excel's treatment
+            'absolute row absolute column' => ['c2', 'R2C3'],
+            'absolute row relative column' => ['a2', 'R2C[-1]'],
+            'relative row absolute column lowercase' => ['a2', 'rc1'],
+            'uninitialized cell' => [null, 'RC[+2]'], // Excel result is 0
+        ];
+    }
 }
diff --git a/tests/PhpSpreadsheetTests/Calculation/TranslationTest.php b/tests/PhpSpreadsheetTests/Calculation/TranslationTest.php
index e2384460..ac1f15a1 100644
--- a/tests/PhpSpreadsheetTests/Calculation/TranslationTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/TranslationTest.php
@@ -19,18 +19,23 @@ class TranslationTest extends TestCase
      */
     private $returnDate;
 
+    /** @var string */
+    private $locale;
+
     protected function setUp(): void
     {
         $this->compatibilityMode = Functions::getCompatibilityMode();
         $this->returnDate = Functions::getReturnDateType();
         Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
         Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
+        $this->locale = Settings::getLocale();
     }
 
     protected function tearDown(): void
     {
         Functions::setCompatibilityMode($this->compatibilityMode);
         Functions::setReturnDateType($this->returnDate);
+        Settings::setLocale($this->locale);
     }
 
     /**
diff --git a/tests/PhpSpreadsheetTests/LocaleGeneratorTest.php b/tests/PhpSpreadsheetTests/LocaleGeneratorTest.php
index e7429a25..ca9d5183 100644
--- a/tests/PhpSpreadsheetTests/LocaleGeneratorTest.php
+++ b/tests/PhpSpreadsheetTests/LocaleGeneratorTest.php
@@ -11,31 +11,59 @@ class LocaleGeneratorTest extends TestCase
 {
     public function testLocaleGenerator(): void
     {
+        $directory = realpath(__DIR__ . '/../../src/PhpSpreadsheet/Calculation/locale/') ?: '';
+        self::assertNotEquals('', $directory);
         $phpSpreadsheetFunctionsProperty = (new ReflectionClass(Calculation::class))
             ->getProperty('phpSpreadsheetFunctions');
         $phpSpreadsheetFunctionsProperty->setAccessible(true);
         $phpSpreadsheetFunctions = $phpSpreadsheetFunctionsProperty->getValue();
 
         $localeGenerator = new LocaleGenerator(
-            (string) realpath(__DIR__ . '/../../src/PhpSpreadsheet/Calculation/locale/'),
+            $directory . DIRECTORY_SEPARATOR,
             'Translations.xlsx',
             $phpSpreadsheetFunctions
         );
         $localeGenerator->generateLocales();
 
         $testLocales = [
+            'bg',
+            'cs',
+            'da',
+            'de',
+            'en',
+            'es',
+            'fi',
             'fr',
+            'hu',
+            'it',
+            'nb',
             'nl',
+            'pl',
             'pt',
-            'pt_br',
             'ru',
+            'sv',
+            'tr',
         ];
 
-        foreach ($testLocales as $locale) {
-            $locale = str_replace('_', '/', $locale);
-            $path = realpath(__DIR__ . "/../../src/PhpSpreadsheet/Calculation/locale/{$locale}");
-            self::assertFileExists("{$path}/config");
-            self::assertFileExists("{$path}/functions");
+        $count = count(glob($directory . DIRECTORY_SEPARATOR . '*') ?: []) - 1; // exclude Translations.xlsx
+        self::assertCount($count, $testLocales);
+        $testLocales[] = 'pt_br';
+        $testLocales[] = 'en_uk';
+        $noconfig = ['en'];
+        $nofunctions = ['en', 'en_uk'];
+        foreach ($testLocales as $originalLocale) {
+            $locale = str_replace('_', DIRECTORY_SEPARATOR, $originalLocale);
+            $path = $directory . DIRECTORY_SEPARATOR . $locale;
+            if (in_array($originalLocale, $noconfig, true)) {
+                self::assertFileDoesNotExist($path . DIRECTORY_SEPARATOR . 'config');
+            } else {
+                self::assertFileExists($path . DIRECTORY_SEPARATOR . 'config');
+            }
+            if (in_array($originalLocale, $nofunctions, true)) {
+                self::assertFileDoesNotExist($path . DIRECTORY_SEPARATOR . 'functions');
+            } else {
+                self::assertFileExists($path . DIRECTORY_SEPARATOR . 'functions');
+            }
         }
     }
 }
diff --git a/tests/PhpSpreadsheetTests/Reader/Csv/CsvIssue2232Test.php b/tests/PhpSpreadsheetTests/Reader/Csv/CsvIssue2232Test.php
index f9321102..429874dc 100644
--- a/tests/PhpSpreadsheetTests/Reader/Csv/CsvIssue2232Test.php
+++ b/tests/PhpSpreadsheetTests/Reader/Csv/CsvIssue2232Test.php
@@ -2,11 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Reader\Csv;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use PhpOffice\PhpSpreadsheet\Cell\IValueBinder;
 use PhpOffice\PhpSpreadsheet\Cell\StringValueBinder;
 use PhpOffice\PhpSpreadsheet\Reader\Csv;
+use PhpOffice\PhpSpreadsheet\Settings;
 use PHPUnit\Framework\TestCase;
 
 class CsvIssue2232Test extends TestCase
@@ -16,14 +16,19 @@ class CsvIssue2232Test extends TestCase
      */
     private $valueBinder;
 
+    /** @var string */
+    private $locale;
+
     protected function setUp(): void
     {
         $this->valueBinder = Cell::getValueBinder();
+        $this->locale = Settings::getLocale();
     }
 
     protected function tearDown(): void
     {
         Cell::setValueBinder($this->valueBinder);
+        Settings::setLocale($this->locale);
     }
 
     /**
@@ -78,7 +83,7 @@ class CsvIssue2232Test extends TestCase
             Cell::setValueBinder($binder);
         }
 
-        Calculation::getInstance()->setLocale('fr');
+        Settings::setLocale('fr');
 
         $reader = new Csv();
         $filename = 'tests/data/Reader/CSV/issue.2232.csv';
diff --git a/tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php b/tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php
index 97476ed5..ae79dd0e 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php
@@ -14,19 +14,25 @@ class PageSetupTest extends TestCase
     private const MARGIN_UNIT_CONVERSION = 2.54; // Inches to cm
 
     /**
-     * @var Spreadsheet
+     * @var ?Spreadsheet
      */
     private $spreadsheet;
 
-    protected function setup(): void
+    /** @var string */
+    private $filename = 'tests/data/Reader/Xml/PageSetup.xml';
+
+    protected function tearDown(): void
     {
-        $filename = 'tests/data/Reader/Xml/PageSetup.xml';
-        $reader = new Xml();
-        $this->spreadsheet = $reader->load($filename);
+        if ($this->spreadsheet !== null) {
+            $this->spreadsheet->disconnectWorksheets();
+            $this->spreadsheet = null;
+        }
     }
 
     public function testPageSetup(): void
     {
+        $reader = new Xml();
+        $this->spreadsheet = $reader->load($this->filename);
         $assertions = $this->pageSetupAssertions();
 
         foreach ($this->spreadsheet->getAllSheets() as $worksheet) {
@@ -49,6 +55,8 @@ class PageSetupTest extends TestCase
 
     public function testPageMargins(): void
     {
+        $reader = new Xml();
+        $this->spreadsheet = $reader->load($this->filename);
         $assertions = $this->pageMarginAssertions();
 
         foreach ($this->spreadsheet->getAllSheets() as $worksheet) {
diff --git a/tests/PhpSpreadsheetTests/Reader/Xml/XmlLoadTest.php b/tests/PhpSpreadsheetTests/Reader/Xml/XmlLoadTest.php
index 29d81299..9846b861 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xml/XmlLoadTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xml/XmlLoadTest.php
@@ -4,18 +4,51 @@ namespace PhpOffice\PhpSpreadsheetTests\Reader\Xml;
 
 use DateTimeZone;
 use PhpOffice\PhpSpreadsheet\Reader\Xml;
+use PhpOffice\PhpSpreadsheet\Settings;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PHPUnit\Framework\TestCase;
 
 class XmlLoadTest extends TestCase
 {
-    public function testLoad(): void
+    /** @var ?Spreadsheet */
+    private $spreadsheet;
+
+    /** @var string */
+    private $locale;
+
+    protected function setUp(): void
+    {
+        $this->locale = Settings::getLocale();
+    }
+
+    protected function tearDown(): void
+    {
+        if ($this->spreadsheet !== null) {
+            $this->spreadsheet->disconnectWorksheets();
+            $this->spreadsheet = null;
+        }
+        Settings::setLocale($this->locale);
+    }
+
+    public function testLoadEnglish(): void
+    {
+        $this->xtestLoad();
+    }
+
+    public function testLoadFrench(): void
+    {
+        Settings::setLocale('fr');
+        $this->xtestLoad();
+    }
+
+    public function xtestLoad(): void
     {
         $filename = __DIR__
             . '/../../../..'
             . '/samples/templates/excel2003.xml';
         $reader = new Xml();
-        $spreadsheet = $reader->load($filename);
+        $this->spreadsheet = $spreadsheet = $reader->load($filename);
         self::assertEquals(2, $spreadsheet->getSheetCount());
 
         $sheet = $spreadsheet->getSheet(1);
@@ -71,7 +104,7 @@ class XmlLoadTest extends TestCase
         $reader = new Xml();
         $filter = new XmlFilter();
         $reader->setReadFilter($filter);
-        $spreadsheet = $reader->load($filename);
+        $this->spreadsheet = $spreadsheet = $reader->load($filename);
         self::assertEquals(2, $spreadsheet->getSheetCount());
         $sheet = $spreadsheet->getSheet(1);
         self::assertEquals('Report Data', $sheet->getTitle());
@@ -87,7 +120,7 @@ class XmlLoadTest extends TestCase
             . '/samples/templates/excel2003.xml';
         $reader = new Xml();
         $reader->setLoadSheetsOnly(['Unknown Sheet', 'Report Data']);
-        $spreadsheet = $reader->load($filename);
+        $this->spreadsheet = $spreadsheet = $reader->load($filename);
         self::assertEquals(1, $spreadsheet->getSheetCount());
         $sheet = $spreadsheet->getSheet(0);
         self::assertEquals('Report Data', $sheet->getTitle());
@@ -102,7 +135,7 @@ class XmlLoadTest extends TestCase
             . '/../../../..'
             . '/samples/templates/excel2003.short.bad.xml';
         $reader = new Xml();
-        $spreadsheet = $reader->load($filename);
+        $this->spreadsheet = $spreadsheet = $reader->load($filename);
         self::assertEquals(1, $spreadsheet->getSheetCount());
         $sheet = $spreadsheet->getSheet(0);
         self::assertEquals('Sample Data', $sheet->getTitle());
diff --git a/tests/data/Calculation/LookupRef/ADDRESS.php b/tests/data/Calculation/LookupRef/ADDRESS.php
index b9e170d5..14a3cf7d 100644
--- a/tests/data/Calculation/LookupRef/ADDRESS.php
+++ b/tests/data/Calculation/LookupRef/ADDRESS.php
@@ -48,6 +48,22 @@ return [
         false,
         'EXCEL SHEET',
     ],
+    '0 instead of bool for 4th arg' => [
+        "'EXCEL SHEET'!R2C3",
+        2,
+        3,
+        null,
+        0,
+        'EXCEL SHEET',
+    ],
+    '1 instead of bool for 4th arg' => [
+        "'EXCEL SHEET'!\$C\$2",
+        2,
+        3,
+        null,
+        1,
+        'EXCEL SHEET',
+    ],
     [
         "'EXCEL SHEET'!\$C\$2",
         2,
diff --git a/tests/data/Calculation/Translations.php b/tests/data/Calculation/Translations.php
index 604c6721..0965bac1 100644
--- a/tests/data/Calculation/Translations.php
+++ b/tests/data/Calculation/Translations.php
@@ -80,4 +80,14 @@ return [
         'nb',
         '=MAX(ABS({2,-3;-4,5}), ABS{-2,3;4,-5})',
     ],
+    'not fooled by *RC' => [
+        '=3*RC(B1)',
+        'fr',
+        '=3*RC(B1)',
+    ],
+    'handle * for ROW' => [
+        '=3*LIGNE(B1)',
+        'fr',
+        '=3*ROW(B1)',
+    ],
 ];

From b7fa4701382794dac85ed4caf4a2f760e1c92cde Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Fri, 16 Sep 2022 09:16:11 -0700
Subject: [PATCH 61/69] Scrutinizer Changes (#3060)

* Scrutinizer Changes

Scrutinizer appears to be working again. But the PRs that have used it have neither added new issues nor fixed existing ones. This PR should fix some exisiting; let's see what Scrutinizer does with it.

* Address Some False Positives

In Reader/Xlsx/Chart.
---
 src/PhpSpreadsheet/Reader/Xlsx/Chart.php          | 15 ++++++++++-----
 src/PhpSpreadsheet/Writer/Html.php                |  3 ---
 .../Reader/Xlsx/AutoFilter2Test.php               |  1 +
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/PhpSpreadsheet/Reader/Xlsx/Chart.php b/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
index 6bc6d7c5..c22334ca 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx/Chart.php
@@ -14,6 +14,7 @@ use PhpOffice\PhpSpreadsheet\Chart\PlotArea;
 use PhpOffice\PhpSpreadsheet\Chart\Properties as ChartProperties;
 use PhpOffice\PhpSpreadsheet\Chart\Title;
 use PhpOffice\PhpSpreadsheet\Chart\TrendLine;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 use PhpOffice\PhpSpreadsheet\RichText\RichText;
 use PhpOffice\PhpSpreadsheet\Style\Font;
 use SimpleXMLElement;
@@ -94,7 +95,7 @@ class Chart
                     break;
                 case 'chart':
                     foreach ($chartElement as $chartDetailsKey => $chartDetails) {
-                        $chartDetailsC = $chartDetails->children($this->cNamespace);
+                        $chartDetails = Xlsx::testSimpleXml($chartDetails);
                         switch ($chartDetailsKey) {
                             case 'autoTitleDeleted':
                                 /** @var bool */
@@ -113,8 +114,8 @@ class Chart
                                 $plotSeries = $plotAttributes = [];
                                 $catAxRead = false;
                                 $plotNoFill = false;
-                                /** @var SimpleXMLElement $chartDetail */
                                 foreach ($chartDetails as $chartDetailKey => $chartDetail) {
+                                    $chartDetail = Xlsx::testSimpleXml($chartDetail);
                                     switch ($chartDetailKey) {
                                         case 'spPr':
                                             $possibleNoFill = $chartDetails->spPr->children($this->aNamespace);
@@ -122,8 +123,8 @@ class Chart
                                                 $plotNoFill = true;
                                             }
                                             if (isset($possibleNoFill->gradFill->gsLst)) {
-                                                /** @var SimpleXMLElement $gradient */
                                                 foreach ($possibleNoFill->gradFill->gsLst->gs as $gradient) {
+                                                    $gradient = Xlsx::testSimpleXml($gradient);
                                                     /** @var float */
                                                     $pos = self::getAttribute($gradient, 'pos', 'float');
                                                     $gradientArray[] = [
@@ -348,6 +349,7 @@ class Chart
                                 $legendLayout = null;
                                 $legendOverlay = false;
                                 foreach ($chartDetails as $chartDetailKey => $chartDetail) {
+                                    $chartDetail = Xlsx::testSimpleXml($chartDetail);
                                     switch ($chartDetailKey) {
                                         case 'legendPos':
                                             $legendPos = self::getAttribute($chartDetail, 'val', 'string');
@@ -399,11 +401,13 @@ class Chart
         $caption = [];
         $titleLayout = null;
         foreach ($titleDetails as $titleDetailKey => $chartDetail) {
+            $chartDetail = Xlsx::testSimpleXml($chartDetail);
             switch ($titleDetailKey) {
                 case 'tx':
                     if (isset($chartDetail->rich)) {
                         $titleDetails = $chartDetail->rich->children($this->aNamespace);
                         foreach ($titleDetails as $titleKey => $titleDetail) {
+                            $titleDetail = Xlsx::testSimpleXml($titleDetail);
                             switch ($titleKey) {
                                 case 'p':
                                     $titleDetailPart = $titleDetail->children($this->aNamespace);
@@ -440,6 +444,7 @@ class Chart
         }
         $layout = [];
         foreach ($details as $detailKey => $detail) {
+            $detail = Xlsx::testSimpleXml($detail);
             $layout[$detailKey] = self::getAttribute($detail, 'val', 'string');
         }
 
@@ -472,8 +477,8 @@ class Chart
                     $lineStyle = null;
                     $labelLayout = null;
                     $trendLines = [];
-                    /** @var SimpleXMLElement $seriesDetail */
                     foreach ($seriesDetails as $seriesKey => $seriesDetail) {
+                        $seriesDetail = Xlsx::testSimpleXml($seriesDetail);
                         switch ($seriesKey) {
                             case 'idx':
                                 $seriesIndex = self::getAttribute($seriesDetail, 'val', 'integer');
@@ -786,6 +791,7 @@ class Chart
         $pointCount = 0;
 
         foreach ($seriesValueSet as $seriesValueIdx => $seriesValue) {
+            $seriesValue = Xlsx::testSimpleXml($seriesValue);
             switch ($seriesValueIdx) {
                 case 'ptCount':
                     $pointCount = self::getAttribute($seriesValue, 'val', 'integer');
@@ -858,7 +864,6 @@ class Chart
     private function parseRichText(SimpleXMLElement $titleDetailPart): RichText
     {
         $value = new RichText();
-        $objText = null;
         $defaultFontSize = null;
         $defaultBold = null;
         $defaultItalic = null;
diff --git a/src/PhpSpreadsheet/Writer/Html.php b/src/PhpSpreadsheet/Writer/Html.php
index fca5ee89..0fef0f60 100644
--- a/src/PhpSpreadsheet/Writer/Html.php
+++ b/src/PhpSpreadsheet/Writer/Html.php
@@ -1461,9 +1461,6 @@ class Html extends BaseWriter
         foreach ($values as $cellAddress) {
             [$cell, $cssClass, $coordinate] = $this->generateRowCellCss($worksheet, $cellAddress, $row, $colNum);
 
-            $colSpan = 1;
-            $rowSpan = 1;
-
             // Cell Data
             $cellData = $this->generateRowCellData($worksheet, $cell, $cssClass, $cellType);
 
diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/AutoFilter2Test.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/AutoFilter2Test.php
index 06d6b562..7a264394 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xlsx/AutoFilter2Test.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/AutoFilter2Test.php
@@ -93,6 +93,7 @@ class AutoFilter2Test extends TestCase
         self::assertCount(1, $columns);
         $column = $columns['A'] ?? null;
         self::assertNotNull($column);
+        /** @scrutinizer ignore-call */
         $ruleset = $column->getRules();
         self::assertCount(1, $ruleset);
         $rule = $ruleset[0];

From ceb3bb2f38411d9efd7e606eaa27e4df0d325e68 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Fri, 16 Sep 2022 13:16:45 -0700
Subject: [PATCH 62/69] Changelog Catch-up (#3069)

Added 5 changes.
---
 CHANGELOG.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f15e9d5b..ad275147 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Implementation of the `ARRAYTOTEXT()` and `VALUETOTEXT()` Excel Functions
 - Support for [mitoteam/jpgraph](https://packagist.org/packages/mitoteam/jpgraph) implementation of
   JpGraph library to render charts added.
-- Charts: Add Gradients, Transparency, Hidden Axes, Rounded Corners, Trendlines.
+- Charts: Add Gradients, Transparency, Hidden Axes, Rounded Corners, Trendlines, Date Axes.
 
 ### Changed
 
@@ -49,6 +49,11 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Add setName Method for Chart [Issue #2991](https://github.com/PHPOffice/PhpSpreadsheet/issues/2991) [PR #3001](https://github.com/PHPOffice/PhpSpreadsheet/pull/3001)
 - Eliminate partial dependency on php-intl in StringHelper [Issue #2982](https://github.com/PHPOffice/PhpSpreadsheet/issues/2982) [PR #2994](https://github.com/PHPOffice/PhpSpreadsheet/pull/2994)
 - Minor changes for Pdf [Issue #2999](https://github.com/PHPOffice/PhpSpreadsheet/issues/2999) [PR #3002](https://github.com/PHPOffice/PhpSpreadsheet/pull/3002) [PR #3006](https://github.com/PHPOffice/PhpSpreadsheet/pull/3006)
+- Html/Pdf Do net set background color for cells using (default) nofill [PR #3016](https://github.com/PHPOffice/PhpSpreadsheet/pull/3016)
+- Add support for Date Axis to Chart [Issue #2967](https://github.com/PHPOffice/PhpSpreadsheet/issues/2967) [PR #3018](https://github.com/PHPOffice/PhpSpreadsheet/pull/3018)
+- Reconcile Differences Between Css and Excel for Cell Alignment [PR #3048](https://github.com/PHPOffice/PhpSpreadsheet/pull/3048)
+- R1C1 Format Internationalization and Better Support for Relative Offsets [Issue #1704](https://github.com/PHPOffice/PhpSpreadsheet/issues/1704) [PR #3052](https://github.com/PHPOffice/PhpSpreadsheet/pull/3052)
+- Minor Fix for Percentage Formatting [Issue #1929](https://github.com/PHPOffice/PhpSpreadsheet/issues/1929) [PR #3053](https://github.com/PHPOffice/PhpSpreadsheet/pull/3053)
 
 ## 1.24.1 - 2022-07-18
 

From c465b1c28390719831a889a9521951f0732a588f Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Sat, 17 Sep 2022 07:32:12 -0700
Subject: [PATCH 63/69] Minor Changes for Cygwin (#3070)

No source code changes. Mitoteam added a change to better accomodate Cygwin; pick up their new release. While testing, discovered one test that was already skipped on Windows and needs to be skipped on Cygwin as well.
---
 composer.json                                 |  2 +-
 composer.lock                                 | 14 +++++++-------
 tests/PhpSpreadsheetTests/Shared/FileTest.php |  6 ++++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/composer.json b/composer.json
index a4b033cd..ea7f57b1 100644
--- a/composer.json
+++ b/composer.json
@@ -81,7 +81,7 @@
         "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
         "dompdf/dompdf": "^1.0 || ^2.0",
         "friendsofphp/php-cs-fixer": "^3.2",
-        "mitoteam/jpgraph": "10.2.3",
+        "mitoteam/jpgraph": "10.2.4",
         "mpdf/mpdf": "8.1.1",
         "phpcompatibility/php-compatibility": "^9.3",
         "phpstan/phpstan": "^1.1",
diff --git a/composer.lock b/composer.lock
index 508733ee..af246273 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b5bdb9f96d18ce59557436521053fdd9",
+    "content-hash": "6d946e91cbe5d38e1cfb0208512ab981",
     "packages": [
         {
             "name": "ezyang/htmlpurifier",
@@ -1342,16 +1342,16 @@
         },
         {
             "name": "mitoteam/jpgraph",
-            "version": "10.2.3",
+            "version": "10.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mitoteam/jpgraph.git",
-                "reference": "21121535537e05c32e7964327b80746462a6057d"
+                "reference": "9ce4d106a89f120c7e220ea22205ef7956a7027b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mitoteam/jpgraph/zipball/21121535537e05c32e7964327b80746462a6057d",
-                "reference": "21121535537e05c32e7964327b80746462a6057d",
+                "url": "https://api.github.com/repos/mitoteam/jpgraph/zipball/9ce4d106a89f120c7e220ea22205ef7956a7027b",
+                "reference": "9ce4d106a89f120c7e220ea22205ef7956a7027b",
                 "shasum": ""
             },
             "require": {
@@ -1382,9 +1382,9 @@
             ],
             "support": {
                 "issues": "https://github.com/mitoteam/jpgraph/issues",
-                "source": "https://github.com/mitoteam/jpgraph/tree/10.2.3"
+                "source": "https://github.com/mitoteam/jpgraph/tree/10.2.4"
             },
-            "time": "2022-09-14T04:02:09+00:00"
+            "time": "2022-09-15T05:57:43+00:00"
         },
         {
             "name": "mpdf/mpdf",
diff --git a/tests/PhpSpreadsheetTests/Shared/FileTest.php b/tests/PhpSpreadsheetTests/Shared/FileTest.php
index ddc54b5e..e65ec810 100644
--- a/tests/PhpSpreadsheetTests/Shared/FileTest.php
+++ b/tests/PhpSpreadsheetTests/Shared/FileTest.php
@@ -87,12 +87,14 @@ class FileTest extends TestCase
 
     public function testNotReadable(): void
     {
-        if (PHP_OS_FAMILY === 'Windows') {
+        if (PHP_OS_FAMILY === 'Windows' || stristr(PHP_OS, 'CYGWIN') !== false) {
             self::markTestSkipped('chmod does not work reliably on Windows');
         }
         $this->tempfile = $temp = File::temporaryFileName();
         file_put_contents($temp, '');
-        chmod($temp, 0070);
+        if (chmod($temp, 0070) === false) {
+            self::markTestSkipped('chmod failed');
+        }
         self::assertFalse(File::testFileNoThrow($temp));
         $this->expectException(ReaderException::class);
         $this->expectExceptionMessage('for reading');

From 1746a5ac26bddcbce9521c0e8b91d2334da0b68e Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Sun, 18 Sep 2022 16:58:56 +0200
Subject: [PATCH 64/69] Ensure that the sqRef stored for a DataValidation is
 updated on insert/delete rows/columns, together with the
 DataValidationCollection value

---
 CHANGELOG.md                                      | 1 +
 src/PhpSpreadsheet/ReferenceHelper.php            | 5 +++--
 tests/PhpSpreadsheetTests/ReferenceHelperTest.php | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f15e9d5b..b6010729 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Fixed
 
+- Fix DataValidation sqRef when inserting/deleting rows/columns [Issue #3056](https://github.com/PHPOffice/PhpSpreadsheet/issues/3056) [PR #3074](https://github.com/PHPOffice/PhpSpreadsheet/pull/3074)
 - Named ranges not usable as anchors in OFFSET function [Issue #3013](https://github.com/PHPOffice/PhpSpreadsheet/issues/3013)
 - Fully flatten an array [Issue #2955](https://github.com/PHPOffice/PhpSpreadsheet/issues/2955) [PR #2956](https://github.com/PHPOffice/PhpSpreadsheet/pull/2956)
 - cellExists() and getCell() methods should support UTF-8 named cells [Issue #2987](https://github.com/PHPOffice/PhpSpreadsheet/issues/2987) [PR #2988](https://github.com/PHPOffice/PhpSpreadsheet/pull/2988)
diff --git a/src/PhpSpreadsheet/ReferenceHelper.php b/src/PhpSpreadsheet/ReferenceHelper.php
index 08a38b3b..822b754a 100644
--- a/src/PhpSpreadsheet/ReferenceHelper.php
+++ b/src/PhpSpreadsheet/ReferenceHelper.php
@@ -253,10 +253,11 @@ class ReferenceHelper
             ? uksort($aDataValidationCollection, [self::class, 'cellReverseSort'])
             : uksort($aDataValidationCollection, [self::class, 'cellSort']);
 
-        foreach ($aDataValidationCollection as $cellAddress => $value) {
+        foreach ($aDataValidationCollection as $cellAddress => $dataValidation) {
             $newReference = $this->updateCellReference($cellAddress);
             if ($cellAddress !== $newReference) {
-                $worksheet->setDataValidation($newReference, $value);
+                $dataValidation->setSqref($newReference);
+                $worksheet->setDataValidation($newReference, $dataValidation);
                 $worksheet->setDataValidation($cellAddress, null);
             }
         }
diff --git a/tests/PhpSpreadsheetTests/ReferenceHelperTest.php b/tests/PhpSpreadsheetTests/ReferenceHelperTest.php
index 2640d80c..fbd60155 100644
--- a/tests/PhpSpreadsheetTests/ReferenceHelperTest.php
+++ b/tests/PhpSpreadsheetTests/ReferenceHelperTest.php
@@ -311,6 +311,7 @@ class ReferenceHelperTest extends TestCase
 
         self::assertFalse($sheet->getCell($cellAddress)->hasDataValidation());
         self::assertTrue($sheet->getCell('E7')->hasDataValidation());
+        self::assertSame('E7', $sheet->getDataValidation('E7')->getSqref());
     }
 
     public function testDeleteRowsWithDataValidation(): void
@@ -326,6 +327,7 @@ class ReferenceHelperTest extends TestCase
 
         self::assertFalse($sheet->getCell($cellAddress)->hasDataValidation());
         self::assertTrue($sheet->getCell('E3')->hasDataValidation());
+        self::assertSame('E3', $sheet->getDataValidation('E3')->getSqref());
     }
 
     public function testDeleteColumnsWithDataValidation(): void
@@ -341,6 +343,7 @@ class ReferenceHelperTest extends TestCase
 
         self::assertFalse($sheet->getCell($cellAddress)->hasDataValidation());
         self::assertTrue($sheet->getCell('C5')->hasDataValidation());
+        self::assertSame('C5', $sheet->getDataValidation('C5')->getSqref());
     }
 
     public function testInsertColumnsWithDataValidation(): void
@@ -356,6 +359,7 @@ class ReferenceHelperTest extends TestCase
 
         self::assertFalse($sheet->getCell($cellAddress)->hasDataValidation());
         self::assertTrue($sheet->getCell('G5')->hasDataValidation());
+        self::assertSame('G5', $sheet->getDataValidation('G5')->getSqref());
     }
 
     private function setDataValidation(Worksheet $sheet, string $cellAddress): void

From 1f5ae85d193cac15dd6e23069adf40831dbe883c Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Sun, 18 Sep 2022 21:16:36 +0200
Subject: [PATCH 65/69] Minor documentation update

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index dd712bff..c3320d70 100644
--- a/README.md
+++ b/README.md
@@ -76,6 +76,8 @@ For Chart export, we support following packages, which you will also need to ins
    You can manually download the latest version that supports PHP 8 and above from [jpgraph.net](https://jpgraph.net/))
  - [mitoteam/jpgraph](https://packagist.org/packages/mitoteam/jpgraph) (fork with php 8.1 support)
 
+One or the other of these libraries is necessary if you want to generate HTML or PDF files that include charts.
+
 and then configure PhpSpreadsheet using:
 ```php
 Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\JpGraph::class); // to use jpgraph/jpgraph

From 579d2f9f6987960a5ab55b14ec994b79e4445ec1 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@demon-angel.eu>
Date: Sun, 18 Sep 2022 21:17:03 +0200
Subject: [PATCH 66/69] Minor documentation update

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c3320d70..ef04cd07 100644
--- a/README.md
+++ b/README.md
@@ -76,8 +76,6 @@ For Chart export, we support following packages, which you will also need to ins
    You can manually download the latest version that supports PHP 8 and above from [jpgraph.net](https://jpgraph.net/))
  - [mitoteam/jpgraph](https://packagist.org/packages/mitoteam/jpgraph) (fork with php 8.1 support)
 
-One or the other of these libraries is necessary if you want to generate HTML or PDF files that include charts.
-
 and then configure PhpSpreadsheet using:
 ```php
 Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\JpGraph::class); // to use jpgraph/jpgraph
@@ -85,6 +83,8 @@ Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\JpGraph::cla
 Settings::setChartRenderer(\PhpOffice\PhpSpreadsheet\Chart\Renderer\MtJpGraphRenderer::class); // to use mitoteam/jpgraph
 ```
 
+One or the other of these libraries is necessary if you want to generate HTML or PDF files that include charts.
+
 ## Documentation
 
 Read more about it, including install instructions, in the [official documentation](https://phpspreadsheet.readthedocs.io). Or check out the [API documentation](https://phpoffice.github.io/PhpSpreadsheet).

From a3921d20bc5c9a2ba6add05ad96fb41f873e36bd Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Mon, 19 Sep 2022 06:20:48 -0700
Subject: [PATCH 67/69] Upgrade ezyang/htmlpurifier for Php8.2 (#3073)

They have just issued a new release. Using that should eliminate the last of our Php8.2 unit test problems, so we will be able to change that to non-experimental when it is convenient for us.
---
 composer.json |  2 +-
 composer.lock | 26 ++++++++++++++++++--------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index ea7f57b1..858bd819 100644
--- a/composer.json
+++ b/composer.json
@@ -69,7 +69,7 @@
         "ext-xmlwriter": "*",
         "ext-zip": "*",
         "ext-zlib": "*",
-        "ezyang/htmlpurifier": "^4.13",
+        "ezyang/htmlpurifier": "4.15",
         "maennchen/zipstream-php": "^2.1",
         "markbaker/complex": "^3.0",
         "markbaker/matrix": "^3.0",
diff --git a/composer.lock b/composer.lock
index af246273..a5bc7d7b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,24 +4,34 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "6d946e91cbe5d38e1cfb0208512ab981",
+    "content-hash": "9a7fc81b4223c114749fc07401fb4b6f",
     "packages": [
         {
             "name": "ezyang/htmlpurifier",
-            "version": "v4.14.0",
+            "version": "v4.15.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ezyang/htmlpurifier.git",
-                "reference": "12ab42bd6e742c70c0a52f7b82477fcd44e64b75"
+                "reference": "8d9f4c9ec154922ff19690ffade9ed915b27a017"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/12ab42bd6e742c70c0a52f7b82477fcd44e64b75",
-                "reference": "12ab42bd6e742c70c0a52f7b82477fcd44e64b75",
+                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/8d9f4c9ec154922ff19690ffade9ed915b27a017",
+                "reference": "8d9f4c9ec154922ff19690ffade9ed915b27a017",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.2"
+                "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0"
+            },
+            "require-dev": {
+                "cerdic/css-tidy": "^1.7 || ^2.0",
+                "simpletest/simpletest": "dev-master"
+            },
+            "suggest": {
+                "cerdic/css-tidy": "If you want to use the filter 'Filter.ExtractStyleBlocks'.",
+                "ext-bcmath": "Used for unit conversion and imagecrash protection",
+                "ext-iconv": "Converts text to and from non-UTF-8 encodings",
+                "ext-tidy": "Used for pretty-printing HTML"
             },
             "type": "library",
             "autoload": {
@@ -53,9 +63,9 @@
             ],
             "support": {
                 "issues": "https://github.com/ezyang/htmlpurifier/issues",
-                "source": "https://github.com/ezyang/htmlpurifier/tree/v4.14.0"
+                "source": "https://github.com/ezyang/htmlpurifier/tree/v4.15.0"
             },
-            "time": "2021-12-25T01:21:49+00:00"
+            "time": "2022-09-18T06:23:57+00:00"
         },
         {
             "name": "maennchen/zipstream-php",

From a2b29841041ca1aa2c5d54e921b8f1dae0098b3f Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Mon, 19 Sep 2022 06:49:01 -0700
Subject: [PATCH 68/69] Document Charset Restriction for Html/Xml Reader
 (#3068)

Fix #1681, although probably not to the originator's satisfaction. Html and Xml readers will handle documents only with a charset of UTF-8. This PR documents that restriction. No change to source code; see the original issue for explanation.
---
 docs/topics/reading-and-writing-to-file.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/topics/reading-and-writing-to-file.md b/docs/topics/reading-and-writing-to-file.md
index 0bcc1909..55929e85 100644
--- a/docs/topics/reading-and-writing-to-file.md
+++ b/docs/topics/reading-and-writing-to-file.md
@@ -282,6 +282,7 @@ versions of Microsoft Excel.
 **Excel 2003 XML limitations** Please note that Excel 2003 XML format
 has some limits regarding to styling cells and handling large
 spreadsheets via PHP.
+Also, only files using charset UTF-8 are supported.
 
 ### \PhpOffice\PhpSpreadsheet\Reader\Xml
 
@@ -701,6 +702,7 @@ extension.
 
 **HTML limitations** Please note that HTML file format has some limits
 regarding to styling cells, number formatting, ...
+Also, only files using charset UTF-8 are supported.
 
 ### \PhpOffice\PhpSpreadsheet\Reader\Html
 

From 53e0828d49c3a330d15d19f94053db1dbb23be8a Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Tue, 20 Sep 2022 08:37:00 -0700
Subject: [PATCH 69/69] Sync composer.lock (#3075)

When I cloned this morning, composer gave me a message that the lock file was not up to date with the latest changes in composer.json. I do not understand why, but it suggested to run `composer update`, which I did. This led to a handful of problems with php-cs-fixer, all fixed with changes to doc-blocks, and phpstan (only Writer/Xls/Worksheet required a change to code). We would presumably have had these problems at the start of next month when dependabot did its thing, so fix them now.
---
 composer.lock                                 | 146 +++++++++---------
 phpstan-baseline.neon                         |   2 +-
 .../Calculation/Information/Value.php         |   2 +-
 src/PhpSpreadsheet/Cell/Cell.php              |  10 --
 src/PhpSpreadsheet/Style/Color.php            |   2 -
 src/PhpSpreadsheet/Worksheet/CellIterator.php |   1 +
 src/PhpSpreadsheet/Writer/Xls.php             |   2 -
 src/PhpSpreadsheet/Writer/Xls/Worksheet.php   |   8 +-
 .../Functions/LookupRef/FormulaTextTest.php   |   1 +
 .../PhpSpreadsheetTests/Helper/SampleTest.php |   2 +
 .../Worksheet/WorksheetTest.php               |   3 +
 11 files changed, 87 insertions(+), 92 deletions(-)

diff --git a/composer.lock b/composer.lock
index a5bc7d7b..22513999 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "9a7fc81b4223c114749fc07401fb4b6f",
+    "content-hash": "5062910e2e463ba84b1c753c58624ca9",
     "packages": [
         {
             "name": "ezyang/htmlpurifier",
@@ -1194,16 +1194,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.10.0",
+            "version": "v3.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "76d7da666e66d83a1dc27a9d1c625c80cc4ac1fe"
+                "reference": "7dcdea3f2f5f473464e835be9be55283ff8cfdc3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/76d7da666e66d83a1dc27a9d1c625c80cc4ac1fe",
-                "reference": "76d7da666e66d83a1dc27a9d1c625c80cc4ac1fe",
+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/7dcdea3f2f5f473464e835be9be55283ff8cfdc3",
+                "reference": "7dcdea3f2f5f473464e835be9be55283ff8cfdc3",
                 "shasum": ""
             },
             "require": {
@@ -1271,7 +1271,7 @@
             "description": "A tool to automatically fix PHP code style",
             "support": {
                 "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues",
-                "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.10.0"
+                "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.11.0"
             },
             "funding": [
                 {
@@ -1279,7 +1279,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-08-17T22:13:10+00:00"
+            "time": "2022-09-01T18:24:51+00:00"
         },
         {
             "name": "masterminds/html5",
@@ -1534,16 +1534,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.14.0",
+            "version": "v4.15.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1"
+                "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1",
-                "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
+                "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
                 "shasum": ""
             },
             "require": {
@@ -1584,9 +1584,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.14.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.1"
             },
-            "time": "2022-05-31T20:59:12+00:00"
+            "time": "2022-09-04T07:30:47+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -1957,16 +1957,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.8.2",
+            "version": "1.8.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "c53312ecc575caf07b0e90dee43883fdf90ca67c"
+                "reference": "f6598a5ff12ca4499a836815e08b4d77a2ddeb20"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c53312ecc575caf07b0e90dee43883fdf90ca67c",
-                "reference": "c53312ecc575caf07b0e90dee43883fdf90ca67c",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f6598a5ff12ca4499a836815e08b4d77a2ddeb20",
+                "reference": "f6598a5ff12ca4499a836815e08b4d77a2ddeb20",
                 "shasum": ""
             },
             "require": {
@@ -1990,9 +1990,13 @@
                 "MIT"
             ],
             "description": "PHPStan - PHP Static Analysis Tool",
+            "keywords": [
+                "dev",
+                "static analysis"
+            ],
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.8.2"
+                "source": "https://github.com/phpstan/phpstan/tree/1.8.5"
             },
             "funding": [
                 {
@@ -2003,16 +2007,12 @@
                     "url": "https://github.com/phpstan",
                     "type": "github"
                 },
-                {
-                    "url": "https://www.patreon.com/phpstan",
-                    "type": "patreon"
-                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-07-20T09:57:31+00:00"
+            "time": "2022-09-07T16:05:32+00:00"
         },
         {
             "name": "phpstan/phpstan-phpunit",
@@ -2068,16 +2068,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.16",
+            "version": "9.2.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "2593003befdcc10db5e213f9f28814f5aa8ac073"
+                "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2593003befdcc10db5e213f9f28814f5aa8ac073",
-                "reference": "2593003befdcc10db5e213f9f28814f5aa8ac073",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa94dc41e8661fe90c7316849907cba3007b10d8",
+                "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8",
                 "shasum": ""
             },
             "require": {
@@ -2133,7 +2133,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.16"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.17"
             },
             "funding": [
                 {
@@ -2141,7 +2141,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-08-20T05:26:47+00:00"
+            "time": "2022-08-30T12:24:04+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -2386,16 +2386,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.23",
+            "version": "9.5.24",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "888556852e7e9bbeeedb9656afe46118765ade34"
+                "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/888556852e7e9bbeeedb9656afe46118765ade34",
-                "reference": "888556852e7e9bbeeedb9656afe46118765ade34",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d0aa6097bef9fd42458a9b3c49da32c6ce6129c5",
+                "reference": "d0aa6097bef9fd42458a9b3c49da32c6ce6129c5",
                 "shasum": ""
             },
             "require": {
@@ -2424,7 +2424,7 @@
                 "sebastian/global-state": "^5.0.1",
                 "sebastian/object-enumerator": "^4.0.3",
                 "sebastian/resource-operations": "^3.0.3",
-                "sebastian/type": "^3.0",
+                "sebastian/type": "^3.1",
                 "sebastian/version": "^3.0.2"
             },
             "suggest": {
@@ -2468,7 +2468,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.23"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.24"
             },
             "funding": [
                 {
@@ -2480,7 +2480,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-08-22T14:01:36+00:00"
+            "time": "2022-08-30T07:42:16+00:00"
         },
         {
             "name": "psr/cache",
@@ -2901,16 +2901,16 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "4.0.6",
+            "version": "4.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "55f4261989e546dc112258c7a75935a81a7ce382"
+                "reference": "fa0f136dd2334583309d32b62544682ee972b51a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382",
-                "reference": "55f4261989e546dc112258c7a75935a81a7ce382",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a",
+                "reference": "fa0f136dd2334583309d32b62544682ee972b51a",
                 "shasum": ""
             },
             "require": {
@@ -2963,7 +2963,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8"
             },
             "funding": [
                 {
@@ -2971,7 +2971,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T15:49:45+00:00"
+            "time": "2022-09-14T12:41:17+00:00"
         },
         {
             "name": "sebastian/complexity",
@@ -3161,16 +3161,16 @@
         },
         {
             "name": "sebastian/exporter",
-            "version": "4.0.4",
+            "version": "4.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9"
+                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9",
-                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
+                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
                 "shasum": ""
             },
             "require": {
@@ -3226,7 +3226,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4"
+                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5"
             },
             "funding": [
                 {
@@ -3234,7 +3234,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-11-11T14:18:36+00:00"
+            "time": "2022-09-14T06:03:37+00:00"
         },
         {
             "name": "sebastian/global-state",
@@ -3589,16 +3589,16 @@
         },
         {
             "name": "sebastian/type",
-            "version": "3.0.0",
+            "version": "3.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad"
+                "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
-                "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
+                "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
                 "shasum": ""
             },
             "require": {
@@ -3610,7 +3610,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.2-dev"
                 }
             },
             "autoload": {
@@ -3633,7 +3633,7 @@
             "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/3.0.0"
+                "source": "https://github.com/sebastianbergmann/type/tree/3.2.0"
             },
             "funding": [
                 {
@@ -3641,7 +3641,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-03-15T09:54:48+00:00"
+            "time": "2022-09-12T14:47:03+00:00"
         },
         {
             "name": "sebastian/version",
@@ -3826,16 +3826,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v5.4.11",
+            "version": "v5.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "535846c7ee6bc4dd027ca0d93220601456734b10"
+                "reference": "c072aa8f724c3af64e2c7a96b796a4863d24dba1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/535846c7ee6bc4dd027ca0d93220601456734b10",
-                "reference": "535846c7ee6bc4dd027ca0d93220601456734b10",
+                "url": "https://api.github.com/repos/symfony/console/zipball/c072aa8f724c3af64e2c7a96b796a4863d24dba1",
+                "reference": "c072aa8f724c3af64e2c7a96b796a4863d24dba1",
                 "shasum": ""
             },
             "require": {
@@ -3905,7 +3905,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.4.11"
+                "source": "https://github.com/symfony/console/tree/v5.4.12"
             },
             "funding": [
                 {
@@ -3921,7 +3921,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-07-22T10:42:43+00:00"
+            "time": "2022-08-17T13:18:05+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -4156,16 +4156,16 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v5.4.11",
+            "version": "v5.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "6699fb0228d1bc35b12aed6dd5e7455457609ddd"
+                "reference": "2d67c1f9a1937406a9be3171b4b22250c0a11447"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/6699fb0228d1bc35b12aed6dd5e7455457609ddd",
-                "reference": "6699fb0228d1bc35b12aed6dd5e7455457609ddd",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/2d67c1f9a1937406a9be3171b4b22250c0a11447",
+                "reference": "2d67c1f9a1937406a9be3171b4b22250c0a11447",
                 "shasum": ""
             },
             "require": {
@@ -4200,7 +4200,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v5.4.11"
+                "source": "https://github.com/symfony/filesystem/tree/v5.4.12"
             },
             "funding": [
                 {
@@ -4216,7 +4216,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-07-20T13:00:38+00:00"
+            "time": "2022-08-02T13:48:16+00:00"
         },
         {
             "name": "symfony/finder",
@@ -5047,16 +5047,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v5.4.11",
+            "version": "v5.4.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "5eb661e49ad389e4ae2b6e4df8d783a8a6548322"
+                "reference": "2fc515e512d721bf31ea76bd02fe23ada4640058"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/5eb661e49ad389e4ae2b6e4df8d783a8a6548322",
-                "reference": "5eb661e49ad389e4ae2b6e4df8d783a8a6548322",
+                "url": "https://api.github.com/repos/symfony/string/zipball/2fc515e512d721bf31ea76bd02fe23ada4640058",
+                "reference": "2fc515e512d721bf31ea76bd02fe23ada4640058",
                 "shasum": ""
             },
             "require": {
@@ -5113,7 +5113,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v5.4.11"
+                "source": "https://github.com/symfony/string/tree/v5.4.12"
             },
             "funding": [
                 {
@@ -5129,7 +5129,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-07-24T16:15:25+00:00"
+            "time": "2022-08-12T17:03:11+00:00"
         },
         {
             "name": "tecnickcom/tcpdf",
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 3e2ccfc1..b0271f35 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -2912,7 +2912,7 @@ parameters:
 
 		-
 			message: "#^Cannot access offset 1 on array\\|false\\.$#"
-			count: 2
+			count: 1
 			path: src/PhpSpreadsheet/Writer/Xls/Worksheet.php
 
 		-
diff --git a/src/PhpSpreadsheet/Calculation/Information/Value.php b/src/PhpSpreadsheet/Calculation/Information/Value.php
index 0ac6b669..2e524db5 100644
--- a/src/PhpSpreadsheet/Calculation/Information/Value.php
+++ b/src/PhpSpreadsheet/Calculation/Information/Value.php
@@ -240,7 +240,7 @@ class Value
      *
      * @param null|mixed $value The value you want converted
      *
-     * @return number N converts values listed in the following table
+     * @return number|string N converts values listed in the following table
      *        If value is or refers to N returns
      *        A number            That number value
      *        A date              The Excel serialized number of that date
diff --git a/src/PhpSpreadsheet/Cell/Cell.php b/src/PhpSpreadsheet/Cell/Cell.php
index bc02fbf0..d4d793d7 100644
--- a/src/PhpSpreadsheet/Cell/Cell.php
+++ b/src/PhpSpreadsheet/Cell/Cell.php
@@ -313,8 +313,6 @@ class Cell
      * Set old calculated value (cached).
      *
      * @param mixed $originalValue Value
-     *
-     * @return Cell
      */
     public function setCalculatedValue($originalValue): self
     {
@@ -352,8 +350,6 @@ class Cell
      * Set cell data type.
      *
      * @param string $dataType see DataType::TYPE_*
-     *
-     * @return Cell
      */
     public function setDataType($dataType): self
     {
@@ -447,8 +443,6 @@ class Cell
 
     /**
      * Set Hyperlink.
-     *
-     * @return Cell
      */
     public function setHyperlink(?Hyperlink $hyperlink = null): self
     {
@@ -556,8 +550,6 @@ class Cell
 
     /**
      * Re-bind parent.
-     *
-     * @return Cell
      */
     public function rebindParent(Worksheet $parent): self
     {
@@ -650,8 +642,6 @@ class Cell
 
     /**
      * Set index to cellXf.
-     *
-     * @return Cell
      */
     public function setXfIndex(int $indexValue): self
     {
diff --git a/src/PhpSpreadsheet/Style/Color.php b/src/PhpSpreadsheet/Style/Color.php
index 9ab0c98f..922be803 100644
--- a/src/PhpSpreadsheet/Style/Color.php
+++ b/src/PhpSpreadsheet/Style/Color.php
@@ -387,8 +387,6 @@ class Color extends Supervisor
      * @param int $colorIndex Index entry point into the colour array
      * @param bool $background Flag to indicate whether default background or foreground colour
      *                                            should be returned if the indexed colour doesn't exist
-     *
-     * @return Color
      */
     public static function indexedColor($colorIndex, $background = false, ?array $palette = null): self
     {
diff --git a/src/PhpSpreadsheet/Worksheet/CellIterator.php b/src/PhpSpreadsheet/Worksheet/CellIterator.php
index 17286f9c..94877f66 100644
--- a/src/PhpSpreadsheet/Worksheet/CellIterator.php
+++ b/src/PhpSpreadsheet/Worksheet/CellIterator.php
@@ -8,6 +8,7 @@ use PhpOffice\PhpSpreadsheet\Collection\Cells;
 
 /**
  * @template TKey
+ *
  * @implements Iterator<TKey, Cell>
  */
 abstract class CellIterator implements Iterator
diff --git a/src/PhpSpreadsheet/Writer/Xls.php b/src/PhpSpreadsheet/Writer/Xls.php
index eadf0083..69457357 100644
--- a/src/PhpSpreadsheet/Writer/Xls.php
+++ b/src/PhpSpreadsheet/Writer/Xls.php
@@ -732,7 +732,6 @@ class Xls extends BaseWriter
             } elseif ($dataProp['type']['data'] == 0x1E) { // null-terminated string prepended by dword string length
                 // Null-terminated string
                 $dataProp['data']['data'] .= chr(0);
-                // @phpstan-ignore-next-line
                 ++$dataProp['data']['length'];
                 // Complete the string with null string for being a %4
                 $dataProp['data']['length'] = $dataProp['data']['length'] + ((4 - $dataProp['data']['length'] % 4) == 4 ? 0 : (4 - $dataProp['data']['length'] % 4));
@@ -750,7 +749,6 @@ class Xls extends BaseWriter
             } else {
                 $dataSection_Content .= $dataProp['data']['data'];
 
-                // @phpstan-ignore-next-line
                 $dataSection_Content_Offset += 4 + $dataProp['data']['length'];
             }
         }
diff --git a/src/PhpSpreadsheet/Writer/Xls/Worksheet.php b/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
index 847d772a..78fda517 100644
--- a/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
+++ b/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
@@ -2405,10 +2405,12 @@ class Worksheet extends BIFFwriter
             for ($i = 0; $i < $width; ++$i) {
                 /** @phpstan-ignore-next-line */
                 $color = imagecolorsforindex($image, imagecolorat($image, $i, $j));
-                foreach (['red', 'green', 'blue'] as $key) {
-                    $color[$key] = $color[$key] + (int) round((255 - $color[$key]) * $color['alpha'] / 127);
+                if ($color !== false) {
+                    foreach (['red', 'green', 'blue'] as $key) {
+                        $color[$key] = $color[$key] + (int) round((255 - $color[$key]) * $color['alpha'] / 127);
+                    }
+                    $data .= chr($color['blue']) . chr($color['green']) . chr($color['red']);
                 }
-                $data .= chr($color['blue']) . chr($color['green']) . chr($color['red']);
             }
             if (3 * $width % 4) {
                 $data .= str_repeat("\x00", 4 - 3 * $width % 4);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/FormulaTextTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/FormulaTextTest.php
index ccd689b1..6c91f3fc 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/FormulaTextTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/FormulaTextTest.php
@@ -11,6 +11,7 @@ class FormulaTextTest extends AllSetupTeardown
 {
     /**
      * @param mixed $value
+     *
      * @dataProvider providerFormulaText
      */
     public function testFormulaText(string $expectedResult, $value): void
diff --git a/tests/PhpSpreadsheetTests/Helper/SampleTest.php b/tests/PhpSpreadsheetTests/Helper/SampleTest.php
index 2195155f..384011e8 100644
--- a/tests/PhpSpreadsheetTests/Helper/SampleTest.php
+++ b/tests/PhpSpreadsheetTests/Helper/SampleTest.php
@@ -9,7 +9,9 @@ class SampleTest extends TestCase
 {
     /**
      * @runInSeparateProcess
+     *
      * @preserveGlobalState disabled
+     *
      * @dataProvider providerSample
      */
     public function testSample(string $sample): void
diff --git a/tests/PhpSpreadsheetTests/Worksheet/WorksheetTest.php b/tests/PhpSpreadsheetTests/Worksheet/WorksheetTest.php
index 17de5c32..30da1d75 100644
--- a/tests/PhpSpreadsheetTests/Worksheet/WorksheetTest.php
+++ b/tests/PhpSpreadsheetTests/Worksheet/WorksheetTest.php
@@ -31,6 +31,7 @@ class WorksheetTest extends TestCase
     /**
      * @param string $title
      * @param string $expectMessage
+     *
      * @dataProvider setTitleInvalidProvider
      */
     public function testSetTitleInvalid($title, $expectMessage): void
@@ -89,6 +90,7 @@ class WorksheetTest extends TestCase
     /**
      * @param string $codeName
      * @param string $expectMessage
+     *
      * @dataProvider setCodeNameInvalidProvider
      */
     public function testSetCodeNameInvalid($codeName, $expectMessage): void
@@ -153,6 +155,7 @@ class WorksheetTest extends TestCase
      * @param string $expectTitle
      * @param string $expectCell
      * @param string $expectCell2
+     *
      * @dataProvider extractSheetTitleProvider
      */
     public function testExtractSheetTitle($range, $expectTitle, $expectCell, $expectCell2): void