From 7ed96e0be15ef292bc05283b3f6122fc0f28968b Mon Sep 17 00:00:00 2001
From: Alban Duval <aduval@profideo.com>
Date: Mon, 25 May 2020 21:33:48 +0200
Subject: [PATCH 001/153] Calcualtion - DATEDIF - fix result for Y & YM units
 (#1466)

Bugfix for negative results and too small results

2000-02-02 => 2001-02-01
 > DATEDIF with Y unit: 0 year (returned -1 before fix)
 > DATEDIF with YM unit: 11 months (returned -1 before fix)
---
 src/PhpSpreadsheet/Calculation/DateTime.php | 30 +++++----------------
 tests/data/Calculation/DateTime/DATEDIF.php | 14 +++++++++-
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/PhpSpreadsheet/Calculation/DateTime.php b/src/PhpSpreadsheet/Calculation/DateTime.php
index d08ab543..19860794 100644
--- a/src/PhpSpreadsheet/Calculation/DateTime.php
+++ b/src/PhpSpreadsheet/Calculation/DateTime.php
@@ -668,30 +668,19 @@ class DateTime
         $endMonths = $PHPEndDateObject->format('n');
         $endYears = $PHPEndDateObject->format('Y');
 
+        $PHPDiffDateObject = $PHPEndDateObject->diff($PHPStartDateObject);
+
         switch ($unit) {
             case 'D':
                 $retVal = (int) $difference;
 
                 break;
             case 'M':
-                $retVal = (int) ($endMonths - $startMonths) + ((int) ($endYears - $startYears) * 12);
-                //    We're only interested in full months
-                if ($endDays < $startDays) {
-                    --$retVal;
-                }
+                $retVal = (int) 12 * $PHPDiffDateObject->format('%y') + $PHPDiffDateObject->format('%m');
 
                 break;
             case 'Y':
-                $retVal = (int) ($endYears - $startYears);
-                //    We're only interested in full months
-                if ($endMonths < $startMonths) {
-                    --$retVal;
-                } elseif (($endMonths == $startMonths) && ($endDays < $startDays)) {
-                    // Remove start month
-                    --$retVal;
-                    // Remove end month
-                    --$retVal;
-                }
+                $retVal = (int) $PHPDiffDateObject->format('%y');
 
                 break;
             case 'MD':
@@ -701,19 +690,12 @@ class DateTime
                     $adjustDays = $PHPEndDateObject->format('j');
                     $retVal += ($adjustDays - $startDays);
                 } else {
-                    $retVal = $endDays - $startDays;
+                    $retVal = (int) $PHPDiffDateObject->format('%d');
                 }
 
                 break;
             case 'YM':
-                $retVal = (int) ($endMonths - $startMonths);
-                if ($retVal < 0) {
-                    $retVal += 12;
-                }
-                //    We're only interested in full months
-                if ($endDays < $startDays) {
-                    --$retVal;
-                }
+                $retVal = (int) $PHPDiffDateObject->format('%m');
 
                 break;
             case 'YD':
diff --git a/tests/data/Calculation/DateTime/DATEDIF.php b/tests/data/Calculation/DateTime/DATEDIF.php
index d113d3aa..a6d2d761 100644
--- a/tests/data/Calculation/DateTime/DATEDIF.php
+++ b/tests/data/Calculation/DateTime/DATEDIF.php
@@ -393,6 +393,10 @@ return [
         1,
         '19-12-1960', '26-01-2012', 'YM',
     ],
+    [
+        11,
+        '19-12-1960', '26-11-1962', 'YM',
+    ],
     [
         38,
         '19-12-1960', '26-01-2012', 'YD',
@@ -402,7 +406,15 @@ return [
         '19-12-1960', '26-01-2012', 'MD',
     ],
     [
-        50,
+        0,
+        '19-12-1960', '12-12-1961', 'Y',
+    ],
+    [
+        1,
+        '19-12-1960', '12-12-1962', 'Y',
+    ],
+    [
+        51,
         '19-12-1960', '12-12-2012', 'Y',
     ],
     [

From b3b0b49b7ccadc899d776c3ff406fa741ff46a4f Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Mon, 25 May 2020 21:41:02 +0200
Subject: [PATCH 002/153] Updated changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22fd8c3d..fe1f159a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Several improvements in HTML writer [#1464](https://github.com/PHPOffice/PhpSpreadsheet/pull/1464)
 - Fix incorrect behaviour when saving XLSX file with drawings [#1462](https://github.com/PHPOffice/PhpSpreadsheet/pull/1462),
 - Fix Crash while trying setting a cell the value "123456\n" [#1476](https://github.com/PHPOffice/PhpSpreadsheet/pull/1481)
+- Improved DATEDIF() function and reduced errors for Y and YM units [#1466](https://github.com/PHPOffice/PhpSpreadsheet/pull/1466)
 
 ### Changed
 

From 8b2bba9bdb6ca5969730462626d7866bac4bb00c Mon Sep 17 00:00:00 2001
From: Mark Baker <mark@lange.demon.co.uk>
Date: Fri, 29 May 2020 21:53:28 +0200
Subject: [PATCH 003/153] Range operator tests (#1498)

* Fix intersection operator when working with named ranges
---
 .../Calculation/Calculation.php               | 10 ++--
 .../Calculation/Engine/RangeTest.php          | 53 ++++++++++++++++++-
 2 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/src/PhpSpreadsheet/Calculation/Calculation.php b/src/PhpSpreadsheet/Calculation/Calculation.php
index cdfe7b53..5aa309c5 100644
--- a/src/PhpSpreadsheet/Calculation/Calculation.php
+++ b/src/PhpSpreadsheet/Calculation/Calculation.php
@@ -3456,10 +3456,8 @@ class Calculation
             if ((isset(self::$comparisonOperators[$opCharacter])) && (strlen($formula) > $index) && (isset(self::$comparisonOperators[$formula[$index + 1]]))) {
                 $opCharacter .= $formula[++$index];
             }
-
             //    Find out if we're currently at the beginning of a number, variable, cell reference, function, parenthesis or operand
             $isOperandOrFunction = preg_match($regexpMatchString, substr($formula, $index), $match);
-
             if ($opCharacter == '-' && !$expectingOperator) {                //    Is it a negation instead of a minus?
                 //    Put a negation on the stack
                 $stack->push('Unary Operator', '~', null, $currentCondition, $currentOnlyIf, $currentOnlyIfNot);
@@ -3776,8 +3774,12 @@ class Calculation
                 }
                 //    If we're expecting an operator, but only have a space between the previous and next operands (and both are
                 //        Cell References) then we have an INTERSECTION operator
-                if (($expectingOperator) && (preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '.*/Ui', substr($formula, $index), $match)) &&
-                    ($output[count($output) - 1]['type'] == 'Cell Reference')) {
+                if (($expectingOperator) &&
+                    ((preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '.*/Ui', substr($formula, $index), $match)) &&
+                        ($output[count($output) - 1]['type'] == 'Cell Reference') ||
+                        (preg_match('/^' . self::CALCULATION_REGEXP_NAMEDRANGE . '.*/Ui', substr($formula, $index), $match)) &&
+                            ($output[count($output) - 1]['type'] == 'Named Range' || $output[count($output) - 1]['type'] == 'Value')
+                    )) {
                     while ($stack->count() > 0 &&
                         ($o2 = $stack->last()) &&
                         isset(self::$operators[$o2['value']]) &&
diff --git a/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php b/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php
index 84cac747..d1ad229b 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php
@@ -3,6 +3,7 @@
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Engine;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\NamedRange;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PHPUnit\Framework\TestCase;
 
@@ -28,7 +29,7 @@ class RangeTest extends TestCase
     /**
      * @dataProvider providerRangeEvaluation
      *
-     * @param mixed $formula
+     * @param string $formula
      * @param int $expectedResult
      */
     public function testRangeEvaluation($formula, $expectedResult): void
@@ -51,4 +52,54 @@ class RangeTest extends TestCase
             ['=SUM(A1:B2 B2:C3)', 5],
         ];
     }
+
+    /**
+     * @dataProvider providerNamedRangeEvaluation
+     *
+     * @param string $group1
+     * @param string $group2
+     * @param string $formula
+     * @param int $expectedResult
+     */
+    public function testNamedRangeEvaluation($group1, $group2, $formula, $expectedResult): void
+    {
+        $workSheet = $this->spreadSheet->getActiveSheet();
+        $this->spreadSheet->addNamedRange(new NamedRange('GROUP1', $workSheet, $group1));
+        $this->spreadSheet->addNamedRange(new NamedRange('GROUP2', $workSheet, $group2));
+
+        $workSheet->setCellValue('E1', $formula);
+
+        $actualRresult = $workSheet->getCell('E1')->getCalculatedValue();
+        self::assertSame($expectedResult, $actualRresult);
+    }
+
+    public function providerNamedRangeEvaluation()
+    {
+        return[
+            [
+                'A1:B3',
+                'A1:C2',
+                '=SUM(GROUP1,GROUP2)',
+                48,
+            ],
+            [
+                'A1:B3',
+                'A1:C2',
+                '=SUM(GROUP1 GROUP2)',
+                12,
+            ],
+            [
+                'A1:B2',
+                'B2:C3',
+                '=SUM(GROUP1,GROUP2)',
+                40,
+            ],
+            [
+                'A1:B2',
+                'B2:C3',
+                '=SUM(GROUP1 GROUP2)',
+                5,
+            ],
+        ];
+    }
 }

From edc411e6dd0ffbd7faf02aea9458f350d5a41574 Mon Sep 17 00:00:00 2001
From: Owen Leibman <eclipsechasers2@yahoo.com>
Date: Sat, 30 May 2020 21:27:35 -0700
Subject: [PATCH 004/153] Add ability to save edited Html/Pdf

We give users the ability to edit Html/Pdf, but it's a little cumbersome
to use the edited Html for an Html file, and difficult to use it
for a Pdf. I believe we could make it fairly painless in both cases
by allowing the user to set a callback to edit the generated Html.
This can be accomplished with fewer than a dozen lines of very simple code.
I think this would be easier than grabbing the Html in pieces,
editing it, and reassembling it. I think it would also be simpler
than an alternative I considered, namely the addition of a new method
(e.g. saveEditedHtml) to each of the Html and Pdf writers.

One edit that users might like to make when editing html is to add
fallback fonts, something that is not currently available in
PhpSpreadsheet, and might be difficult to add. A natural extension to
that idea would be the use of webfonts, something which is guaranteed
difficult to add. See samples/Basic/17b_Html for an example of this.

None of the PDF writers support webfonts yet. That doesn't mean they
won't do so in future, but, for now, samples/Pdf/21a_Pdf is a prosaic
example of something you could do with this callback. In fact, this
opens the door to letting the user replace the entire body with data
of their choosing, effectively allowing PhpSpreadsheet (where you can
set things like paper size and orientation) to be used as a front-end to
the Pdf processor without the user having to be be overly familiar with
the vagaries of the PDF processor. I think this is actually a pretty
nice idea. YMMV. See samples/Basic/21b_Pdf for an example.
---
 docs/topics/reading-and-writing-to-file.md    | 33 +++++++++++-
 samples/Basic/17b_Html.php                    | 27 ++++++++++
 samples/Pdf/21a_Pdf.php                       | 47 ++++++++++++++++
 samples/Pdf/21b_Pdf.php                       | 51 ++++++++++++++++++
 src/PhpSpreadsheet/Writer/Html.php            | 21 ++++++++
 .../Writer/Html/CallbackTest.php              | 53 +++++++++++++++++++
 6 files changed, 231 insertions(+), 1 deletion(-)
 create mode 100644 samples/Basic/17b_Html.php
 create mode 100644 samples/Pdf/21a_Pdf.php
 create mode 100644 samples/Pdf/21b_Pdf.php
 create mode 100644 tests/PhpSpreadsheetTests/Writer/Html/CallbackTest.php

diff --git a/docs/topics/reading-and-writing-to-file.md b/docs/topics/reading-and-writing-to-file.md
index 8f92e1f2..abd7c5f3 100644
--- a/docs/topics/reading-and-writing-to-file.md
+++ b/docs/topics/reading-and-writing-to-file.md
@@ -693,7 +693,7 @@ $sty = $writer->generateStyles(false); // do not write <style> and </style>
 $newstyle = <<<EOF
 <style type='text/css'>
 $sty
-html {
+body {
     background-color: yellow;
 }
 </style>
@@ -703,6 +703,31 @@ echo $writer->generateSheetData();
 echo $writer->generateHTMLFooter();
 ```
 
+#### Editing HTML During Save Via a Callback
+
+You can also add a callback function to edit the generated html
+before saving. For example, you could add a webfont
+(not currently supported for Pdf) as follows:
+
+``` php
+function webfont(string $html): string
+{
+    $linktag = <<<EOF
+<link href="https://fonts.googleapis.com/css2?family=Poiret+One&display=swap" rel="stylesheet" />
+
+EOF;
+    $html = preg_replace('@<style@', "$linktag<style", $html, 1);
+    $html = str_replace("font-family:'Calibri';",
+        "font-family:'Poiret One','Calibri',sans-serif;",
+        $html);
+
+    return $html;
+}
+$writer = new \PhpOffice\PhpSpreadsheet\Writer\Html($spreadsheet);
+$writer->setEditHtmlCallback('webfont');
+$writer->save($filename);
+```
+
 #### Writing UTF-8 HTML files
 
 A HTML file can be marked as UTF-8 by writing a BOM file header. This
@@ -841,6 +866,12 @@ $writer->setPreCalculateFormulas(false);
 $writer->save("05featuredemo.pdf");
 ```
 
+#### Editing Pdf During Save Via a Callback
+
+You can also add a callback function to edit the html used to
+generate the Pdf before saving.
+[See under Html](#editing-html-during-save-via-a-callback).
+
 #### Decimal and thousands separators
 
 See section `\PhpOffice\PhpSpreadsheet\Writer\Csv` how to control the
diff --git a/samples/Basic/17b_Html.php b/samples/Basic/17b_Html.php
new file mode 100644
index 00000000..05649314
--- /dev/null
+++ b/samples/Basic/17b_Html.php
@@ -0,0 +1,27 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Writer\Html;
+
+require __DIR__ . '/../Header.php';
+$spreadsheet = require __DIR__ . '/../templates/sampleSpreadsheet.php';
+
+$filename = $helper->getFilename(__FILE__, 'html');
+$writer = new Html($spreadsheet);
+
+function webfont(string $html): string
+{
+    $linktag = <<<EOF
+<link href="https://fonts.googleapis.com/css2?family=Poiret+One&display=swap" rel="stylesheet" />
+
+EOF;
+    $html = preg_replace('@<style@', "$linktag<style", $html, 1);
+    $html = str_replace("font-family:'Calibri';", "font-family:'Poiret One','Calibri',sans-serif;", $html);
+
+    return $html;
+}
+
+$callStartTime = microtime(true);
+$writer->setEmbedImages(true);
+$writer->setEditHtmlCallback('webfont');
+$writer->save($filename);
+$helper->logWrite($writer, $filename, $callStartTime);
diff --git a/samples/Pdf/21a_Pdf.php b/samples/Pdf/21a_Pdf.php
new file mode 100644
index 00000000..c4dc2c48
--- /dev/null
+++ b/samples/Pdf/21a_Pdf.php
@@ -0,0 +1,47 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
+use PhpOffice\PhpSpreadsheet\Writer\Pdf\Dompdf;
+use PhpOffice\PhpSpreadsheet\Writer\Pdf\Mpdf;
+use PhpOffice\PhpSpreadsheet\Writer\Pdf\Tcpdf;
+
+require __DIR__ . '/../Header.php';
+$spreadsheet = require __DIR__ . '/../templates/sampleSpreadsheet.php';
+
+$helper->log('Hide grid lines');
+$spreadsheet->getActiveSheet()->setShowGridLines(false);
+
+$helper->log('Set orientation to landscape');
+$spreadsheet->getActiveSheet()->getPageSetup()->setOrientation(PageSetup::ORIENTATION_LANDSCAPE);
+
+function yellowBody(string $html): string
+{
+    $newstyle = <<<EOF
+<style type='text/css'>
+body {
+background-color: yellow;
+}
+</style>
+
+EOF;
+
+    return preg_replace('@</head>@', "$newstyle</head>", $html);
+}
+
+$helper->log('Write to Dompdf');
+$writer = new Dompdf($spreadsheet);
+$filename = $helper->getFileName('21a_Pdf_dompdf.xlsx', 'pdf');
+$writer->setEditHtmlCallback('yellowBody');
+$writer->save($filename);
+
+$helper->log('Write to Mpdf');
+$writer = new Mpdf($spreadsheet);
+$filename = $helper->getFileName('21a_Pdf_mpdf.xlsx', 'pdf');
+$writer->setEditHtmlCallback('yellowBody');
+$writer->save($filename);
+
+$helper->log('Write to Tcpdf');
+$writer = new Tcpdf($spreadsheet);
+$filename = $helper->getFileName('21a_Pdf_tcpdf.xlsx', 'pdf');
+$writer->setEditHtmlCallback('yellowBody');
+$writer->save($filename);
diff --git a/samples/Pdf/21b_Pdf.php b/samples/Pdf/21b_Pdf.php
new file mode 100644
index 00000000..142fc344
--- /dev/null
+++ b/samples/Pdf/21b_Pdf.php
@@ -0,0 +1,51 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
+use PhpOffice\PhpSpreadsheet\Writer\Pdf\Dompdf;
+use PhpOffice\PhpSpreadsheet\Writer\Pdf\Mpdf;
+use PhpOffice\PhpSpreadsheet\Writer\Pdf\Tcpdf;
+
+function replaceBody(string $html): string
+{
+    $lorem = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.';
+    $bodystring = '@<body>.*</body>@ms';
+    $bodyrepl = <<<EOF
+<body>
+<h1>Serif</h1>
+<p style='font-family: serif; font-size: 12pt;'>$lorem</p>
+<h1>Sans-Serif</h1>
+<p style='font-family: sans-serif; font-size: 12pt;'>$lorem</p>
+<h1>Monospace</h1>
+<p style='font-family: monospace; font-size: 12pt;'>$lorem</p>
+</body>
+EOF;
+
+    return preg_replace($bodystring, $bodyrepl, $html);
+}
+
+require __DIR__ . '/../Header.php';
+$spreadsheet = require __DIR__ . '/../templates/sampleSpreadsheet.php';
+
+$helper->log('Hide grid lines');
+$spreadsheet->getActiveSheet()->setShowGridLines(false);
+
+$helper->log('Set orientation to landscape');
+$spreadsheet->getActiveSheet()->getPageSetup()->setOrientation(PageSetup::ORIENTATION_LANDSCAPE);
+
+$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);
+$filename = $helper->getFileName('21b_Pdf_mpdf.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 c9f2d7cb..963b02d7 100644
--- a/src/PhpSpreadsheet/Writer/Html.php
+++ b/src/PhpSpreadsheet/Writer/Html.php
@@ -131,6 +131,13 @@ class Html extends BaseWriter
      */
     private $generateSheetNavigationBlock = true;
 
+    /**
+     * Callback for editing generated html.
+     *
+     * @var callable
+     */
+    protected $editHtmlCallback = '';
+
     /**
      * Create a new HTML.
      */
@@ -190,6 +197,10 @@ class Html extends BaseWriter
 
         // Write footer
         $html .= $this->generateHTMLFooter();
+        $cbk = $this->editHtmlCallback;
+        if ($cbk) {
+            $html = $cbk($html);
+        }
 
         Calculation::setArrayReturnType($saveArrayReturnType);
         Calculation::getInstance($this->spreadsheet)->getDebugLog()->setWriteDebugLog($saveDebugLog);
@@ -197,6 +208,16 @@ class Html extends BaseWriter
         return $html;
     }
 
+    public function setEditHtmlCallback(callable $cbk): void
+    {
+        $this->editHtmlCallback = $cbk;
+    }
+
+    public function resetEditHtmlCallback(): void
+    {
+        $this->editHtmlCallback = '';
+    }
+
     const VALIGN_ARR = [
         Alignment::VERTICAL_BOTTOM => 'bottom',
         Alignment::VERTICAL_TOP => 'top',
diff --git a/tests/PhpSpreadsheetTests/Writer/Html/CallbackTest.php b/tests/PhpSpreadsheetTests/Writer/Html/CallbackTest.php
new file mode 100644
index 00000000..f712419c
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Writer/Html/CallbackTest.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Writer\Html;
+
+use PhpOffice\PhpSpreadsheet\Shared\File;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Html;
+use PhpOffice\PhpSpreadsheetTests\Functional;
+
+class CallbackTest extends Functional\AbstractFunctional
+{
+    public function yellowBody(string $html): string
+    {
+        $newstyle = <<<EOF
+<style type='text/css'>
+body {
+    background-color: yellow;
+}
+</style>
+
+EOF;
+
+        return preg_replace('@</head>@', "$newstyle</head>", $html);
+    }
+
+    public function testSetAndReset(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->setCellValue('A1', '1');
+
+        $writer = new Html($spreadsheet);
+        $html1 = $writer->generateHTMLall();
+        $writer->setEditHtmlCallback([$this, 'yellowBody']);
+        $html2 = $writer->generateHTMLall();
+        $writer->resetEditHtmlCallback();
+        $html3 = $writer->generateHTMLall();
+
+        self::assertFalse(strpos($html1, 'background-color: yellow'));
+        self::assertNotFalse(strpos($html2, 'background-color: yellow'));
+        self::assertFalse(strpos($html3, 'background-color: yellow'));
+        self::assertEquals($html3, $html1);
+
+        $writer->setEditHtmlCallback([$this, 'yellowBody']);
+        $oufil = tempnam(File::sysGetTempDir(), 'phpspreadsheet-test');
+        $writer->save($oufil);
+        $html4 = file_get_contents($oufil);
+        unlink($oufil);
+        self::assertNotFalse(strpos($html4, 'background-color: yellow'));
+
+        $this->writeAndReload($spreadsheet, 'Html');
+    }
+}

From c434e9b13735f82aa76901c52ba5339712fbaf0e Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Sun, 31 May 2020 15:58:57 +0900
Subject: [PATCH 005/153] Stricter typing for mergeCells

Closes #1494
---
 CHANGELOG.md                               | 1 +
 src/PhpSpreadsheet/Worksheet/Worksheet.php | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe1f159a..75eb393c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Fix incorrect behaviour when saving XLSX file with drawings [#1462](https://github.com/PHPOffice/PhpSpreadsheet/pull/1462),
 - Fix Crash while trying setting a cell the value "123456\n" [#1476](https://github.com/PHPOffice/PhpSpreadsheet/pull/1481)
 - Improved DATEDIF() function and reduced errors for Y and YM units [#1466](https://github.com/PHPOffice/PhpSpreadsheet/pull/1466)
+- Stricter typing for mergeCells [#1494](https://github.com/PHPOffice/PhpSpreadsheet/pull/1494)
 
 ### Changed
 
diff --git a/src/PhpSpreadsheet/Worksheet/Worksheet.php b/src/PhpSpreadsheet/Worksheet/Worksheet.php
index 1ed77e05..e2b0dd87 100644
--- a/src/PhpSpreadsheet/Worksheet/Worksheet.php
+++ b/src/PhpSpreadsheet/Worksheet/Worksheet.php
@@ -187,7 +187,7 @@ class Worksheet implements IComparable
     /**
      * Collection of merged cell ranges.
      *
-     * @var array
+     * @var string[]
      */
     private $mergeCells = [];
 
@@ -1747,7 +1747,7 @@ class Worksheet implements IComparable
     /**
      * Get merge cells array.
      *
-     * @return array[]
+     * @return string[]
      */
     public function getMergeCells()
     {
@@ -1758,6 +1758,8 @@ class Worksheet implements IComparable
      * Set merge cells array for the entire sheet. Use instead mergeCells() to merge
      * a single cell range.
      *
+     * @param string[] $pValue
+     *
      * @return $this
      */
     public function setMergeCells(array $pValue)

From dfa6f7717801e6738bb266ef3fac25fd8ad5294d Mon Sep 17 00:00:00 2001
From: Reijn <reijnnn@gmail.com>
Date: Sat, 23 May 2020 20:01:03 +0300
Subject: [PATCH 006/153] Add support protection of worksheet by a specific
 hash algorithm

---
 CHANGELOG.md                                 |   1 +
 src/PhpSpreadsheet/Reader/Xlsx.php           |   4 +
 src/PhpSpreadsheet/Shared/PasswordHasher.php |  91 +++++++++++++-
 src/PhpSpreadsheet/Worksheet/Protection.php  | 124 +++++++++++++++++++
 src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php |  16 +++
 tests/data/Shared/PasswordHashes.php         |  26 ++++
 6 files changed, 261 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75eb393c..dd24e146 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 - Support writing to streams in all writers [#1292](https://github.com/PHPOffice/PhpSpreadsheet/issues/1292)
 - Support CSV files with data wrapping a lot of lines [#1468](https://github.com/PHPOffice/PhpSpreadsheet/pull/1468)
+- Support protection of worksheet by a specific hash algorithm
 
 ### Fixed
 
diff --git a/src/PhpSpreadsheet/Reader/Xlsx.php b/src/PhpSpreadsheet/Reader/Xlsx.php
index 797e59ea..f9f20bdd 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx.php
@@ -765,6 +765,10 @@ class Xlsx extends BaseReader
 
                             if (!$this->readDataOnly && $xmlSheet && $xmlSheet->sheetProtection) {
                                 $docSheet->getProtection()->setPassword((string) $xmlSheet->sheetProtection['password'], true);
+                                $docSheet->getProtection()->setAlgorithmName((string) $xmlSheet->sheetProtection['algorithmName']);
+                                $docSheet->getProtection()->setHashValue((string) $xmlSheet->sheetProtection['hashValue']);
+                                $docSheet->getProtection()->setSaltValue((string) $xmlSheet->sheetProtection['saltValue']);
+                                $docSheet->getProtection()->setSpinCount((int) $xmlSheet->sheetProtection['spinCount']);
                                 if ($xmlSheet->protectedRanges->protectedRange) {
                                     foreach ($xmlSheet->protectedRanges->protectedRange as $protectedRange) {
                                         $docSheet->protectCells((string) $protectedRange['sqref'], (string) $protectedRange['password'], true);
diff --git a/src/PhpSpreadsheet/Shared/PasswordHasher.php b/src/PhpSpreadsheet/Shared/PasswordHasher.php
index 9b0080b9..f3c2d3e1 100644
--- a/src/PhpSpreadsheet/Shared/PasswordHasher.php
+++ b/src/PhpSpreadsheet/Shared/PasswordHasher.php
@@ -4,6 +4,51 @@ namespace PhpOffice\PhpSpreadsheet\Shared;
 
 class PasswordHasher
 {
+    const ALGORITHM_MD2 = 'MD2';
+    const ALGORITHM_MD4 = 'MD4';
+    const ALGORITHM_MD5 = 'MD5';
+    const ALGORITHM_SHA_1 = 'SHA-1';
+    const ALGORITHM_SHA_256 = 'SHA-256';
+    const ALGORITHM_SHA_384 = 'SHA-384';
+    const ALGORITHM_SHA_512 = 'SHA-512';
+    const ALGORITHM_RIPEMD_128 = 'RIPEMD-128';
+    const ALGORITHM_RIPEMD_160 = 'RIPEMD-160';
+    const ALGORITHM_WHIRLPOOL = 'WHIRLPOOL';
+
+    /**
+     * Mapping between algorithm name in Excel and algorithm name in PHP.
+     *
+     * @var array
+     */
+    private static $algorithmArray = [
+        self::ALGORITHM_MD2 => 'md2',
+        self::ALGORITHM_MD4 => 'md4',
+        self::ALGORITHM_MD5 => 'md5',
+        self::ALGORITHM_SHA_1 => 'sha1',
+        self::ALGORITHM_SHA_256 => 'sha256',
+        self::ALGORITHM_SHA_384 => 'sha384',
+        self::ALGORITHM_SHA_512 => 'sha512',
+        self::ALGORITHM_RIPEMD_128 => 'ripemd128',
+        self::ALGORITHM_RIPEMD_160 => 'ripemd160',
+        self::ALGORITHM_WHIRLPOOL => 'whirlpool',
+    ];
+
+    /**
+     * Get algorithm from self::$algorithmArray.
+     *
+     * @param string $pAlgorithmName
+     *
+     * @return string
+     */
+    private static function getAlgorithm($pAlgorithmName)
+    {
+        if (array_key_exists($pAlgorithmName, self::$algorithmArray)) {
+            return self::$algorithmArray[$pAlgorithmName];
+        }
+
+        return '';
+    }
+
     /**
      * Create a password hash from a given string.
      *
@@ -15,7 +60,7 @@ class PasswordHasher
      *
      * @return string Hashed password
      */
-    public static function hashPassword($pPassword)
+    public static function defaultHashPassword($pPassword)
     {
         $password = 0x0000;
         $charPos = 1; // char position
@@ -34,4 +79,48 @@ class PasswordHasher
 
         return strtoupper(dechex($password));
     }
+
+    /**
+     * Create a password hash from a given string by a specific algorithm.
+     *
+     * 2.4.2.4 ISO Write Protection Method
+     *
+     * @see https://docs.microsoft.com/en-us/openspecs/office_file_formats/ms-offcrypto/1357ea58-646e-4483-92ef-95d718079d6f
+     *
+     * @param string $pPassword Password to hash
+     * @param string $pAlgorithmName Hash algorithm used to compute the password hash value
+     * @param string $pSaltValue Pseudorandom string
+     * @param string $pSpinCount Number of times to iterate on a hash of a password
+     *
+     * @return string Hashed password
+     */
+    public static function hashPassword($pPassword, $pAlgorithmName = '', $pSaltValue = '', $pSpinCount = 10000)
+    {
+        $algorithmName = self::getAlgorithm($pAlgorithmName);
+        if (!$pAlgorithmName) {
+            return self::defaultHashPassword($pPassword);
+        }
+
+        $saltValue = base64_decode($pSaltValue);
+        $password = mb_convert_encoding($pPassword, 'UCS-2LE', 'UTF-8');
+
+        $hashValue = hash($algorithmName, $saltValue . $password, true);
+        for ($i = 0; $i < $pSpinCount; ++$i) {
+            $hashValue = hash($algorithmName, $hashValue . pack('L', $i), true);
+        }
+
+        return base64_encode($hashValue);
+    }
+
+    /**
+     * Create a pseudorandom string.
+     *
+     * @param int $pSize Length of the output string in bytes
+     *
+     * @return string Pseudorandom string
+     */
+    public static function generateSalt($pSize = 16)
+    {
+        return base64_encode(random_bytes($pSize));
+    }
 }
diff --git a/src/PhpSpreadsheet/Worksheet/Protection.php b/src/PhpSpreadsheet/Worksheet/Protection.php
index 2fd3e919..3566e255 100644
--- a/src/PhpSpreadsheet/Worksheet/Protection.php
+++ b/src/PhpSpreadsheet/Worksheet/Protection.php
@@ -125,6 +125,34 @@ class Protection
      */
     private $password = '';
 
+    /**
+     * Algorithm name.
+     *
+     * @var string
+     */
+    private $algorithmName = '';
+
+    /**
+     * Hash value.
+     *
+     * @var string
+     */
+    private $hashValue = '';
+
+    /**
+     * Salt value.
+     *
+     * @var string
+     */
+    private $saltValue = '';
+
+    /**
+     * Spin count.
+     *
+     * @var int
+     */
+    private $spinCount = '';
+
     /**
      * Create a new Protection.
      */
@@ -569,6 +597,102 @@ class Protection
         return $this;
     }
 
+    /**
+     * Get AlgorithmName.
+     *
+     * @return string
+     */
+    public function getAlgorithmName()
+    {
+        return $this->algorithmName;
+    }
+
+    /**
+     * Set AlgorithmName.
+     *
+     * @param string $pValue
+     *
+     * @return $this
+     */
+    public function setAlgorithmName($pValue)
+    {
+        $this->algorithmName = $pValue;
+
+        return $this;
+    }
+
+    /**
+     * Get HashValue.
+     *
+     * @return string
+     */
+    public function getHashValue()
+    {
+        return $this->hashValue;
+    }
+
+    /**
+     * Set HashValue.
+     *
+     * @param string $pValue
+     *
+     * @return $this
+     */
+    public function setHashValue($pValue)
+    {
+        $this->hashValue = $pValue;
+
+        return $this;
+    }
+
+    /**
+     * Get SaltValue.
+     *
+     * @return string
+     */
+    public function getSaltValue()
+    {
+        return $this->saltValue;
+    }
+
+    /**
+     * Set SaltValue.
+     *
+     * @param string $pValue
+     *
+     * @return $this
+     */
+    public function setSaltValue($pValue)
+    {
+        $this->saltValue = $pValue;
+
+        return $this;
+    }
+
+    /**
+     * Get SpinCount.
+     *
+     * @return int
+     */
+    public function getSpinCount()
+    {
+        return $this->spinCount;
+    }
+
+    /**
+     * Set SpinCount.
+     *
+     * @param int $pValue
+     *
+     * @return $this
+     */
+    public function setSpinCount($pValue)
+    {
+        $this->spinCount = $pValue;
+
+        return $this;
+    }
+
     /**
      * Implement PHP __clone to create a deep clone, not just a shallow copy.
      */
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php b/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
index 3d47eeaa..803ade8a 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
@@ -424,6 +424,22 @@ class Worksheet extends WriterPart
             $objWriter->writeAttribute('password', $pSheet->getProtection()->getPassword());
         }
 
+        if ($pSheet->getProtection()->getHashValue() !== '') {
+            $objWriter->writeAttribute('hashValue', $pSheet->getProtection()->getHashValue());
+        }
+
+        if ($pSheet->getProtection()->getAlgorithmName() !== '') {
+            $objWriter->writeAttribute('algorithmName', $pSheet->getProtection()->getAlgorithmName());
+        }
+
+        if ($pSheet->getProtection()->getSaltValue() !== '') {
+            $objWriter->writeAttribute('saltValue', $pSheet->getProtection()->getSaltValue());
+        }
+
+        if ($pSheet->getProtection()->getSpinCount() !== '') {
+            $objWriter->writeAttribute('spinCount', $pSheet->getProtection()->getSpinCount());
+        }
+
         $objWriter->writeAttribute('sheet', ($pSheet->getProtection()->getSheet() ? 'true' : 'false'));
         $objWriter->writeAttribute('objects', ($pSheet->getProtection()->getObjects() ? 'true' : 'false'));
         $objWriter->writeAttribute('scenarios', ($pSheet->getProtection()->getScenarios() ? 'true' : 'false'));
diff --git a/tests/data/Shared/PasswordHashes.php b/tests/data/Shared/PasswordHashes.php
index b4f348ca..34c25cef 100644
--- a/tests/data/Shared/PasswordHashes.php
+++ b/tests/data/Shared/PasswordHashes.php
@@ -25,4 +25,30 @@ return [
         'CE4B',
         '',
     ],
+    [
+        'O6EXRLpLEDNJDL/AzYtnnA4O4bY=',
+        '',
+        'SHA-1',
+    ],
+    [
+        'GYvlIMljDI1Czc4jfWrGaxU5pxl9n5Og0KUzyAfYxwk=',
+        'PhpSpreadsheet',
+        'SHA-256',
+        'Php_salt',
+        1000,
+    ],
+    [
+        'sSHdxQv9qgpkr4LDT0bYQxM9hOQJFRhJ4D752/NHQtDDR1EVy67NCEW9cPd6oWvCoBGd96MqKpuma1A7pN1nEA==',
+        'Mark Baker',
+        'SHA-512',
+        'Mark_salt',
+        10000,
+    ],
+    [
+        'r9KVLLCKIYOILvE2rcby+g==',
+        '!+&=()~§±æþ',
+        'MD5',
+        'Symbols_salt',
+        100000,
+    ],
 ];

From 1eaf40be6940a1b639b918a1748a3eafcef080f5 Mon Sep 17 00:00:00 2001
From: Reijn <reijnnn@gmail.com>
Date: Sun, 24 May 2020 11:26:17 +0300
Subject: [PATCH 007/153] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd24e146..28aed385 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 - Support writing to streams in all writers [#1292](https://github.com/PHPOffice/PhpSpreadsheet/issues/1292)
 - Support CSV files with data wrapping a lot of lines [#1468](https://github.com/PHPOffice/PhpSpreadsheet/pull/1468)
-- Support protection of worksheet by a specific hash algorithm
+- Support protection of worksheet by a specific hash algorithm [#1485](https://github.com/PHPOffice/PhpSpreadsheet/pull/1485)
 
 ### Fixed
 

From b9a59660d01c83ff8cbb1667fd4fb3d98c47c36d Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Sun, 31 May 2020 20:22:23 +0900
Subject: [PATCH 008/153] Password and hash are exclusive

As specified in https://docs.microsoft.com/en-us/openspecs/office_standards/ms-xlsx/85f5567f-2599-41ad-ae26-8cfab23ce754
password and hashValue are exlusive and thus should be treated
transparently with a single API in our model.
---
 docs/topics/recipes.md                        |  76 ++++++++---
 src/PhpSpreadsheet/Reader/Xlsx.php            |  38 ++++--
 src/PhpSpreadsheet/Shared/PasswordHasher.php  | 106 ++++++----------
 src/PhpSpreadsheet/Worksheet/Protection.php   | 120 ++++++++----------
 src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php  |  61 ++++-----
 .../Worksheet/ProtectionTest.php              |  39 ++++++
 6 files changed, 244 insertions(+), 196 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Worksheet/ProtectionTest.php

diff --git a/docs/topics/recipes.md b/docs/topics/recipes.md
index b0956b6e..9f8282b9 100644
--- a/docs/topics/recipes.md
+++ b/docs/topics/recipes.md
@@ -919,29 +919,53 @@ disallow inserting rows on a specific sheet, disallow sorting, ...
 - Cell: offers the option to lock/unlock a cell as well as show/hide
 the internal formula.
 
+**Make sure you enable worksheet protection if you need any of the
+worksheet or cell protection features!** This can be done using the following
+code:
+
+``` php
+$spreadsheet->getActiveSheet()->getProtection()->setSheet(true);
+```
+
+### Document
+
 An example on setting document security:
 
 ``` php
-$spreadsheet->getSecurity()->setLockWindows(true);
-$spreadsheet->getSecurity()->setLockStructure(true);
-$spreadsheet->getSecurity()->setWorkbookPassword("PhpSpreadsheet");
+$security = $spreadsheet->getSecurity();
+$security->setLockWindows(true);
+$security->setLockStructure(true);
+$security->setWorkbookPassword("PhpSpreadsheet");
 ```
 
+### Worksheet
+
 An example on setting worksheet security:
 
 ``` php
-$spreadsheet->getActiveSheet()
-    ->getProtection()->setPassword('PhpSpreadsheet');
-$spreadsheet->getActiveSheet()
-    ->getProtection()->setSheet(true);
-$spreadsheet->getActiveSheet()
-    ->getProtection()->setSort(true);
-$spreadsheet->getActiveSheet()
-    ->getProtection()->setInsertRows(true);
-$spreadsheet->getActiveSheet()
-    ->getProtection()->setFormatCells(true);
+$protection = $spreadsheet->getActiveSheet()->getProtection();
+$protection->setPassword('PhpSpreadsheet');
+$protection->setSheet(true);
+$protection->setSort(true);
+$protection->setInsertRows(true);
+$protection->setFormatCells(true);
 ```
 
+If writing Xlsx files you can specify the algorithm used to hash the password
+before calling `setPassword()` like so:
+
+```php
+$protection = $spreadsheet->getActiveSheet()->getProtection();
+$protection->setAlgorithm(Protection::ALGORITHM_SHA_512);
+$protection->setSpinCount(20000);
+$protection->setPassword('PhpSpreadsheet');
+```
+
+The salt should **not** be set manually and will be automatically generated
+when setting a new password.
+
+### Cell
+
 An example on setting cell security:
 
 ``` php
@@ -950,14 +974,30 @@ $spreadsheet->getActiveSheet()->getStyle('B1')
     ->setLocked(\PhpOffice\PhpSpreadsheet\Style\Protection::PROTECTION_UNPROTECTED);
 ```
 
-**Make sure you enable worksheet protection if you need any of the
-worksheet protection features!** This can be done using the following
-code:
+## Reading protected spreadsheet
 
-``` php
-$spreadsheet->getActiveSheet()->getProtection()->setSheet(true);
+Spreadsheets that are protected the as described above can always be read by
+PhpSpreadsheet. There is no need to know the password or do anything special in
+order to read a protected file.
+
+However if you need to implement a password verification mechanism, you can use the
+following helper method:
+
+
+```php
+$protection = $spreadsheet->getActiveSheet()->getProtection();
+$allowed = $protection->verify('my password');
+
+if ($allowed) {
+    doSomething();
+} else {
+    throw new Exception('Incorrect password');
+}
 ```
 
+If you need to completely prevent reading a file by any tool, including PhpSpreadsheet,
+then you are looking for "encryption", not "protection".
+
 ## Setting data validation on a cell
 
 Data validation is a powerful feature of Xlsx. It allows to specify an
diff --git a/src/PhpSpreadsheet/Reader/Xlsx.php b/src/PhpSpreadsheet/Reader/Xlsx.php
index f9f20bdd..fb7f0645 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx.php
@@ -763,17 +763,8 @@ class Xlsx extends BaseReader
                                 }
                             }
 
-                            if (!$this->readDataOnly && $xmlSheet && $xmlSheet->sheetProtection) {
-                                $docSheet->getProtection()->setPassword((string) $xmlSheet->sheetProtection['password'], true);
-                                $docSheet->getProtection()->setAlgorithmName((string) $xmlSheet->sheetProtection['algorithmName']);
-                                $docSheet->getProtection()->setHashValue((string) $xmlSheet->sheetProtection['hashValue']);
-                                $docSheet->getProtection()->setSaltValue((string) $xmlSheet->sheetProtection['saltValue']);
-                                $docSheet->getProtection()->setSpinCount((int) $xmlSheet->sheetProtection['spinCount']);
-                                if ($xmlSheet->protectedRanges->protectedRange) {
-                                    foreach ($xmlSheet->protectedRanges->protectedRange as $protectedRange) {
-                                        $docSheet->protectCells((string) $protectedRange['sqref'], (string) $protectedRange['password'], true);
-                                    }
-                                }
+                            if ($xmlSheet) {
+                                $this->readSheetProtection($docSheet, $xmlSheet);
                             }
 
                             if ($xmlSheet && $xmlSheet->autoFilter && !$this->readDataOnly) {
@@ -2035,4 +2026,29 @@ class Xlsx extends BaseReader
 
         return $workbookBasename;
     }
+
+    private function readSheetProtection(Worksheet $docSheet, SimpleXMLElement $xmlSheet): void
+    {
+        if ($this->readDataOnly || !$xmlSheet->sheetProtection) {
+            return;
+        }
+
+        $algorithmName = (string) $xmlSheet->sheetProtection['algorithmName'];
+        $protection = $docSheet->getProtection();
+        $protection->setAlgorithm($algorithmName);
+
+        if ($algorithmName) {
+            $protection->setPassword((string) $xmlSheet->sheetProtection['hashValue'], true);
+            $protection->setSalt((string) $xmlSheet->sheetProtection['saltValue']);
+            $protection->setSpinCount((int) $xmlSheet->sheetProtection['spinCount']);
+        } else {
+            $protection->setPassword((string) $xmlSheet->sheetProtection['password'], true);
+        }
+
+        if ($xmlSheet->protectedRanges->protectedRange) {
+            foreach ($xmlSheet->protectedRanges->protectedRange as $protectedRange) {
+                $docSheet->protectCells((string) $protectedRange['sqref'], (string) $protectedRange['password'], true);
+            }
+        }
+    }
 }
diff --git a/src/PhpSpreadsheet/Shared/PasswordHasher.php b/src/PhpSpreadsheet/Shared/PasswordHasher.php
index f3c2d3e1..9fefe88f 100644
--- a/src/PhpSpreadsheet/Shared/PasswordHasher.php
+++ b/src/PhpSpreadsheet/Shared/PasswordHasher.php
@@ -2,51 +2,39 @@
 
 namespace PhpOffice\PhpSpreadsheet\Shared;
 
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Worksheet\Protection;
+
 class PasswordHasher
 {
-    const ALGORITHM_MD2 = 'MD2';
-    const ALGORITHM_MD4 = 'MD4';
-    const ALGORITHM_MD5 = 'MD5';
-    const ALGORITHM_SHA_1 = 'SHA-1';
-    const ALGORITHM_SHA_256 = 'SHA-256';
-    const ALGORITHM_SHA_384 = 'SHA-384';
-    const ALGORITHM_SHA_512 = 'SHA-512';
-    const ALGORITHM_RIPEMD_128 = 'RIPEMD-128';
-    const ALGORITHM_RIPEMD_160 = 'RIPEMD-160';
-    const ALGORITHM_WHIRLPOOL = 'WHIRLPOOL';
-
     /**
-     * Mapping between algorithm name in Excel and algorithm name in PHP.
-     *
-     * @var array
+     * Get algorithm name for PHP.
      */
-    private static $algorithmArray = [
-        self::ALGORITHM_MD2 => 'md2',
-        self::ALGORITHM_MD4 => 'md4',
-        self::ALGORITHM_MD5 => 'md5',
-        self::ALGORITHM_SHA_1 => 'sha1',
-        self::ALGORITHM_SHA_256 => 'sha256',
-        self::ALGORITHM_SHA_384 => 'sha384',
-        self::ALGORITHM_SHA_512 => 'sha512',
-        self::ALGORITHM_RIPEMD_128 => 'ripemd128',
-        self::ALGORITHM_RIPEMD_160 => 'ripemd160',
-        self::ALGORITHM_WHIRLPOOL => 'whirlpool',
-    ];
-
-    /**
-     * Get algorithm from self::$algorithmArray.
-     *
-     * @param string $pAlgorithmName
-     *
-     * @return string
-     */
-    private static function getAlgorithm($pAlgorithmName)
+    private static function getAlgorithm(string $algorithmName): string
     {
-        if (array_key_exists($pAlgorithmName, self::$algorithmArray)) {
-            return self::$algorithmArray[$pAlgorithmName];
+        if (!$algorithmName) {
+            return '';
         }
 
-        return '';
+        // Mapping between algorithm name in Excel and algorithm name in PHP
+        $mapping = [
+            Protection::ALGORITHM_MD2 => 'md2',
+            Protection::ALGORITHM_MD4 => 'md4',
+            Protection::ALGORITHM_MD5 => 'md5',
+            Protection::ALGORITHM_SHA_1 => 'sha1',
+            Protection::ALGORITHM_SHA_256 => 'sha256',
+            Protection::ALGORITHM_SHA_384 => 'sha384',
+            Protection::ALGORITHM_SHA_512 => 'sha512',
+            Protection::ALGORITHM_RIPEMD_128 => 'ripemd128',
+            Protection::ALGORITHM_RIPEMD_160 => 'ripemd160',
+            Protection::ALGORITHM_WHIRLPOOL => 'whirlpool',
+        ];
+
+        if (array_key_exists($algorithmName, $mapping)) {
+            return $mapping[$algorithmName];
+        }
+
+        throw new Exception('Unsupported password algorithm: ' . $algorithmName);
     }
 
     /**
@@ -57,10 +45,8 @@ class PasswordHasher
      * Spreadsheet_Excel_Writer by Xavier Noguer <xnoguer@rezebra.com>.
      *
      * @param string $pPassword Password to hash
-     *
-     * @return string Hashed password
      */
-    public static function defaultHashPassword($pPassword)
+    private static function defaultHashPassword(string $pPassword): string
     {
         $password = 0x0000;
         $charPos = 1; // char position
@@ -87,40 +73,28 @@ class PasswordHasher
      *
      * @see https://docs.microsoft.com/en-us/openspecs/office_file_formats/ms-offcrypto/1357ea58-646e-4483-92ef-95d718079d6f
      *
-     * @param string $pPassword Password to hash
-     * @param string $pAlgorithmName Hash algorithm used to compute the password hash value
-     * @param string $pSaltValue Pseudorandom string
-     * @param string $pSpinCount Number of times to iterate on a hash of a password
+     * @param string $password Password to hash
+     * @param string $algorithm Hash algorithm used to compute the password hash value
+     * @param string $salt Pseudorandom string
+     * @param int $spinCount Number of times to iterate on a hash of a password
      *
      * @return string Hashed password
      */
-    public static function hashPassword($pPassword, $pAlgorithmName = '', $pSaltValue = '', $pSpinCount = 10000)
+    public static function hashPassword(string $password, string $algorithm = '', string $salt = '', int $spinCount = 10000): string
     {
-        $algorithmName = self::getAlgorithm($pAlgorithmName);
-        if (!$pAlgorithmName) {
-            return self::defaultHashPassword($pPassword);
+        $phpAlgorithm = self::getAlgorithm($algorithm);
+        if (!$phpAlgorithm) {
+            return self::defaultHashPassword($password);
         }
 
-        $saltValue = base64_decode($pSaltValue);
-        $password = mb_convert_encoding($pPassword, 'UCS-2LE', 'UTF-8');
+        $saltValue = base64_decode($salt);
+        $encodedPassword = mb_convert_encoding($password, 'UCS-2LE', 'UTF-8');
 
-        $hashValue = hash($algorithmName, $saltValue . $password, true);
-        for ($i = 0; $i < $pSpinCount; ++$i) {
-            $hashValue = hash($algorithmName, $hashValue . pack('L', $i), true);
+        $hashValue = hash($phpAlgorithm, $saltValue . $encodedPassword, true);
+        for ($i = 0; $i < $spinCount; ++$i) {
+            $hashValue = hash($phpAlgorithm, $hashValue . pack('L', $i), true);
         }
 
         return base64_encode($hashValue);
     }
-
-    /**
-     * Create a pseudorandom string.
-     *
-     * @param int $pSize Length of the output string in bytes
-     *
-     * @return string Pseudorandom string
-     */
-    public static function generateSalt($pSize = 16)
-    {
-        return base64_encode(random_bytes($pSize));
-    }
 }
diff --git a/src/PhpSpreadsheet/Worksheet/Protection.php b/src/PhpSpreadsheet/Worksheet/Protection.php
index 3566e255..81abc0b7 100644
--- a/src/PhpSpreadsheet/Worksheet/Protection.php
+++ b/src/PhpSpreadsheet/Worksheet/Protection.php
@@ -6,6 +6,17 @@ use PhpOffice\PhpSpreadsheet\Shared\PasswordHasher;
 
 class Protection
 {
+    const ALGORITHM_MD2 = 'MD2';
+    const ALGORITHM_MD4 = 'MD4';
+    const ALGORITHM_MD5 = 'MD5';
+    const ALGORITHM_SHA_1 = 'SHA-1';
+    const ALGORITHM_SHA_256 = 'SHA-256';
+    const ALGORITHM_SHA_384 = 'SHA-384';
+    const ALGORITHM_SHA_512 = 'SHA-512';
+    const ALGORITHM_RIPEMD_128 = 'RIPEMD-128';
+    const ALGORITHM_RIPEMD_160 = 'RIPEMD-160';
+    const ALGORITHM_WHIRLPOOL = 'WHIRLPOOL';
+
     /**
      * Sheet.
      *
@@ -119,7 +130,7 @@ class Protection
     private $selectUnlockedCells = false;
 
     /**
-     * Password.
+     * Hashed password.
      *
      * @var string
      */
@@ -130,28 +141,28 @@ class Protection
      *
      * @var string
      */
-    private $algorithmName = '';
+    private $algorithm = '';
 
     /**
      * Hash value.
      *
      * @var string
      */
-    private $hashValue = '';
+    private $hash = '';
 
     /**
      * Salt value.
      *
      * @var string
      */
-    private $saltValue = '';
+    private $salt = '';
 
     /**
      * Spin count.
      *
      * @var int
      */
-    private $spinCount = '';
+    private $spinCount = 10000;
 
     /**
      * Create a new Protection.
@@ -570,7 +581,7 @@ class Protection
     }
 
     /**
-     * Get Password (hashed).
+     * Get hashed password.
      *
      * @return string
      */
@@ -590,107 +601,84 @@ class Protection
     public function setPassword($pValue, $pAlreadyHashed = false)
     {
         if (!$pAlreadyHashed) {
-            $pValue = PasswordHasher::hashPassword($pValue);
+            $salt = $this->generateSalt();
+            $this->setSalt($salt);
+            $pValue = PasswordHasher::hashPassword($pValue, $this->getAlgorithm(), $this->getSalt(), $this->getSpinCount());
         }
+
         $this->password = $pValue;
 
         return $this;
     }
 
     /**
-     * Get AlgorithmName.
-     *
-     * @return string
+     * Create a pseudorandom string.
      */
-    public function getAlgorithmName()
+    private function generateSalt(): string
     {
-        return $this->algorithmName;
+        return base64_encode(random_bytes(16));
     }
 
     /**
-     * Set AlgorithmName.
-     *
-     * @param string $pValue
-     *
-     * @return $this
+     * Get algorithm name.
      */
-    public function setAlgorithmName($pValue)
+    public function getAlgorithm(): string
     {
-        $this->algorithmName = $pValue;
-
-        return $this;
+        return $this->algorithm;
     }
 
     /**
-     * Get HashValue.
-     *
-     * @return string
+     * Set algorithm name.
      */
-    public function getHashValue()
+    public function setAlgorithm(string $algorithm): void
     {
-        return $this->hashValue;
+        $this->algorithm = $algorithm;
     }
 
     /**
-     * Set HashValue.
-     *
-     * @param string $pValue
-     *
-     * @return $this
+     * Get salt value.
      */
-    public function setHashValue($pValue)
+    public function getSalt(): string
     {
-        $this->hashValue = $pValue;
-
-        return $this;
+        return $this->salt;
     }
 
     /**
-     * Get SaltValue.
-     *
-     * @return string
+     * Set salt value.
      */
-    public function getSaltValue()
+    public function setSalt(string $salt): void
     {
-        return $this->saltValue;
+        $this->salt = $salt;
     }
 
     /**
-     * Set SaltValue.
-     *
-     * @param string $pValue
-     *
-     * @return $this
+     * Get spin count.
      */
-    public function setSaltValue($pValue)
-    {
-        $this->saltValue = $pValue;
-
-        return $this;
-    }
-
-    /**
-     * Get SpinCount.
-     *
-     * @return int
-     */
-    public function getSpinCount()
+    public function getSpinCount(): int
     {
         return $this->spinCount;
     }
 
     /**
-     * Set SpinCount.
-     *
-     * @param int $pValue
-     *
-     * @return $this
+     * Set spin count.
      */
-    public function setSpinCount($pValue)
+    public function setSpinCount(int $spinCount): void
     {
-        $this->spinCount = $pValue;
+        $this->spinCount = $spinCount;
+    }
 
-        return $this;
+    /**
+     * Verify that the given non-hashed password can "unlock" the protection.
+     */
+    public function verify(string $password): bool
+    {
+        if (!$this->isProtectionEnabled()) {
+            return true;
+        }
+
+        $hash = PasswordHasher::hashPassword($password, $this->getAlgorithm(), $this->getSalt(), $this->getSpinCount());
+
+        return $this->getPassword() === $hash;
     }
 
     /**
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php b/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
index 803ade8a..d101bb40 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
@@ -420,42 +420,33 @@ class Worksheet extends WriterPart
         // sheetProtection
         $objWriter->startElement('sheetProtection');
 
-        if ($pSheet->getProtection()->getPassword() !== '') {
-            $objWriter->writeAttribute('password', $pSheet->getProtection()->getPassword());
+        $protection = $pSheet->getProtection();
+
+        if ($protection->getAlgorithm()) {
+            $objWriter->writeAttribute('algorithmName', $protection->getAlgorithm());
+            $objWriter->writeAttribute('hashValue', $protection->getPassword());
+            $objWriter->writeAttribute('saltValue', $protection->getSalt());
+            $objWriter->writeAttribute('spinCount', $protection->getSpinCount());
+        } elseif ($protection->getPassword() !== '') {
+            $objWriter->writeAttribute('password', $protection->getPassword());
         }
 
-        if ($pSheet->getProtection()->getHashValue() !== '') {
-            $objWriter->writeAttribute('hashValue', $pSheet->getProtection()->getHashValue());
-        }
-
-        if ($pSheet->getProtection()->getAlgorithmName() !== '') {
-            $objWriter->writeAttribute('algorithmName', $pSheet->getProtection()->getAlgorithmName());
-        }
-
-        if ($pSheet->getProtection()->getSaltValue() !== '') {
-            $objWriter->writeAttribute('saltValue', $pSheet->getProtection()->getSaltValue());
-        }
-
-        if ($pSheet->getProtection()->getSpinCount() !== '') {
-            $objWriter->writeAttribute('spinCount', $pSheet->getProtection()->getSpinCount());
-        }
-
-        $objWriter->writeAttribute('sheet', ($pSheet->getProtection()->getSheet() ? 'true' : 'false'));
-        $objWriter->writeAttribute('objects', ($pSheet->getProtection()->getObjects() ? 'true' : 'false'));
-        $objWriter->writeAttribute('scenarios', ($pSheet->getProtection()->getScenarios() ? 'true' : 'false'));
-        $objWriter->writeAttribute('formatCells', ($pSheet->getProtection()->getFormatCells() ? 'true' : 'false'));
-        $objWriter->writeAttribute('formatColumns', ($pSheet->getProtection()->getFormatColumns() ? 'true' : 'false'));
-        $objWriter->writeAttribute('formatRows', ($pSheet->getProtection()->getFormatRows() ? 'true' : 'false'));
-        $objWriter->writeAttribute('insertColumns', ($pSheet->getProtection()->getInsertColumns() ? 'true' : 'false'));
-        $objWriter->writeAttribute('insertRows', ($pSheet->getProtection()->getInsertRows() ? 'true' : 'false'));
-        $objWriter->writeAttribute('insertHyperlinks', ($pSheet->getProtection()->getInsertHyperlinks() ? 'true' : 'false'));
-        $objWriter->writeAttribute('deleteColumns', ($pSheet->getProtection()->getDeleteColumns() ? 'true' : 'false'));
-        $objWriter->writeAttribute('deleteRows', ($pSheet->getProtection()->getDeleteRows() ? 'true' : 'false'));
-        $objWriter->writeAttribute('selectLockedCells', ($pSheet->getProtection()->getSelectLockedCells() ? 'true' : 'false'));
-        $objWriter->writeAttribute('sort', ($pSheet->getProtection()->getSort() ? 'true' : 'false'));
-        $objWriter->writeAttribute('autoFilter', ($pSheet->getProtection()->getAutoFilter() ? 'true' : 'false'));
-        $objWriter->writeAttribute('pivotTables', ($pSheet->getProtection()->getPivotTables() ? 'true' : 'false'));
-        $objWriter->writeAttribute('selectUnlockedCells', ($pSheet->getProtection()->getSelectUnlockedCells() ? 'true' : 'false'));
+        $objWriter->writeAttribute('sheet', ($protection->getSheet() ? 'true' : 'false'));
+        $objWriter->writeAttribute('objects', ($protection->getObjects() ? 'true' : 'false'));
+        $objWriter->writeAttribute('scenarios', ($protection->getScenarios() ? 'true' : 'false'));
+        $objWriter->writeAttribute('formatCells', ($protection->getFormatCells() ? 'true' : 'false'));
+        $objWriter->writeAttribute('formatColumns', ($protection->getFormatColumns() ? 'true' : 'false'));
+        $objWriter->writeAttribute('formatRows', ($protection->getFormatRows() ? 'true' : 'false'));
+        $objWriter->writeAttribute('insertColumns', ($protection->getInsertColumns() ? 'true' : 'false'));
+        $objWriter->writeAttribute('insertRows', ($protection->getInsertRows() ? 'true' : 'false'));
+        $objWriter->writeAttribute('insertHyperlinks', ($protection->getInsertHyperlinks() ? 'true' : 'false'));
+        $objWriter->writeAttribute('deleteColumns', ($protection->getDeleteColumns() ? 'true' : 'false'));
+        $objWriter->writeAttribute('deleteRows', ($protection->getDeleteRows() ? 'true' : 'false'));
+        $objWriter->writeAttribute('selectLockedCells', ($protection->getSelectLockedCells() ? 'true' : 'false'));
+        $objWriter->writeAttribute('sort', ($protection->getSort() ? 'true' : 'false'));
+        $objWriter->writeAttribute('autoFilter', ($protection->getAutoFilter() ? 'true' : 'false'));
+        $objWriter->writeAttribute('pivotTables', ($protection->getPivotTables() ? 'true' : 'false'));
+        $objWriter->writeAttribute('selectUnlockedCells', ($protection->getSelectUnlockedCells() ? 'true' : 'false'));
         $objWriter->endElement();
     }
 
@@ -1149,7 +1140,7 @@ class Worksheet extends WriterPart
             $this->getParentWriter()->getOffice2003Compatibility() === false,
             'v',
             ($this->getParentWriter()->getPreCalculateFormulas() && !is_array($calculatedValue) && substr($calculatedValue, 0, 1) !== '#')
-            ? StringHelper::formatNumber($calculatedValue) : '0'
+                ? StringHelper::formatNumber($calculatedValue) : '0'
         );
     }
 
diff --git a/tests/PhpSpreadsheetTests/Worksheet/ProtectionTest.php b/tests/PhpSpreadsheetTests/Worksheet/ProtectionTest.php
new file mode 100644
index 00000000..1cc1ed32
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Worksheet/ProtectionTest.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Worksheet;
+
+use PhpOffice\PhpSpreadsheet\Worksheet\Protection;
+use PHPUnit\Framework\TestCase;
+
+class ProtectionTest extends TestCase
+{
+    public function testVerifyPassword(): void
+    {
+        $protection = new Protection();
+        self::assertTrue($protection->verify('foo'), 'non-protected always pass');
+
+        $protection->setSheet(true);
+        self::assertFalse($protection->verify('foo'), 'protected will fail');
+
+        $protection->setPassword('foo', true);
+        self::assertSame('foo', $protection->getPassword(), 'was not stored as-is, without hashing');
+        self::assertFalse($protection->verify('foo'), 'setting already hashed password will not match');
+
+        $protection->setPassword('foo');
+        self::assertSame('CC40', $protection->getPassword(), 'was hashed');
+        self::assertTrue($protection->verify('foo'), 'setting non-hashed password will hash it and not match');
+
+        $protection->setAlgorithm(Protection::ALGORITHM_MD5);
+        self::assertFalse($protection->verify('foo'), 'changing algorithm will not match anymore');
+
+        $protection->setPassword('foo');
+        $hash1 = $protection->getPassword();
+        $protection->setPassword('foo');
+        $hash2 = $protection->getPassword();
+
+        self::assertSame(24, mb_strlen($hash1));
+        self::assertSame(24, mb_strlen($hash2));
+        self::assertNotSame($hash1, $hash2, 'was hashed with automatic salt');
+        self::assertTrue($protection->verify('foo'), 'setting password again, will hash with proper algorithm and will match');
+    }
+}

From dcf3b9860d93b82278c98679d4362dcbb44e6dc3 Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Sun, 31 May 2020 22:41:05 +0900
Subject: [PATCH 009/153] Code highlight in docs for PhpStorm

---
 docs/faq.md                                |   2 +-
 docs/topics/accessing-cells.md             |  46 +++---
 docs/topics/architecture.md                |   4 +-
 docs/topics/autofilters.md                 |  38 ++---
 docs/topics/calculation-engine.md          |  96 ++++++------
 docs/topics/creating-spreadsheet.md        |   6 +-
 docs/topics/memory_saving.md               |   2 +-
 docs/topics/migration-from-PHPExcel.md     |   2 +-
 docs/topics/reading-and-writing-to-file.md | 102 ++++++-------
 docs/topics/reading-files.md               |  36 ++---
 docs/topics/recipes.md                     | 164 ++++++++++-----------
 docs/topics/settings.md                    |   4 +-
 docs/topics/worksheets.md                  |  14 +-
 13 files changed, 258 insertions(+), 258 deletions(-)

diff --git a/docs/faq.md b/docs/faq.md
index 19f5f8fc..ac69e415 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -23,7 +23,7 @@ When you make use of any of the worksheet protection features (e.g. cell
 range protection, prohibiting deleting rows, ...), make sure you enable
 worksheet security. This can for example be done like this:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getProtection()->setSheet(true);
 ```
 
diff --git a/docs/topics/accessing-cells.md b/docs/topics/accessing-cells.md
index 4770d721..edb71514 100644
--- a/docs/topics/accessing-cells.md
+++ b/docs/topics/accessing-cells.md
@@ -8,7 +8,7 @@ topic lists some of the options to access a cell.
 Setting a cell value by coordinate can be done using the worksheet's
 `setCellValue()` method.
 
-``` php
+```php
 // Set cell A1 with a string value
 $spreadsheet->getActiveSheet()->setCellValue('A1', 'PhpSpreadsheet');
 
@@ -28,7 +28,7 @@ $spreadsheet->getActiveSheet()->setCellValue(
 Alternatively, you can retrieve the cell object, and then call the
 cell’s `setValue()` method:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()
     ->getCell('B8')
     ->setValue('Some value');
@@ -56,7 +56,7 @@ the cell object will still retain its data values.
 
 What does this mean? Consider the following code:
 
-```
+```php
 $spreadSheet = new Spreadsheet();
 $workSheet = $spreadSheet->getActiveSheet();
 
@@ -74,7 +74,7 @@ $cellA1 = $workSheet->getCell('A1');
 echo 'Value: ', $cellA1->getValue(), '; Address: ', $cellA1->getCoordinate(), PHP_EOL;
 
 echo 'Value: ', $cellC1->getValue(), '; Address: ', $cellC1->getCoordinate(), PHP_EOL;
-``` 
+```
 
 The call to `getCell('C1')` returns the cell at `C1` containing its value (`3`),
 together with its link to the collection (used to identify its
@@ -153,7 +153,7 @@ was a formula.
 
 To do this, you need to "escape" the value by setting it as "quoted text".
 
-```
+```php
 // Set cell A4 with a formula
 $spreadsheet->getActiveSheet()->setCellValue(
     'A4',
@@ -175,7 +175,7 @@ point value), and a number format mask is used to show how that value
 should be formatted; so if we want to store a date in a cell, we need to
 calculate the correct Excel timestamp, and set a number format mask.
 
-``` php
+```php
 // Get the current date/time and convert to an Excel date/time
 $dateTimeNow = time();
 $excelDateValue = \PhpOffice\PhpSpreadsheet\Shared\Date::PHPToExcel( $dateTimeNow );
@@ -210,7 +210,7 @@ behaviour.
 Firstly, you can set the datatype explicitly as a string so that it is
 not converted to a number.
 
-``` php
+```php
 // Set cell A8 with a numeric value, but tell PhpSpreadsheet it should be treated as a string
 $spreadsheet->getActiveSheet()->setCellValueExplicit(
     'A8',
@@ -222,7 +222,7 @@ $spreadsheet->getActiveSheet()->setCellValueExplicit(
 Alternatively, you can use a number format mask to display the value
 with leading zeroes.
 
-``` php
+```php
 // Set cell A9 with a numeric value
 $spreadsheet->getActiveSheet()->setCellValue('A9', 1513789642);
 // Set a number format mask to display the value as 11 digits with leading zeroes
@@ -236,7 +236,7 @@ $spreadsheet->getActiveSheet()->getStyle('A9')
 With number format masking, you can even break up the digits into groups
 to make the value more easily readable.
 
-``` php
+```php
 // Set cell A10 with a numeric value
 $spreadsheet->getActiveSheet()->setCellValue('A10', 1513789642);
 // Set a number format mask to display the value as 11 digits with leading zeroes
@@ -259,7 +259,7 @@ writers (Xlsx and Xls).
 It is also possible to set a range of cell values in a single call by
 passing an array of values to the `fromArray()` method.
 
-``` php
+```php
 $arrayData = [
     [NULL, 2010, 2011, 2012],
     ['Q1',   12,   15,   21],
@@ -282,7 +282,7 @@ If you pass a 2-d array, then this will be treated as a series of rows
 and columns. A 1-d array will be treated as a single row, which is
 particularly useful if you're fetching an array of data from a database.
 
-``` php
+```php
 $rowArray = ['Value1', 'Value2', 'Value3', 'Value4'];
 $spreadsheet->getActiveSheet()
     ->fromArray(
@@ -299,7 +299,7 @@ If you have a simple 1-d array, and want to write it as a column, then
 the following will convert it into an appropriately structured 2-d array
 that can be fed to the `fromArray()` method:
 
-``` php
+```php
 $rowArray = ['Value1', 'Value2', 'Value3', 'Value4'];
 $columnArray = array_chunk($rowArray, 1);
 $spreadsheet->getActiveSheet()
@@ -319,7 +319,7 @@ To retrieve the value of a cell, the cell should first be retrieved from
 the worksheet using the `getCell()` method. A cell's value can be read
 using the `getValue()` method.
 
-``` php
+```php
 // Get the value from cell A1
 $cellValue = $spreadsheet->getActiveSheet()->getCell('A1')->getValue();
 ```
@@ -331,7 +331,7 @@ value rather than the formula itself, then use the cell's
 `getCalculatedValue()` method. This is further explained in
 [the calculation engine](./calculation-engine.md).
 
-``` php
+```php
 // Get the value from cell A4
 $cellValue = $spreadsheet->getActiveSheet()->getCell('A4')->getCalculatedValue();
 ```
@@ -340,7 +340,7 @@ Alternatively, if you want to see the value with any cell formatting
 applied (e.g. for a human-readable date or time value), then you can use
 the cell's `getFormattedValue()` method.
 
-``` php
+```php
 // Get the value from cell A6
 $cellValue = $spreadsheet->getActiveSheet()->getCell('A6')->getFormattedValue();
 ```
@@ -350,7 +350,7 @@ $cellValue = $spreadsheet->getActiveSheet()->getCell('A6')->getFormattedValue();
 Setting a cell value by coordinate can be done using the worksheet's
 `setCellValueByColumnAndRow()` method.
 
-``` php
+```php
 // Set cell A5 with a string value
 $spreadsheet->getActiveSheet()->setCellValueByColumnAndRow(1, 5, 'PhpSpreadsheet');
 ```
@@ -363,7 +363,7 @@ To retrieve the value of a cell, the cell should first be retrieved from
 the worksheet using the `getCellByColumnAndRow()` method. A cell’s value can
 be read again using the following line of code:
 
-``` php
+```php
 // Get the value from cell B5
 $cellValue = $spreadsheet->getActiveSheet()->getCellByColumnAndRow(2, 5)->getValue();
 ```
@@ -371,7 +371,7 @@ $cellValue = $spreadsheet->getActiveSheet()->getCellByColumnAndRow(2, 5)->getVal
 If you need the calculated value of a cell, use the following code. This
 is further explained in [the calculation engine](./calculation-engine.md).
 
-``` php
+```php
 // Get the value from cell A4
 $cellValue = $spreadsheet->getActiveSheet()->getCellByColumnAndRow(1, 4)->getCalculatedValue();
 ```
@@ -382,7 +382,7 @@ It is also possible to retrieve a range of cell values to an array in a
 single call using the `toArray()`, `rangeToArray()` or
 `namedRangeToArray()` methods.
 
-``` php
+```php
 $dataArray = $spreadsheet->getActiveSheet()
     ->rangeToArray(
         'C3:E5',     // The worksheet range that we want to retrieve
@@ -409,7 +409,7 @@ cells within a row.
 Below is an example where we read all the values in a worksheet and
 display them in a table.
 
-``` php
+```php
 $reader = \PhpOffice\PhpSpreadsheet\IOFactory::createReader('Xlsx');
 $reader->setReadDataOnly(TRUE);
 $spreadsheet = $reader->load("test.xlsx");
@@ -456,7 +456,7 @@ loops.
 Below is an example where we read all the values in a worksheet and
 display them in a table.
 
-``` php
+```php
 $reader = \PhpOffice\PhpSpreadsheet\IOFactory::createReader('Xlsx');
 $reader->setReadDataOnly(TRUE);
 $spreadsheet = $reader->load("test.xlsx");
@@ -482,7 +482,7 @@ echo '</table>' . PHP_EOL;
 Alternatively, you can take advantage of PHP's "Perl-style" character
 incrementors to loop through the cells by coordinate:
 
-``` php
+```php
 $reader = \PhpOffice\PhpSpreadsheet\IOFactory::createReader('Xlsx');
 $reader->setReadDataOnly(TRUE);
 $spreadsheet = $reader->load("test.xlsx");
@@ -528,7 +528,7 @@ dates entered as strings to the correct format, also setting the cell's
 style information. The following example demonstrates how to set the
 value binder in PhpSpreadsheet:
 
-``` php
+```php
 /** PhpSpreadsheet */
 require_once 'src/Boostrap.php';
 
diff --git a/docs/topics/architecture.md b/docs/topics/architecture.md
index 0295d672..1c544ef7 100644
--- a/docs/topics/architecture.md
+++ b/docs/topics/architecture.md
@@ -43,7 +43,7 @@ PhpSpreadsheet supports fluent interfaces in most locations. This means
 that you can easily "chain" calls to specific methods without requiring
 a new PHP statement. For example, take the following code:
 
-``` php
+```php
 $spreadsheet->getProperties()->setCreator("Maarten Balliauw");
 $spreadsheet->getProperties()->setLastModifiedBy("Maarten Balliauw");
 $spreadsheet->getProperties()->setTitle("Office 2007 XLSX Test Document");
@@ -55,7 +55,7 @@ $spreadsheet->getProperties()->setCategory("Test result file");
 
 This can be rewritten as:
 
-``` php
+```php
 $spreadsheet->getProperties()
     ->setCreator("Maarten Balliauw")
     ->setLastModifiedBy("Maarten Balliauw")
diff --git a/docs/topics/autofilters.md b/docs/topics/autofilters.md
index 66321ee9..d5a07f8b 100644
--- a/docs/topics/autofilters.md
+++ b/docs/topics/autofilters.md
@@ -42,7 +42,7 @@ column, such as "Equals a red cell color" or "Larger than 150".
 
 To set an autoFilter on a range of cells.
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->setAutoFilter('A1:E20');
 ```
 
@@ -56,7 +56,7 @@ developer to avoid such errors.
 
 If you want to set the whole worksheet as an autofilter region
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->setAutoFilter(
     $spreadsheet->getActiveSheet()
         ->calculateWorksheetDimension()
@@ -74,7 +74,7 @@ will extend this to other formats.
 To apply a filter expression to an autoFilter range, you first need to
 identify which column you're going to be applying this filter to.
 
-``` php
+```php
 $autoFilter = $spreadsheet->getActiveSheet()->getAutoFilter();
 $columnFilter = $autoFilter->getColumn('C');
 ```
@@ -114,7 +114,7 @@ To create a filter expression, we need to start by identifying the
 filter type. In this case, we're just going to specify that this filter
 is a standard filter.
 
-``` php
+```php
 $columnFilter->setFilterType(
     \PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column::AUTOFILTER_FILTERTYPE_FILTER
 );
@@ -127,7 +127,7 @@ When creating a simple filter in PhpSpreadsheet, you only need to
 specify the values for "checked" columns: you do this by creating a
 filter rule for each value.
 
-``` php
+```php
 $columnFilter->createRule()
     ->setRule(
         \PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_EQUAL,
@@ -152,7 +152,7 @@ standard filters are always treated as being joined by an OR condition.
 
 If you want to create a filter to select blank cells, you would use:
 
-``` php
+```php
 $columnFilter->createRule()
     ->setRule(
         \PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_EQUAL,
@@ -170,7 +170,7 @@ within a year, or individual days within each month.
 
 DateGroup filters are still applied as a Standard Filter type.
 
-``` php
+```php
 $columnFilter->setFilterType(
     \PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column::AUTOFILTER_FILTERTYPE_FILTER
 );
@@ -181,7 +181,7 @@ for "checked" columns as an associative array of year. month, day, hour
 minute and second. To select a year and month, you need to create a
 DateGroup rule identifying the selected year and month:
 
-``` php
+```php
 $columnFilter->createRule()
     ->setRule(
         \PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_EQUAL,
@@ -229,7 +229,7 @@ either an AND or an OR.
 
 We start by specifying a Filter type, this time a CUSTOMFILTER.
 
-``` php
+```php
 $columnFilter->setFilterType(
     \PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column::AUTOFILTER_FILTERTYPE_CUSTOMFILTER
 );
@@ -240,7 +240,7 @@ And then define our rules.
 The following shows a simple wildcard filter to show all column entries
 beginning with the letter `U`.
 
-``` php
+```php
 $columnFilter->createRule()
     ->setRule(
         \PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_EQUAL,
@@ -264,7 +264,7 @@ is the \~ itself.
 
 To create a "between" condition, we need to define two rules:
 
-``` php
+```php
 $columnFilter->createRule()
     ->setRule(
         \PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_GREATERTHANOREQUAL,
@@ -289,7 +289,7 @@ This defined two rules, filtering numbers that are `>= -20` OR `<=
 20`, so we also need to modify the join condition to reflect AND rather
 than OR.
 
-``` php
+```php
 $columnFilter->setAndOr(
     \PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column::AUTOFILTER_COLUMN_ANDOR_AND
 );
@@ -320,7 +320,7 @@ column at a time.
 
 Again, we start by specifying a Filter type, this time a DYNAMICFILTER.
 
-``` php
+```php
 $columnFilter->setFilterType(
     \PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column::AUTOFILTER_FILTERTYPE_DYNAMICFILTER
 );
@@ -330,7 +330,7 @@ When defining the rule for a dynamic filter, we don't define a value (we
 can simply set that to NULL) but we do specify the dynamic filter
 category.
 
-``` php
+```php
 $columnFilter->createRule()
     ->setRule(
         \PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_EQUAL,
@@ -420,7 +420,7 @@ column at a time.
 
 We start by specifying a Filter type, this time a DYNAMICFILTER.
 
-``` php
+```php
 $columnFilter->setFilterType(
     \PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column::AUTOFILTER_FILTERTYPE_TOPTENFILTER
 );
@@ -428,7 +428,7 @@ $columnFilter->setFilterType(
 
 Then we create the rule:
 
-``` php
+```php
 $columnFilter->createRule()
     ->setRule(
         \PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_PERCENT,
@@ -444,7 +444,7 @@ This will filter the Top 5 percent of values in the column.
 
 To specify the lowest (bottom 2 values), we would specify a rule of:
 
-``` php
+```php
 $columnFilter->createRule()
     ->setRule(
         \PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter\Column\Rule::AUTOFILTER_COLUMN_RULE_TOPTEN_BY_VALUE,
@@ -490,7 +490,7 @@ If you wish to execute your filter from within a script, you need to do
 this manually. You can do this using the autofilters `showHideRows()`
 method.
 
-``` php
+```php
 $autoFilter = $spreadsheet->getActiveSheet()->getAutoFilter();
 $autoFilter->showHideRows();
 ```
@@ -505,7 +505,7 @@ ever row, whether it matches the filter criteria or not. To selectively
 access only the filtered rows, you need to test each row’s visibility
 settings.
 
-``` php
+```php
 foreach ($spreadsheet->getActiveSheet()->getRowIterator() as $row) {
     if ($spreadsheet->getActiveSheet()
         ->getRowDimension($row->getRowIndex())->getVisible()) {
diff --git a/docs/topics/calculation-engine.md b/docs/topics/calculation-engine.md
index 779d73e1..d15dbb16 100644
--- a/docs/topics/calculation-engine.md
+++ b/docs/topics/calculation-engine.md
@@ -13,7 +13,7 @@ evaluates to the sum of values in A1, A2, ..., A10.
 To calculate a formula, you can call the cell containing the formula’s
 method `getCalculatedValue()`, for example:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getCell('E11')->getCalculatedValue();
 ```
 
@@ -32,7 +32,7 @@ You see that the formula contained in cell E11 is "SUM(E4:E9)". Now,
 when I write the following line of code, two new product lines are
 added:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->insertNewRowBefore(7, 2);
 ```
 
@@ -55,7 +55,7 @@ However, there may be times when you don't want this, perhaps you've changed
 the underlying data and need to re-evaluate the same formula with that new
 data.
 
-```
+```php
 Calculation::getInstance($spreadsheet)->disableCalculationCache();
 ```
 
@@ -63,7 +63,7 @@ Will disable calculation caching, and flush the current calculation cache.
 
 If you want only to flush the cache, then you can call
 
-```
+```php
 Calculation::getInstance($spreadsheet)->clearCalculationCache();
 ```
 
@@ -118,7 +118,7 @@ date values by calling the
 `\PhpOffice\PhpSpreadsheet\Calculation\Functions::setReturnDateType()`
 method:
 
-``` php
+```php
 \PhpOffice\PhpSpreadsheet\Calculation\Functions::setReturnDateType($returnDateType);
 ```
 
@@ -134,7 +134,7 @@ if an invalid value is passed in for the return date type).
 The `\PhpOffice\PhpSpreadsheet\Calculation\Functions::getReturnDateType()`
 method can be used to determine the current value of this setting:
 
-``` php
+```php
 $returnDateType = \PhpOffice\PhpSpreadsheet\Calculation\Functions::getReturnDateType();
 ```
 
@@ -172,7 +172,7 @@ It is possible for scripts to change the calendar used for calculating
 Excel date values by calling the
 `\PhpOffice\PhpSpreadsheet\Shared\Date::setExcelCalendar()` method:
 
-``` php
+```php
 \PhpOffice\PhpSpreadsheet\Shared\Date::setExcelCalendar($baseDate);
 ```
 
@@ -187,7 +187,7 @@ if an invalid value is passed in).
 The `\PhpOffice\PhpSpreadsheet\Shared\Date::getExcelCalendar()` method can
 be used to determine the current value of this setting:
 
-``` php
+```php
 $baseDate = \PhpOffice\PhpSpreadsheet\Shared\Date::getExcelCalendar();
 ```
 
@@ -353,7 +353,7 @@ This is the statistical mean.
 
 ##### Examples
 
-``` php
+```php
 $database = [
     [ 'Tree',  'Height', 'Age', 'Yield', 'Profit' ],
     [ 'Apple',  18,       20,    14,      105.00  ],
@@ -421,7 +421,7 @@ in which you specify a condition for the column.
 
 ##### Examples
 
-``` php
+```php
 $database = [
     [ 'Tree',  'Height', 'Age', 'Yield', 'Profit' ],
     [ 'Apple',  18,       20,    14,      105.00  ],
@@ -492,7 +492,7 @@ in which you specify a condition for the column.
 
 ##### Examples
 
-``` php
+```php
 $database = [
     [ 'Tree',  'Height', 'Age', 'Yield', 'Profit' ],
     [ 'Apple',  18,       20,    14,      105.00  ],
@@ -563,7 +563,7 @@ in which you specify a condition for the column.
 
 #### Examples
 
-``` php
+```php
 $database = [
     [ 'Tree',  'Height', 'Age', 'Yield', 'Profit' ],
     [ 'Apple',  18,       20,    14,      105.00  ],
@@ -631,7 +631,7 @@ in which you specify a condition for the column.
 
 ##### Examples
 
-``` php
+```php
 $database = [
     [ 'Tree',  'Height', 'Age', 'Yield', 'Profit' ],
     [ 'Apple',  18,       20,    14,      105.00  ],
@@ -699,7 +699,7 @@ in which you specify a condition for the column.
 
 ##### Examples
 
-``` php
+```php
 $database = [
     [ 'Tree',  'Height', 'Age', 'Yield', 'Profit' ],
     [ 'Apple',  18,       20,    14,      105.00  ],
@@ -767,7 +767,7 @@ in which you specify a condition for the column.
 
 ##### Examples
 
-``` php
+```php
 $database = [
     [ 'Tree',  'Height', 'Age', 'Yield', 'Profit' ],
     [ 'Apple',  18,       20,    14,      105.00  ],
@@ -836,7 +836,7 @@ in which you specify a condition for the column.
 
 ##### Examples
 
-``` php
+```php
 $database = [
     [ 'Tree',  'Height', 'Age', 'Yield', 'Profit' ],
     [ 'Apple',  18,       20,    14,      105.00  ],
@@ -905,7 +905,7 @@ in which you specify a condition for the column.
 
 ##### Examples
 
-``` php
+```php
 $database = [
     [ 'Tree',  'Height', 'Age', 'Yield', 'Profit' ],
     [ 'Apple',  18,       20,    14,      105.00  ],
@@ -973,7 +973,7 @@ in which you specify a condition for the column.
 
 ##### Examples
 
-``` php
+```php
 $database = [
     [ 'Tree',  'Height', 'Age', 'Yield', 'Profit' ],
     [ 'Apple',  18,       20,    14,      105.00  ],
@@ -1074,7 +1074,7 @@ or an Excel timestamp value (real), depending on the value of
 
 ##### Examples
 
-``` php
+```php
 $worksheet->setCellValue('A1', 'Year')
     ->setCellValue('A2', 'Month')
     ->setCellValue('A3', 'Day');
@@ -1089,7 +1089,7 @@ $retVal = $worksheet->getCell('D1')->getCalculatedValue();
 // $retVal = 1230681600
 ```
 
-``` php
+```php
 // We're going to be calling the same cell calculation multiple times,
 //    and expecting different return values, so disable calculation cacheing
 \PhpOffice\PhpSpreadsheet\Calculation\Calculation::getInstance()->setCalculationCacheEnabled(FALSE);
@@ -1170,7 +1170,7 @@ the third parameter.
 
 ##### Examples
 
-``` php
+```php
 $worksheet->setCellValue('A1', 'Year')
     ->setCellValue('A2', 'Month')
     ->setCellValue('A3', 'Day');
@@ -1208,7 +1208,7 @@ $retVal = $worksheet->getCell('D6')->getCalculatedValue();
 // $retVal = 30
 ```
 
-``` php
+```php
 $date1 = 1193317015; // PHP timestamp for 25-Oct-2007
 $date2 = 1449579415; // PHP timestamp for 8-Dec-2015
 
@@ -1279,7 +1279,7 @@ or an Excel timestamp value (real), depending on the value of
 
 ##### Examples
 
-``` php
+```php
 $worksheet->setCellValue('A1', 'Date String');
     ->setCellValue('A2', '31-Dec-2008')
     ->setCellValue('A3', '31/12/2008')
@@ -1301,7 +1301,7 @@ $retVal = $worksheet->getCell('B4')->getCalculatedValue();
 // $retVal = 39813.0 for all cases
 ```
 
-``` php
+```php
 // We're going to be calling the same cell calculation multiple times,
 //    and expecting different return values, so disable calculation cacheing
 \PhpOffice\PhpSpreadsheet\Calculation\Calculation::getInstance()->setCalculationCacheEnabled(FALSE);
@@ -1371,7 +1371,7 @@ This is an integer ranging from 1 to 31.
 
 ##### Examples
 
-``` php
+```php
 $worksheet->setCellValue('A1', 'Date String')
     ->setCellValue('A2', '31-Dec-2008')
     ->setCellValue('A3', '14-Feb-2008');
@@ -1386,7 +1386,7 @@ $retVal = $worksheet->getCell('B3')->getCalculatedValue();
 // $retVal = 14
 ```
 
-``` php
+```php
 $retVal = call_user_func_array(
     ['\PhpOffice\PhpSpreadsheet\Calculation\Functions', 'DAYOFMONTH'],
     ['25-Dec-2008']
@@ -1444,7 +1444,7 @@ day year.
 
 ##### Examples
 
-``` php
+```php
 $worksheet->setCellValue('B1', 'Start Date')
     ->setCellValue('C1', 'End Date')
     ->setCellValue('A2', 'Year')
@@ -1469,7 +1469,7 @@ $retVal = $worksheet->getCell('E4')->getCalculatedValue();
 // $retVal = 1557
 ```
 
-``` php
+```php
 $date1 = 37655.0; // Excel timestamp for 25-Oct-2007
 $date2 = 39233.0; // Excel timestamp for 8-Dec-2015
 
@@ -1529,7 +1529,7 @@ or an Excel timestamp value (real), depending on the value of
 
 ##### Examples
 
-``` php
+```php
 $worksheet->setCellValue('A1', 'Date String')
     ->setCellValue('A2', '1-Jan-2008')
     ->setCellValue('A3', '29-Feb-2008');
@@ -1548,7 +1548,7 @@ $retVal = $worksheet->getCell('B3')->getCalculatedValue();
 // $retVal = 39141.0 (28-Feb-2007)
 ```
 
-``` php
+```php
 \PhpOffice\PhpSpreadsheet\Calculation\Functions::setReturnDateType(
     \PhpOffice\PhpSpreadsheet\Calculation\Functions::RETURNDATE_EXCEL
 );
@@ -1602,7 +1602,7 @@ or an Excel timestamp value (real), depending on the value of
 
 ##### Examples
 
-``` php
+```php
 $worksheet->setCellValue('A1', 'Date String')
     ->setCellValue('A2', '1-Jan-2000')
     ->setCellValue('A3', '14-Feb-2009');
@@ -1619,7 +1619,7 @@ $retVal = $worksheet->getCell('B3')->getCalculatedValue();
 // $retVal = 39507.0 (29-Feb-2008)
 ```
 
-``` php
+```php
 \PhpOffice\PhpSpreadsheet\Calculation\Functions::setReturnDateType(
     \PhpOffice\PhpSpreadsheet\Calculation\Functions::RETURNDATE_EXCEL
 );
@@ -1661,7 +1661,7 @@ This is an integer ranging from 0 to 23.
 
 ##### Examples
 
-``` php
+```php
 $worksheet->setCellValue('A1', 'Time String')
     ->setCellValue('A2', '31-Dec-2008 17:30')
     ->setCellValue('A3', '14-Feb-2008 4:20 AM')
@@ -1681,7 +1681,7 @@ $retVal = $worksheet->getCell('B4')->getCalculatedValue();
 // $retVal = 16
 ```
 
-``` php
+```php
 $retVal = call_user_func_array(
     ['\PhpOffice\PhpSpreadsheet\Calculation\Functions', 'HOUROFDAY'],
     ['09:30']
@@ -1719,7 +1719,7 @@ This is an integer ranging from 0 to 59.
 
 ##### Examples
 
-``` php
+```php
 $worksheet->setCellValue('A1', 'Time String')
     ->setCellValue('A2', '31-Dec-2008 17:30')
     ->setCellValue('A3', '14-Feb-2008 4:20 AM')
@@ -1739,7 +1739,7 @@ $retVal = $worksheet->getCell('B4')->getCalculatedValue();
 // $retVal = 45
 ```
 
-``` php
+```php
 $retVal = call_user_func_array(
     ['\PhpOffice\PhpSpreadsheet\Calculation\Functions', 'MINUTE'],
     ['09:30']
@@ -1777,7 +1777,7 @@ This is an integer ranging from 1 to 12.
 
 ##### Examples
 
-``` php
+```php
 $worksheet->setCellValue('A1', 'Date String');
 $worksheet->setCellValue('A2', '31-Dec-2008');
 $worksheet->setCellValue('A3', '14-Feb-2008');
@@ -1792,7 +1792,7 @@ $retVal = $worksheet->getCell('B3')->getCalculatedValue();
 // $retVal = 2
 ```
 
-``` php
+```php
 $retVal = call_user_func_array(
     ['\PhpOffice\PhpSpreadsheet\Calculation\Functions', 'MONTHOFYEAR'],
     ['14-July-2008']
@@ -1847,10 +1847,10 @@ The number of working days between startDate and endDate.
 
 ##### Examples
 
-``` php
+```php
 ```
 
-``` php
+```php
 ```
 
 ##### Notes
@@ -1880,10 +1880,10 @@ or an Excel timestamp value (real), depending on the value of
 
 ##### Examples
 
-``` php
+```php
 ```
 
-``` php
+```php
 ```
 
 ##### Notes
@@ -1917,7 +1917,7 @@ This is an integer ranging from 0 to 59.
 
 ##### Examples
 
-``` php
+```php
 $worksheet->setCellValue('A1', 'Time String')
     ->setCellValue('A2', '31-Dec-2008 17:30:20')
     ->setCellValue('A3', '14-Feb-2008 4:20 AM')
@@ -1937,7 +1937,7 @@ $retVal = $worksheet->getCell('B4')->getCalculatedValue();
 // $retVal = 59
 ```
 
-``` php
+```php
 $retVal = call_user_func_array(
     ['\PhpOffice\PhpSpreadsheet\Calculation\Functions', 'SECOND'],
     ['09:30:17']
@@ -2002,7 +2002,7 @@ value of method.
 
 ##### Examples
 
-``` php
+```php
 $worksheet->setCellValue('A1', 'Date String')
     ->setCellValue('A2', '31-Dec-2008')
     ->setCellValue('A3', '14-Feb-2008');
@@ -2021,7 +2021,7 @@ $retVal = $worksheet->getCell('B4')->getCalculatedValue();
 // $retVal = 2
 ```
 
-``` php
+```php
 $retVal = call_user_func_array(
     ['\PhpOffice\PhpSpreadsheet\Calculation\Functions', 'WEEKDAY'],
     ['14-July-2008']
@@ -2066,7 +2066,7 @@ This is an integer year value.
 
 ##### Examples
 
-``` php
+```php
 $worksheet->setCellValue('A1', 'Date String')
     ->setCellValue('A2', '17-Jul-1982')
     ->setCellValue('A3', '16-Apr-2009');
@@ -2081,7 +2081,7 @@ $retVal = $worksheet->getCell('B3')->getCalculatedValue();
 // $retVal = 2009
 ```
 
-``` php
+```php
 $retVal = call_user_func_array(
     ['\PhpOffice\PhpSpreadsheet\Calculation\Functions', 'YEAR'],
     ['14-July-2001']
diff --git a/docs/topics/creating-spreadsheet.md b/docs/topics/creating-spreadsheet.md
index dceafe4b..3a82623e 100644
--- a/docs/topics/creating-spreadsheet.md
+++ b/docs/topics/creating-spreadsheet.md
@@ -20,7 +20,7 @@ Details of the different spreadsheet formats supported, and the options
 available to read them into a Spreadsheet object are described fully in
 the [Reading Files](./reading-files.md) document.
 
-``` php
+```php
 $inputFileName = './sampleData/example1.xls';
 
 /** Load $inputFileName to a Spreadsheet object **/
@@ -32,7 +32,7 @@ $spreadsheet = \PhpOffice\PhpSpreadsheet\IOFactory::load($inputFileName);
 If you want to create a new workbook, rather than load one from file,
 then you simply need to instantiate it as a new Spreadsheet object.
 
-``` php
+```php
 /** Create a new Spreadsheet Object **/
 $spreadsheet = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
 ```
@@ -53,7 +53,7 @@ then you also need to "break" these cyclic references before doing so.
 PhpSpreadsheet provides the `disconnectWorksheets()` method for this
 purpose.
 
-``` php
+```php
 $spreadsheet->disconnectWorksheets();
 unset($spreadsheet);
 ```
diff --git a/docs/topics/memory_saving.md b/docs/topics/memory_saving.md
index 4c9a848f..157bb704 100644
--- a/docs/topics/memory_saving.md
+++ b/docs/topics/memory_saving.md
@@ -16,7 +16,7 @@ cache usages.
 
 To enable cell caching, you must provide your own implementation of cache like so:
 
-``` php
+```php
 $cache = new MyCustomPsr16Implementation();
 
 \PhpOffice\PhpSpreadsheet\Settings::setCache($cache);
diff --git a/docs/topics/migration-from-PHPExcel.md b/docs/topics/migration-from-PHPExcel.md
index cc469768..6dc14f1f 100644
--- a/docs/topics/migration-from-PHPExcel.md
+++ b/docs/topics/migration-from-PHPExcel.md
@@ -12,7 +12,7 @@ need to be done.
 automatically your codebase. Assuming your files to be migrated lives
 in `src/`, you can run the migration like so:
 
-``` sh
+```sh
 composer require rector/rector --dev
 vendor/bin/rector process src --set phpexcel-to-phpspreadsheet
 composer remove rector/rector
diff --git a/docs/topics/reading-and-writing-to-file.md b/docs/topics/reading-and-writing-to-file.md
index 8f92e1f2..020e0634 100644
--- a/docs/topics/reading-and-writing-to-file.md
+++ b/docs/topics/reading-and-writing-to-file.md
@@ -33,7 +33,7 @@ You can create a `\PhpOffice\PhpSpreadsheet\Reader\IReader` instance using
 `\PhpOffice\PhpSpreadsheet\IOFactory` in automatic file type resolving
 mode using the following code sample:
 
-``` php
+```php
 $spreadsheet = \PhpOffice\PhpSpreadsheet\IOFactory::load("05featuredemo.xlsx");
 ```
 
@@ -45,7 +45,7 @@ If you need to set some properties on the reader, (e.g. to only read
 data, see more about this later), then you may instead want to use this
 variant:
 
-``` php
+```php
 $reader = \PhpOffice\PhpSpreadsheet\IOFactory::createReaderForFile("05featuredemo.xlsx");
 $reader->setReadDataOnly(true);
 $reader->load("05featuredemo.xlsx");
@@ -55,7 +55,7 @@ You can create a `\PhpOffice\PhpSpreadsheet\Reader\IReader` instance using
 `\PhpOffice\PhpSpreadsheet\IOFactory` in explicit mode using the following
 code sample:
 
-``` php
+```php
 $reader = \PhpOffice\PhpSpreadsheet\IOFactory::createReader("Xlsx");
 $spreadsheet = $reader->load("05featuredemo.xlsx");
 ```
@@ -68,7 +68,7 @@ mode.
 You can create a `\PhpOffice\PhpSpreadsheet\Writer\IWriter` instance using
 `\PhpOffice\PhpSpreadsheet\IOFactory`:
 
-``` php
+```php
 $writer = \PhpOffice\PhpSpreadsheet\IOFactory::createWriter($spreadsheet, "Xlsx");
 $writer->save("05featuredemo.xlsx");
 ```
@@ -84,7 +84,7 @@ outputting the in-memory spreadsheet to a .xlsx file.
 
 You can read an .xlsx file using the following code:
 
-``` php
+```php
 $reader = new \PhpOffice\PhpSpreadsheet\Reader\Xlsx();
 $spreadsheet = $reader->load("05featuredemo.xlsx");
 ```
@@ -94,7 +94,7 @@ $spreadsheet = $reader->load("05featuredemo.xlsx");
 You can set the option setReadDataOnly on the reader, to instruct the
 reader to ignore styling, data validation, … and just read cell data:
 
-``` php
+```php
 $reader = new \PhpOffice\PhpSpreadsheet\Reader\Xlsx();
 $reader->setReadDataOnly(true);
 $spreadsheet = $reader->load("05featuredemo.xlsx");
@@ -105,7 +105,7 @@ $spreadsheet = $reader->load("05featuredemo.xlsx");
 You can set the option setLoadSheetsOnly on the reader, to instruct the
 reader to only load the sheets with a given name:
 
-``` php
+```php
 $reader = new \PhpOffice\PhpSpreadsheet\Reader\Xlsx();
 $reader->setLoadSheetsOnly(["Sheet 1", "My special sheet"]);
 $spreadsheet = $reader->load("05featuredemo.xlsx");
@@ -122,7 +122,7 @@ read using the `\PhpOffice\PhpSpreadsheet\Reader\DefaultReadFilter`.
 The following code will only read row 1 and rows 20 – 30 of any sheet in
 the Excel file:
 
-``` php
+```php
 class MyReadFilter implements \PhpOffice\PhpSpreadsheet\Reader\IReadFilter {
 
     public function readCell($column, $row, $worksheetName = '') {
@@ -145,7 +145,7 @@ $spreadsheet = $reader->load("06largescale.xlsx");
 
 You can write an .xlsx file using the following code:
 
-``` php
+```php
 $writer = new \PhpOffice\PhpSpreadsheet\Writer\Xlsx($spreadsheet);
 $writer->save("05featuredemo.xlsx");
 ```
@@ -156,7 +156,7 @@ By default, this writer pre-calculates all formulas in the spreadsheet.
 This can be slow on large spreadsheets, and maybe even unwanted. You can
 however disable formula pre-calculation:
 
-``` php
+```php
 $writer = new \PhpOffice\PhpSpreadsheet\Writer\Xlsx($spreadsheet);
 $writer->setPreCalculateFormulas(false);
 $writer->save("05featuredemo.xlsx");
@@ -201,7 +201,7 @@ PHP.
 
 You can read an .xls file using the following code:
 
-``` php
+```php
 $reader = new \PhpOffice\PhpSpreadsheet\Reader\Xls();
 $spreadsheet = $reader->load("05featuredemo.xls");
 ```
@@ -211,7 +211,7 @@ $spreadsheet = $reader->load("05featuredemo.xls");
 You can set the option setReadDataOnly on the reader, to instruct the
 reader to ignore styling, data validation, … and just read cell data:
 
-``` php
+```php
 $reader = new \PhpOffice\PhpSpreadsheet\Reader\Xls();
 $reader->setReadDataOnly(true);
 $spreadsheet = $reader->load("05featuredemo.xls");
@@ -222,7 +222,7 @@ $spreadsheet = $reader->load("05featuredemo.xls");
 You can set the option setLoadSheetsOnly on the reader, to instruct the
 reader to only load the sheets with a given name:
 
-``` php
+```php
 $reader = new \PhpOffice\PhpSpreadsheet\Reader\Xls();
 $reader->setLoadSheetsOnly(["Sheet 1", "My special sheet"]);
 $spreadsheet = $reader->load("05featuredemo.xls");
@@ -239,7 +239,7 @@ read using the `\PhpOffice\PhpSpreadsheet\Reader\DefaultReadFilter`.
 The following code will only read row 1 and rows 20 to 30 of any sheet
 in the Excel file:
 
-``` php
+```php
 class MyReadFilter implements \PhpOffice\PhpSpreadsheet\Reader\IReadFilter {
 
     public function readCell($column, $row, $worksheetName = '') {
@@ -262,7 +262,7 @@ $spreadsheet = $reader->load("06largescale.xls");
 
 You can write an .xls file using the following code:
 
-``` php
+```php
 $writer = new \PhpOffice\PhpSpreadsheet\Writer\Xls($spreadsheet);
 $writer->save("05featuredemo.xls");
 ```
@@ -282,7 +282,7 @@ spreadsheets via PHP.
 
 You can read an Excel 2003 .xml file using the following code:
 
-``` php
+```php
 $reader = new \PhpOffice\PhpSpreadsheet\Reader\Xml();
 $spreadsheet = $reader->load("05featuredemo.xml");
 ```
@@ -298,7 +298,7 @@ read using the `\PhpOffice\PhpSpreadsheet\Reader\DefaultReadFilter`.
 The following code will only read row 1 and rows 20 to 30 of any sheet
 in the Excel file:
 
-``` php
+```php
 class MyReadFilter implements \PhpOffice\PhpSpreadsheet\Reader\IReadFilter {
 
     public function readCell($column, $row, $worksheetName = '') {
@@ -333,7 +333,7 @@ regarding to styling cells and handling large spreadsheets via PHP.
 
 You can read an .slk file using the following code:
 
-``` php
+```php
 $reader = new \PhpOffice\PhpSpreadsheet\Reader\Slk();
 $spreadsheet = $reader->load("05featuredemo.slk");
 ```
@@ -349,7 +349,7 @@ read using the `\PhpOffice\PhpSpreadsheet\Reader\DefaultReadFilter`.
 The following code will only read row 1 and rows 20 to 30 of any sheet
 in the SYLK file:
 
-``` php
+```php
 class MyReadFilter implements \PhpOffice\PhpSpreadsheet\Reader\IReadFilter {
 
     public function readCell($column, $row, $worksheetName = '') {
@@ -378,7 +378,7 @@ Open Office or Libre Office Calc files.
 
 You can read an .ods file using the following code:
 
-``` php
+```php
 $reader = new \PhpOffice\PhpSpreadsheet\Reader\Ods();
 $spreadsheet = $reader->load("05featuredemo.ods");
 ```
@@ -394,7 +394,7 @@ read using the `\PhpOffice\PhpSpreadsheet\Reader\DefaultReadFilter`.
 The following code will only read row 1 and rows 20 to 30 of any sheet
 in the Calc file:
 
-``` php
+```php
 class MyReadFilter implements \PhpOffice\PhpSpreadsheet\Reader\IReadFilter {
 
     public function readCell($column, $row, $worksheetName = '') {
@@ -427,7 +427,7 @@ regarding to styling cells, number formatting, ...
 
 You can read a .csv file using the following code:
 
-``` php
+```php
 $reader = new \PhpOffice\PhpSpreadsheet\Reader\Csv();
 $spreadsheet = $reader->load("sample.csv");
 ```
@@ -449,7 +449,7 @@ were created in Microsoft Office Excel the correct input encoding may
 rather be Windows-1252 (CP1252). Always make sure that the input
 encoding is set appropriately.
 
-``` php
+```php
 $reader = new \PhpOffice\PhpSpreadsheet\Reader\Csv();
 $reader->setInputEncoding('CP1252');
 $reader->setDelimiter(';');
@@ -464,7 +464,7 @@ $spreadsheet = $reader->load("sample.csv");
 CSV files can only contain one worksheet. Therefore, you can specify
 which sheet to read from CSV:
 
-``` php
+```php
 $reader->setSheetIndex(0);
 ```
 
@@ -475,7 +475,7 @@ data into an existing `Spreadsheet` object. The following code loads a
 CSV file into an existing `$spreadsheet` containing some sheets, and
 imports onto the 6th sheet:
 
-``` php
+```php
 $reader = new \PhpOffice\PhpSpreadsheet\Reader\Csv();
 $reader->setDelimiter(';');
 $reader->setEnclosure('');
@@ -490,7 +490,7 @@ $reader->loadIntoExisting("05featuredemo.csv", $spreadsheet);
 
 You can write a .csv file using the following code:
 
-``` php
+```php
 $writer = new \PhpOffice\PhpSpreadsheet\Writer\Csv($spreadsheet);
 $writer->save("05featuredemo.csv");
 ```
@@ -502,7 +502,7 @@ as a separator. You can instruct
 `\PhpOffice\PhpSpreadsheet\Writer\Csv` some options before writing a CSV
 file:
 
-``` php
+```php
 $writer = new \PhpOffice\PhpSpreadsheet\Writer\Csv($spreadsheet);
 $writer->setDelimiter(';');
 $writer->setEnclosure('');
@@ -517,7 +517,7 @@ $writer->save("05featuredemo.csv");
 CSV files can only contain one worksheet. Therefore, you can specify
 which sheet to write to CSV:
 
-``` php
+```php
 $writer->setSheetIndex(0);
 ```
 
@@ -527,7 +527,7 @@ By default, this writer pre-calculates all formulas in the spreadsheet.
 This can be slow on large spreadsheets, and maybe even unwanted. You can
 however disable formula pre-calculation:
 
-``` php
+```php
 $writer = new \PhpOffice\PhpSpreadsheet\Writer\Csv($spreadsheet);
 $writer->setPreCalculateFormulas(false);
 $writer->save("05featuredemo.csv");
@@ -542,7 +542,7 @@ it should explicitly include a BOM file header;
 if it doesn't, Excel will not interpret those characters correctly.
 This can be enabled by using the following code:
 
-``` php
+```php
 $writer = new \PhpOffice\PhpSpreadsheet\Writer\Csv($spreadsheet);
 $writer->setUseBOM(true);
 $writer->save("05featuredemo.csv");
@@ -560,14 +560,14 @@ to set the characters explicitly as shown below.
 
 English users will want to use this before doing the export:
 
-``` php
+```php
 \PhpOffice\PhpSpreadsheet\Shared\StringHelper::setDecimalSeparator('.');
 \PhpOffice\PhpSpreadsheet\Shared\StringHelper::setThousandsSeparator(',');
 ```
 
 German users will want to use the opposite values.
 
-``` php
+```php
 \PhpOffice\PhpSpreadsheet\Shared\StringHelper::setDecimalSeparator(',');
 \PhpOffice\PhpSpreadsheet\Shared\StringHelper::setThousandsSeparator('.');
 ```
@@ -592,7 +592,7 @@ regarding to styling cells, number formatting, ...
 
 You can read an .html or .htm file using the following code:
 
-``` php
+```php
 $reader = new \PhpOffice\PhpSpreadsheet\Reader\Html();
 
 $spreadsheet = $reader->load("05featuredemo.html");
@@ -610,7 +610,7 @@ first worksheet by default.
 
 You can write a .htm file using the following code:
 
-``` php
+```php
 $writer = new \PhpOffice\PhpSpreadsheet\Writer\Html($spreadsheet);
 
 $writer->save("05featuredemo.htm");
@@ -621,7 +621,7 @@ $writer->save("05featuredemo.htm");
 HTML files can contain one or more worksheets. If you want to write all
 sheets into a single HTML file, use the following code:
 
-``` php
+```php
 $writer->writeAllSheets();
 ```
 
@@ -630,7 +630,7 @@ $writer->writeAllSheets();
 HTML files can contain one or more worksheets. Therefore, you can
 specify which sheet to write to HTML:
 
-``` php
+```php
 $writer->setSheetIndex(0);
 ```
 
@@ -639,19 +639,19 @@ $writer->setSheetIndex(0);
 There might be situations where you want to explicitly set the included
 images root. For example, instead of:
 
- ``` html
+ ```html
  <img src="./images/logo.jpg">
  ```
 
 You might want to see:
 
-``` html
+```html
 <img src="http://www.domain.com/images/logo.jpg">
 ```
 
 You can use the following code to achieve this result:
 
-``` php
+```php
 $writer->setImagesRoot('http://www.example.com');
 ```
 
@@ -661,7 +661,7 @@ By default, this writer pre-calculates all formulas in the spreadsheet.
 This can be slow on large spreadsheets, and maybe even unwanted. You can
 however disable formula pre-calculation:
 
-``` php
+```php
 $writer = new \PhpOffice\PhpSpreadsheet\Writer\Html($spreadsheet);
 $writer->setPreCalculateFormulas(false);
 
@@ -686,7 +686,7 @@ Supported methods:
 Here's an example which retrieves all parts independently and merges
 them into a resulting HTML page:
 
-``` php
+```php
 $writer = new \PhpOffice\PhpSpreadsheet\Writer\Html($spreadsheet);
 $hdr = $writer->generateHTMLHeader();
 $sty = $writer->generateStyles(false); // do not write <style> and </style>
@@ -708,7 +708,7 @@ echo $writer->generateHTMLFooter();
 A HTML file can be marked as UTF-8 by writing a BOM file header. This
 can be enabled by using the following code:
 
-``` php
+```php
 $writer = new \PhpOffice\PhpSpreadsheet\Writer\Html($spreadsheet);
 $writer->setUseBOM(true);
 
@@ -751,7 +751,7 @@ own circumstances.
 
 You can instantiate a writer with its specific name, like so:
 
-``` php
+```php
 $writer = \PhpOffice\PhpSpreadsheet\IOFactory::createWriter($spreadsheet, 'Mpdf');
 ```
 
@@ -759,7 +759,7 @@ Or you can register which writer you are using with a more generic name,
 so you don't need to remember which library you chose, only that you want
 to write PDF files:
 
-``` php
+```php
 $class = \PhpOffice\PhpSpreadsheet\Writer\Pdf\Mpdf::class;
 \PhpOffice\PhpSpreadsheet\IOFactory::registerWriter('Pdf', $class);
 $writer = \PhpOffice\PhpSpreadsheet\IOFactory::createWriter($spreadsheet, 'Pdf');
@@ -767,7 +767,7 @@ $writer = \PhpOffice\PhpSpreadsheet\IOFactory::createWriter($spreadsheet, 'Pdf')
 
 Or you can instantiate directly the writer of your choice like so:
 
-``` php
+```php
 $writer = \PhpOffice\PhpSpreadsheet\Writer\Pdf\Mpdf($spreadsheet);
 ```
 
@@ -776,7 +776,7 @@ $writer = \PhpOffice\PhpSpreadsheet\Writer\Pdf\Mpdf($spreadsheet);
 If you need a custom implementation, or custom configuration, of a supported
 PDF library. You can extends the PDF library, and the PDF writer like so:
 
-``` php
+```php
 class My_Custom_TCPDF extends TCPDF
 {
 	// ...
@@ -802,7 +802,7 @@ class My_Custom_TCPDF_Writer extends \PhpOffice\PhpSpreadsheet\Writer\Pdf\Tcpdf
 Once you have identified the Renderer that you wish to use for PDF
 generation, you can write a .pdf file using the following code:
 
-``` php
+```php
 $writer = new \PhpOffice\PhpSpreadsheet\Writer\Pdf\Mpdf($spreadsheet);
 $writer->save("05featuredemo.pdf");
 ```
@@ -815,7 +815,7 @@ first worksheet by default.
 PDF files can contain one or more worksheets. If you want to write all
 sheets into a single PDF file, use the following code:
 
-``` php
+```php
 $writer->writeAllSheets();
 ```
 
@@ -824,7 +824,7 @@ $writer->writeAllSheets();
 PDF files can contain one or more worksheets. Therefore, you can specify
 which sheet to write to PDF:
 
-``` php
+```php
 $writer->setSheetIndex(0);
 ```
 
@@ -834,7 +834,7 @@ By default, this writer pre-calculates all formulas in the spreadsheet.
 This can be slow on large spreadsheets, and maybe even unwanted. You can
 however disable formula pre-calculation:
 
-``` php
+```php
 $writer = new \PhpOffice\PhpSpreadsheet\Writer\Pdf\Mpdf($spreadsheet);
 $writer->setPreCalculateFormulas(false);
 
@@ -856,7 +856,7 @@ page setup properties, headers etc.
 Here is an example how to open a template file, fill in a couple of
 fields and save it again:
 
-``` php
+```php
 $spreadsheet = \PhpOffice\PhpSpreadsheet\IOFactory::load('template.xlsx');
 
 $worksheet = $spreadsheet->getActiveSheet();
diff --git a/docs/topics/reading-files.md b/docs/topics/reading-files.md
index 779082dc..1451f2ab 100644
--- a/docs/topics/reading-files.md
+++ b/docs/topics/reading-files.md
@@ -22,7 +22,7 @@ The simplest way to load a workbook file is to let PhpSpreadsheet's IO
 Factory identify the file type and load it, calling the static `load()`
 method of the `\PhpOffice\PhpSpreadsheet\IOFactory` class.
 
-``` php
+```php
 $inputFileName = './sampleData/example1.xls';
 
 /** Load $inputFileName to a Spreadsheet Object  **/
@@ -59,7 +59,7 @@ supported filetype by name. However, you may get unpredictable results
 if the file isn't of the right type (e.g. it is a CSV with an extension
 of .xls), although this type of exception should normally be trapped.
 
-``` php
+```php
 $inputFileName = './sampleData/example1.xls';
 
 /** Create a new Xls Reader  **/
@@ -81,7 +81,7 @@ Alternatively, you can use the IO Factory's `createReader()` method to
 instantiate the reader object for you, simply telling it the file type
 of the reader that you want instantiating.
 
-``` php
+```php
 $inputFileType = 'Xls';
 //    $inputFileType = 'Xlsx';
 //    $inputFileType = 'Xml';
@@ -104,7 +104,7 @@ If you're uncertain of the filetype, you can use the `IOFactory::identify()`
 method to identify the reader that you need, before using the
 `createReader()` method to instantiate the reader object.
 
-``` php
+```php
 $inputFileName = './sampleData/example1.xls';
 
 /**  Identify the type of $inputFileName  **/
@@ -131,7 +131,7 @@ need any of the cell formatting information, then you can set the reader
 to read only the data values and any formulae from each cell using the
 `setReadDataOnly()` method.
 
-``` php
+```php
 $inputFileType = 'Xls';
 $inputFileName = './sampleData/example1.xls';
 
@@ -176,7 +176,7 @@ in reading.
 To read a single sheet, you can pass that sheet name as a parameter to
 the `setLoadSheetsOnly()` method.
 
-``` php
+```php
 $inputFileType = 'Xls';
 $inputFileName = './sampleData/example1.xls';
 $sheetname = 'Data Sheet #2';
@@ -195,7 +195,7 @@ for a working example of this code.
 If you want to read more than just a single sheet, you can pass a list
 of sheet names as an array parameter to the `setLoadSheetsOnly()` method.
 
-``` php
+```php
 $inputFileType = 'Xls';
 $inputFileName = './sampleData/example1.xls';
 $sheetnames = ['Data Sheet #1','Data Sheet #3'];
@@ -214,7 +214,7 @@ for a working example of this code.
 To reset this option to the default, you can call the `setLoadAllSheets()`
 method.
 
-``` php
+```php
 $inputFileType = 'Xls';
 $inputFileName = './sampleData/example1.xls';
 
@@ -248,7 +248,7 @@ should be read by the loader. A read filter must implement the
 whether a workbook cell identified by those arguments should be read or
 not.
 
-``` php
+```php
 $inputFileType = 'Xls';
 $inputFileName = './sampleData/example1.xls';
 $sheetname = 'Data Sheet #3';
@@ -286,7 +286,7 @@ a very specific circumstance (when you only want cells in the range
 A1:E7 from your worksheet. A generic Read Filter would probably be more
 useful:
 
-``` php
+```php
 /**  Define a Read Filter class implementing \PhpOffice\PhpSpreadsheet\Reader\IReadFilter  */
 class MyReadFilter implements \PhpOffice\PhpSpreadsheet\Reader\IReadFilter
 {
@@ -324,7 +324,7 @@ to read and process a large workbook in "chunks": an example of this
 usage might be when transferring data from an Excel worksheet to a
 database.
 
-``` php
+```php
 $inputFileType = 'Xls';
 $inputFileName = './sampleData/example2.xls';
 
@@ -393,7 +393,7 @@ the `setSheetIndex()` method of the `$reader`, then use the
 `loadIntoExisting()` method rather than the `load()` method to actually read
 the file into that worksheet.
 
-``` php
+```php
 $inputFileType = 'Csv';
 $inputFileNames = [
     './sampleData/example1.csv',
@@ -452,7 +452,7 @@ Class that we defined in [the above section](#reading-only-specific-columns-and-
 and the `setSheetIndex()` method of the `$reader`, we can split the CSV
 file across several individual worksheets.
 
-``` php
+```php
 $inputFileType = 'Csv';
 $inputFileName = './sampleData/example2.csv';
 
@@ -523,7 +523,7 @@ cannot auto-detect, it will default to the comma. If this does not fit your
 use-case, you can manually specify a separator by using the `setDelimiter()`
 method.
 
-``` php
+```php
 $inputFileType = 'Csv';
 $inputFileName = './sampleData/example1.tsv';
 
@@ -585,7 +585,7 @@ it encountered a hyperlink, or HTML markup within a CSV file.
 So using a Value Binder allows a great deal more flexibility in the
 loader logic when reading unformatted text files.
 
-``` php
+```php
 /**  Tell PhpSpreadsheet that we want to use the Advanced Value Binder  **/
 \PhpOffice\PhpSpreadsheet\Cell\Cell::setValueBinder( new \PhpOffice\PhpSpreadsheet\Cell\AdvancedValueBinder() );
 
@@ -619,7 +619,7 @@ manner.
 The PhpSpreadsheet Readers throw a
 `\PhpOffice\PhpSpreadsheet\Reader\Exception`.
 
-``` php
+```php
 $inputFileName = './sampleData/example-1.xls';
 
 try {
@@ -646,7 +646,7 @@ whole file.
 The `listWorksheetNames()` method returns a simple array listing each
 worksheet name within the workbook:
 
-``` php
+```php
 $reader = \PhpOffice\PhpSpreadsheet\IOFactory::createReader($inputFileType);
 
 $worksheetNames = $reader->listWorksheetNames($inputFileName);
@@ -667,7 +667,7 @@ for a working example of this code.
 The `listWorksheetInfo()` method returns a nested array, with each entry
 listing the name and dimensions for a worksheet:
 
-``` php
+```php
 $reader = \PhpOffice\PhpSpreadsheet\IOFactory::createReader($inputFileType);
 
 $worksheetData = $reader->listWorksheetInfo($inputFileName);
diff --git a/docs/topics/recipes.md b/docs/topics/recipes.md
index 9f8282b9..45dd19bc 100644
--- a/docs/topics/recipes.md
+++ b/docs/topics/recipes.md
@@ -20,7 +20,7 @@ metadata to search for a specific document in its document lists.
 
 Setting spreadsheet metadata is done as follows:
 
-``` php
+```php
 $spreadsheet->getProperties()
     ->setCreator("Maarten Balliauw")
     ->setLastModifiedBy("Maarten Balliauw")
@@ -38,13 +38,13 @@ $spreadsheet->getProperties()
 The following line of code sets the active sheet index to the first
 sheet:
 
-``` php
+```php
 $spreadsheet->setActiveSheetIndex(0);
 ```
 
 You can also set the active sheet by its name/title
 
-``` php
+```php
 $spreadsheet->setActiveSheetIndexByName('DataSheet')
 ```
 
@@ -68,7 +68,7 @@ UST.
 Writing a date value in a cell consists of 2 lines of code. Select the
 method that suits you the best. Here are some examples:
 
-``` php
+```php
 
 // MySQL-like timestamp '2008-12-31' or date string
 \PhpOffice\PhpSpreadsheet\Cell\Cell::setValueBinder( new \PhpOffice\PhpSpreadsheet\Cell\AdvancedValueBinder() );
@@ -136,14 +136,14 @@ The following line of code writes the formula
 formula must start with `=` to make PhpSpreadsheet recognise this as a
 formula.
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->setCellValue('B8','=IF(C4>500,"profit","loss")');
 ```
 
 If you want to write a string beginning with an `=` character to a
 cell, then you should use the `setCellValueExplicit()` method.
 
-``` php
+```php
 $spreadsheet->getActiveSheet()
     ->setCellValueExplicit(
         'B8',
@@ -154,14 +154,14 @@ $spreadsheet->getActiveSheet()
 
 A cell's formula can be read again using the following line of code:
 
-``` php
+```php
 $formula = $spreadsheet->getActiveSheet()->getCell('B8')->getValue();
 ```
 
 If you need the calculated value of a cell, use the following code. This
 is further explained in [the calculation engine](./calculation-engine.md).
 
-``` php
+```php
 $value = $spreadsheet->getActiveSheet()->getCell('B8')->getCalculatedValue();
 ```
 
@@ -171,7 +171,7 @@ Some localisation elements have been included in PhpSpreadsheet. You can
 set a locale by changing the settings. To set the locale to Russian you
 would use:
 
-``` php
+```php
 $locale = 'ru';
 $validLocale = \PhpOffice\PhpSpreadsheet\Settings::setLocale($locale);
 if (!$validLocale) {
@@ -185,7 +185,7 @@ will return an error, and English settings will be used throughout.
 Once you have set a locale, you can translate a formula from its
 internal English coding.
 
-``` php
+```php
 $formula = $spreadsheet->getActiveSheet()->getCell('B8')->getValue();
 $translatedFormula = \PhpOffice\PhpSpreadsheet\Calculation\Calculation::getInstance()->_translateFormulaToLocale($formula);
 ```
@@ -194,7 +194,7 @@ You can also create a formula using the function names and argument
 separators appropriate to the defined locale; then translate it to
 English before setting the cell value:
 
-``` php
+```php
 $formula = '=ДНЕЙ360(ДАТА(2010;2;5);ДАТА(2010;12;31);ИСТИНА)';
 $internalFormula = \PhpOffice\PhpSpreadsheet\Calculation\Calculation::getInstance()->translateFormulaToEnglish($formula);
 $spreadsheet->getActiveSheet()->setCellValue('B8',$internalFormula);
@@ -232,7 +232,7 @@ the cell.
 
 Here is how to achieve this in PhpSpreadsheet:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getCell('A1')->setValue("hello\nworld");
 $spreadsheet->getActiveSheet()->getStyle('A1')->getAlignment()->setWrapText(true);
 ```
@@ -247,7 +247,7 @@ AdvancedValuebinder.php automatically turns on "wrap text" for the cell
 when it sees a newline character in a string that you are inserting in a
 cell. Just like Microsoft Office Excel. Try this:
 
-``` php
+```php
 \PhpOffice\PhpSpreadsheet\Cell\Cell::setValueBinder( new \PhpOffice\PhpSpreadsheet\Cell\AdvancedValueBinder() );
 
 $spreadsheet->getActiveSheet()->getCell('A1')->setValue("hello\nworld");
@@ -261,7 +261,7 @@ You can set a cell's datatype explicitly by using the cell's
 setValueExplicit method, or the setCellValueExplicit method of a
 worksheet. Here's an example:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getCell('A1')
     ->setValueExplicit(
         '25',
@@ -273,7 +273,7 @@ $spreadsheet->getActiveSheet()->getCell('A1')
 
 You can make a cell a clickable URL by setting its hyperlink property:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->setCellValue('E26', 'www.phpexcel.net');
 $spreadsheet->getActiveSheet()->getCell('E26')->getHyperlink()->setUrl('https://www.example.com');
 ```
@@ -281,7 +281,7 @@ $spreadsheet->getActiveSheet()->getCell('E26')->getHyperlink()->setUrl('https://
 If you want to make a hyperlink to another worksheet/cell, use the
 following code:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->setCellValue('E26', 'www.phpexcel.net');
 $spreadsheet->getActiveSheet()->getCell('E26')->getHyperlink()->setUrl("sheet://'Sheetname'!A1");
 ```
@@ -293,7 +293,7 @@ $spreadsheet->getActiveSheet()->getCell('E26')->getHyperlink()->setUrl("sheet://
 Setting a worksheet's page orientation and size can be done using the
 following lines of code:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getPageSetup()
     ->setOrientation(\PhpOffice\PhpSpreadsheet\Worksheet\PageSetup::ORIENTATION_LANDSCAPE);
 $spreadsheet->getActiveSheet()->getPageSetup()
@@ -324,7 +324,7 @@ setFitToHeight(...) | 1             | setFitToPage(TRUE)          | value 0 mean
 
 Here is how to fit to 1 page wide by infinite pages tall:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getPageSetup()->setFitToWidth(1);
 $spreadsheet->getActiveSheet()->getPageSetup()->setFitToHeight(0);
 ```
@@ -340,7 +340,7 @@ the initial values.
 
 To set page margins for a worksheet, use this code:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getPageMargins()->setTop(1);
 $spreadsheet->getActiveSheet()->getPageMargins()->setRight(0.75);
 $spreadsheet->getActiveSheet()->getPageMargins()->setLeft(0.75);
@@ -356,7 +356,7 @@ Note that the margin values are specified in inches.
 To center a page horizontally/vertically, you can use the following
 code:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getPageSetup()->setHorizontalCentered(true);
 $spreadsheet->getActiveSheet()->getPageSetup()->setVerticalCentered(false);
 ```
@@ -366,7 +366,7 @@ $spreadsheet->getActiveSheet()->getPageSetup()->setVerticalCentered(false);
 Setting a worksheet's print header and footer can be done using the
 following lines of code:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getHeaderFooter()
     ->setOddHeader('&C&HPlease treat this document as confidential!');
 $spreadsheet->getActiveSheet()->getHeaderFooter()
@@ -460,13 +460,13 @@ $spreadsheet->getActiveSheet()->getHeaderFooter()->addImage($drawing, \PhpOffice
 To set a print break, use the following code, which sets a row break on
 row 10.
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->setBreak('A10', \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet::BREAK_ROW);
 ```
 
 The following line of code sets a print break on column D:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->setBreak('D10', \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet::BREAK_COLUMN);
 ```
 
@@ -484,7 +484,7 @@ PhpSpreadsheet can repeat specific rows/cells at top/left of a page. The
 following code is an example of how to repeat row 1 to 5 on each printed
 page of a specific worksheet:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getPageSetup()->setRowsToRepeatAtTopByStartAndEnd(1, 5);
 ```
 
@@ -492,13 +492,13 @@ $spreadsheet->getActiveSheet()->getPageSetup()->setRowsToRepeatAtTopByStartAndEn
 
 To specify a worksheet's printing area, use the following code:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getPageSetup()->setPrintArea('A1:E5');
 ```
 
 There can also be multiple printing areas in a single worksheet:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getPageSetup()->setPrintArea('A1:E5,G4:M20');
 ```
 
@@ -511,7 +511,7 @@ For example, one can set the foreground colour of a cell to red, aligned
 to the right, and the border to black and thick border style. Let's do
 that on cell B2:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getStyle('B2')
     ->getFont()->getColor()->setARGB(\PhpOffice\PhpSpreadsheet\Style\Color::COLOR_RED);
 $spreadsheet->getActiveSheet()->getStyle('B2')
@@ -533,7 +533,7 @@ $spreadsheet->getActiveSheet()->getStyle('B2')
 `getStyle()` also accepts a cell range as a parameter. For example, you
 can set a red background color on a range of cells:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getStyle('B3:B7')->getFill()
     ->setFillType(\PhpOffice\PhpSpreadsheet\Style\Fill::FILL_SOLID)
     ->getStartColor()->setARGB('FFFF0000');
@@ -548,7 +548,7 @@ There is also an alternative manner to set styles. The following code
 sets a cell's style to font bold, alignment right, top border thin and a
 gradient fill:
 
-``` php
+```php
 $styleArray = [
     'font' => [
         'bold' => true,
@@ -578,7 +578,7 @@ $spreadsheet->getActiveSheet()->getStyle('A3')->applyFromArray($styleArray);
 
 Or with a range of cells:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getStyle('B3:B7')->applyFromArray($styleArray);
 ```
 
@@ -602,7 +602,7 @@ number format code unless you need a custom number format.
 In PhpSpreadsheet, you can also apply various predefined number formats.
 Example:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getStyle('A1')->getNumberFormat()
     ->setFormatCode(\PhpOffice\PhpSpreadsheet\Style\NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1);
 ```
@@ -614,7 +614,7 @@ up as 1.587,20)
 
 You can achieve exactly the same as the above by using this:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getStyle('A1')->getNumberFormat()
     ->setFormatCode('#,##0.00');
 ```
@@ -623,7 +623,7 @@ In Microsoft Office Excel, as well as in PhpSpreadsheet, you will have
 to interact with raw number format codes whenever you need some special
 custom number format. Example:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getStyle('A1')->getNumberFormat()
     ->setFormatCode('[Blue][>=3000]$#,##0;[Red][<0]$#,##0;$#,##0');
 ```
@@ -631,7 +631,7 @@ $spreadsheet->getActiveSheet()->getStyle('A1')->getNumberFormat()
 Another example is when you want numbers zero-padded with leading zeros
 to a fixed length:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getCell('A1')->setValue(19);
 $spreadsheet->getActiveSheet()->getStyle('A1')->getNumberFormat()
     ->setFormatCode('0000'); // will show as 0019 in Excel
@@ -646,7 +646,7 @@ The readers shipped with PhpSpreadsheet come to the rescue. Load your
 template workbook using e.g. Xlsx reader to reveal the number format
 code. Example how read a number format code for cell A1:
 
-``` php
+```php
 $reader = \PhpOffice\PhpSpreadsheet\IOFactory::createReader('Xlsx');
 $spreadsheet = $reader->load('template.xlsx');
 var_dump($spreadsheet->getActiveSheet()->getStyle('A1')->getNumberFormat()->getFormatCode());
@@ -661,14 +661,14 @@ code in *xl/styles.xml*.
 
 Let's set vertical alignment to the top for cells A1:D4
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getStyle('A1:D4')
     ->getAlignment()->setVertical(\PhpOffice\PhpSpreadsheet\Style\Alignment::VERTICAL_TOP);
 ```
 
 Here is how to achieve wrap text:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getStyle('A1:D4')
     ->getAlignment()->setWrapText(true);
 ```
@@ -678,7 +678,7 @@ $spreadsheet->getActiveSheet()->getStyle('A1:D4')
 It is possible to set the default style of a workbook. Let's set the
 default font to Arial size 8:
 
-``` php
+```php
 $spreadsheet->getDefaultStyle()->getFont()->setName('Arial');
 $spreadsheet->getDefaultStyle()->getFont()->setSize(8);
 ```
@@ -689,7 +689,7 @@ In PhpSpreadsheet it is easy to apply various borders on a rectangular
 selection. Here is how to apply a thick red border outline around cells
 B2:G8.
 
-``` php
+```php
 $styleArray = [
     'borders' => [
         'outline' => [
@@ -839,7 +839,7 @@ is below zero, and to green if its value is zero or more.
 One can set a conditional style ruleset to a cell using the following
 code:
 
-``` php
+```php
 $conditional1 = new \PhpOffice\PhpSpreadsheet\Style\Conditional();
 $conditional1->setConditionType(\PhpOffice\PhpSpreadsheet\Style\Conditional::CONDITION_CELLIS);
 $conditional1->setOperatorType(\PhpOffice\PhpSpreadsheet\Style\Conditional::OPERATOR_LESSTHAN);
@@ -864,7 +864,7 @@ $spreadsheet->getActiveSheet()->getStyle('B2')->setConditionalStyles($conditiona
 If you want to copy the ruleset to other cells, you can duplicate the
 style object:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()
     ->duplicateStyle(
         $spreadsheet->getActiveSheet()->getStyle('B2'),
@@ -877,7 +877,7 @@ $spreadsheet->getActiveSheet()
 To add a comment to a cell, use the following code. The example below
 adds a comment to cell E11:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()
     ->getComment('E11')
     ->setAuthor('Mark Baker');
@@ -899,7 +899,7 @@ $spreadsheet->getActiveSheet()
 
 To apply an autofilter to a range of cells, use the following code:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->setAutoFilter('A1:C9');
 ```
 
@@ -923,7 +923,7 @@ the internal formula.
 worksheet or cell protection features!** This can be done using the following
 code:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getProtection()->setSheet(true);
 ```
 
@@ -931,7 +931,7 @@ $spreadsheet->getActiveSheet()->getProtection()->setSheet(true);
 
 An example on setting document security:
 
-``` php
+```php
 $security = $spreadsheet->getSecurity();
 $security->setLockWindows(true);
 $security->setLockStructure(true);
@@ -942,7 +942,7 @@ $security->setWorkbookPassword("PhpSpreadsheet");
 
 An example on setting worksheet security:
 
-``` php
+```php
 $protection = $spreadsheet->getActiveSheet()->getProtection();
 $protection->setPassword('PhpSpreadsheet');
 $protection->setSheet(true);
@@ -968,7 +968,7 @@ when setting a new password.
 
 An example on setting cell security:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getStyle('B1')
     ->getProtection()
     ->setLocked(\PhpOffice\PhpSpreadsheet\Style\Protection::PROTECTION_UNPROTECTED);
@@ -1008,7 +1008,7 @@ filter can be a range (i.e. value must be between 0 and 10), a list
 The following piece of code only allows numbers between 10 and 20 to be
 entered in cell B3:
 
-``` php
+```php
 $validation = $spreadsheet->getActiveSheet()->getCell('B3')
     ->getDataValidation();
 $validation->setType( \PhpOffice\PhpSpreadsheet\Cell\DataValidation::TYPE_WHOLE );
@@ -1027,7 +1027,7 @@ $validation->setFormula2(20);
 The following piece of code only allows an item picked from a list of
 data to be entered in cell B5:
 
-``` php
+```php
 $validation = $spreadsheet->getActiveSheet()->getCell('B5')
     ->getDataValidation();
 $validation->setType( \PhpOffice\PhpSpreadsheet\Cell\DataValidation::TYPE_LIST );
@@ -1057,7 +1057,7 @@ the item values themselves can contain the comma `,` character itself.
 If you need data validation on multiple cells, one can clone the
 ruleset:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getCell('B8')->setDataValidation(clone $validation);
 ```
 
@@ -1065,7 +1065,7 @@ $spreadsheet->getActiveSheet()->getCell('B8')->setDataValidation(clone $validati
 
 A column's width can be set using the following code:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getColumnDimension('D')->setWidth(12);
 ```
 
@@ -1073,7 +1073,7 @@ If you want PhpSpreadsheet to perform an automatic width calculation,
 use the following code. PhpSpreadsheet will approximate the column with
 to the width of the widest column value.
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getColumnDimension('B')->setAutoSize(true);
 ```
 
@@ -1110,7 +1110,7 @@ To set a worksheet's column visibility, you can use the following code.
 The first line explicitly shows the column C, the second line hides
 column D.
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getColumnDimension('C')->setVisible(true);
 $spreadsheet->getActiveSheet()->getColumnDimension('D')->setVisible(false);
 ```
@@ -1119,7 +1119,7 @@ $spreadsheet->getActiveSheet()->getColumnDimension('D')->setVisible(false);
 
 To group/outline a column, you can use the following code:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getColumnDimension('E')->setOutlineLevel(1);
 ```
 
@@ -1127,7 +1127,7 @@ You can also collapse the column. Note that you should also set the
 column invisible, otherwise the collapse will not be visible in Excel
 2007.
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getColumnDimension('E')->setCollapsed(true);
 $spreadsheet->getActiveSheet()->getColumnDimension('E')->setVisible(false);
 ```
@@ -1138,7 +1138,7 @@ on collapsing.
 You can instruct PhpSpreadsheet to add a summary to the right (default),
 or to the left. The following code adds the summary to the left:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->setShowSummaryRight(false);
 ```
 
@@ -1146,7 +1146,7 @@ $spreadsheet->getActiveSheet()->setShowSummaryRight(false);
 
 A row's height can be set using the following code:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getRowDimension('10')->setRowHeight(100);
 ```
 
@@ -1159,7 +1159,7 @@ of values is between 0 and 409 pts, where 0 pts is a hidden row.
 To set a worksheet''s row visibility, you can use the following code.
 The following example hides row number 10.
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getRowDimension('10')->setVisible(false);
 ```
 
@@ -1171,21 +1171,21 @@ AutoFilter range if you save the file.
 
 To group/outline a row, you can use the following code:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getRowDimension('5')->setOutlineLevel(1);
 ```
 
 You can also collapse the row. Note that you should also set the row
 invisible, otherwise the collapse will not be visible in Excel 2007.
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getRowDimension('5')->setCollapsed(true);
 $spreadsheet->getActiveSheet()->getRowDimension('5')->setVisible(false);
 ```
 
 Here's an example which collapses rows 50 to 80:
 
-``` php
+```php
 for ($i = 51; $i <= 80; $i++) {
     $spreadsheet->getActiveSheet()->setCellValue('A' . $i, "FName $i");
     $spreadsheet->getActiveSheet()->setCellValue('B' . $i, "LName $i");
@@ -1202,7 +1202,7 @@ $spreadsheet->getActiveSheet()->getRowDimension(81)->setCollapsed(true);
 You can instruct PhpSpreadsheet to add a summary below the collapsible
 rows (default), or above. The following code adds the summary above:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->setShowSummaryBelow(false);
 ```
 
@@ -1212,13 +1212,13 @@ 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:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->mergeCells('A18:E22');
 ```
 
 Removing a merge can be done using the unmergeCells method:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->unmergeCells('A18:E22');
 ```
 
@@ -1227,7 +1227,7 @@ $spreadsheet->getActiveSheet()->unmergeCells('A18:E22');
 You can insert/remove rows/columns at a specific position. The following
 code inserts 2 new rows, right before row 7:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->insertNewRowBefore(7, 2);
 ```
 
@@ -1238,7 +1238,7 @@ to a worksheet. Therefore, you must first instantiate a new
 `\PhpOffice\PhpSpreadsheet\Worksheet\Drawing`, and assign its properties a
 meaningful value:
 
-``` php
+```php
 $drawing = new \PhpOffice\PhpSpreadsheet\Worksheet\Drawing();
 $drawing->setName('Logo');
 $drawing->setDescription('Logo');
@@ -1250,13 +1250,13 @@ To add the above drawing to the worksheet, use the following snippet of
 code. PhpSpreadsheet creates the link between the drawing and the
 worksheet:
 
-``` php
+```php
 $drawing->setWorksheet($spreadsheet->getActiveSheet());
 ```
 
 You can set numerous properties on a drawing, here are some examples:
 
-``` php
+```php
 $drawing->setName('Paid');
 $drawing->setDescription('Paid');
 $drawing->setPath('./images/paid.png');
@@ -1270,7 +1270,7 @@ $drawing->getShadow()->setDirection(45);
 You can also add images created using GD functions without needing to
 save them to disk first as In-Memory drawings.
 
-``` php
+```php
 //  Use GD to create an in-memory image
 $gdImage = @imagecreatetruecolor(120, 20) or die('Cannot Initialize new GD image stream');
 $textColor = imagecolorallocate($gdImage, 255, 255, 255);
@@ -1298,7 +1298,7 @@ that has been loaded, and save them as individual image files to disk.
 The following code extracts images from the current active worksheet,
 and writes each as a separate file.
 
-``` php
+```php
 $i = 0;
 foreach ($spreadsheet->getActiveSheet()->getDrawingCollection() as $drawing) {
     if ($drawing instanceof \PhpOffice\PhpSpreadsheet\Worksheet\MemoryDrawing) {
@@ -1343,7 +1343,7 @@ creates the following rich text string:
 > This invoice is ***payable within thirty days after the end of the
 > month*** unless specified otherwise on the invoice.
 
-``` php
+```php
 $richText = new \PhpOffice\PhpSpreadsheet\RichText\RichText();
 $richText->createText('This invoice is ');
 $payable = $richText->createTextRun('payable within thirty days after the end of the month');
@@ -1359,7 +1359,7 @@ $spreadsheet->getActiveSheet()->getCell('A18')->setValue($richText);
 PhpSpreadsheet supports the definition of named ranges. These can be
 defined using the following code:
 
-``` php
+```php
 // Add some data
 $spreadsheet->setActiveSheetIndex(0);
 $spreadsheet->getActiveSheet()->setCellValue('A1', 'Firstname:');
@@ -1402,7 +1402,7 @@ your document is needed, it is recommended not to use `php://output`.
 Example of a script redirecting an Excel 2007 file to the client's
 browser:
 
-``` php
+```php
 /* Here there will be some code where you create $spreadsheet */
 
 // redirect output to client browser
@@ -1416,7 +1416,7 @@ $writer->save('php://output');
 
 Example of a script redirecting an Xls file to the client's browser:
 
-``` php
+```php
 /* Here there will be some code where you create $spreadsheet */
 
 // redirect output to client browser
@@ -1444,7 +1444,7 @@ at the client browser, and/or that headers cannot be set by PHP
 
 Default column width can be set using the following code:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getDefaultColumnDimension()->setWidth(12);
 ```
 
@@ -1452,7 +1452,7 @@ $spreadsheet->getActiveSheet()->getDefaultColumnDimension()->setWidth(12);
 
 Default row height can be set using the following code:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getDefaultRowDimension()->setRowHeight(15);
 ```
 
@@ -1465,7 +1465,7 @@ file to a temporary location.
 Here''s an example which generates an image in memory and adds it to the
 active worksheet:
 
-``` php
+```php
 // Generate an image
 $gdImage = @imagecreatetruecolor(120, 20) or die('Cannot Initialize new GD image stream');
 $textColor = imagecolorallocate($gdImage, 255, 255, 255);
@@ -1486,7 +1486,7 @@ $drawing->setWorksheet($spreadsheet->getActiveSheet());
 
 To set a worksheet's zoom level, the following code can be used:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()->getSheetView()->setZoomScale(75);
 ```
 
@@ -1497,7 +1497,7 @@ Note that zoom level should be in range 10 - 400.
 Sometimes you want to set a color for sheet tab. For example you can
 have a red sheet tab:
 
-``` php
+```php
 $worksheet->getTabColor()->setRGB('FF0000');
 ```
 
@@ -1505,7 +1505,7 @@ $worksheet->getTabColor()->setRGB('FF0000');
 
 If you need to create more worksheets in the workbook, here is how:
 
-``` php
+```php
 $worksheet1 = $spreadsheet->createSheet();
 $worksheet1->setTitle('Another sheet');
 ```
@@ -1518,7 +1518,7 @@ worksheets in the workbook.
 
 Set a worksheet to be **hidden** using this code:
 
-``` php
+```php
 $spreadsheet->getActiveSheet()
     ->setSheetState(\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet::SHEETSTATE_HIDDEN);
 ```
@@ -1540,7 +1540,7 @@ Worksheets can be set individually whether column `A` should start at
 left or right side. Default is left. Here is how to set columns from
 right-to-left.
 
-``` php
+```php
 // right-to-left worksheet
 $spreadsheet->getActiveSheet()->setRightToLeft(true);
 ```
diff --git a/docs/topics/settings.md b/docs/topics/settings.md
index a9aae9f9..4463ceeb 100644
--- a/docs/topics/settings.md
+++ b/docs/topics/settings.md
@@ -13,7 +13,7 @@ Read more about [memory saving](./memory_saving.md).
 
 To enable cell caching, you must provide your own implementation of cache like so:
 
-``` php
+```php
 $cache = new MyCustomPsr16Implementation();
 
 \PhpOffice\PhpSpreadsheet\Settings::setCache($cache);
@@ -25,7 +25,7 @@ Some localisation elements have been included in PhpSpreadsheet. You can
 set a locale by changing the settings. To set the locale to Brazilian
 Portuguese you would use:
 
-``` php
+```php
 $locale = 'pt_br';
 $validLocale = \PhpOffice\PhpSpreadsheet\Settings::setLocale($locale);
 if (!$validLocale) {
diff --git a/docs/topics/worksheets.md b/docs/topics/worksheets.md
index f97a0066..0199f13c 100644
--- a/docs/topics/worksheets.md
+++ b/docs/topics/worksheets.md
@@ -25,7 +25,7 @@ each worksheet "tab" is shown when the workbook is opened in MS Excel
 (or other appropriate Spreadsheet program). To access a sheet by its
 index, use the `getSheet()` method.
 
-``` php
+```php
 // Get the second sheet in the workbook
 // Note that sheets are indexed from 0
 $spreadsheet->getSheet(1);
@@ -38,7 +38,7 @@ workbook.
 To access a sheet by name, use the `getSheetByName()` method, specifying
 the name of the worksheet that you want to access.
 
-``` php
+```php
 // Retrieve the worksheet called 'Worksheet 1'
 $spreadsheet->getSheetByName('Worksheet 1');
 ```
@@ -48,7 +48,7 @@ and you can access that directly. The currently active worksheet is the
 one that will be active when the workbook is opened in MS Excel (or
 other appropriate Spreadsheet program).
 
-``` php
+```php
 // Retrieve the current active worksheet
 $spreadsheet->getActiveSheet();
 ```
@@ -64,7 +64,7 @@ a new "last" sheet; but you can also specify an index position as an
 argument, and the worksheet will be inserted at that position, shuffling
 all subsequent worksheets in the collection down a place.
 
-``` php
+```php
 $spreadsheet->createSheet();
 ```
 
@@ -76,7 +76,7 @@ Alternatively, you can instantiate a new worksheet (setting the title to
 whatever you choose) and then insert it into your workbook using the
 `addSheet()` method.
 
-``` php
+```php
 // Create a new worksheet called "My Data"
 $myWorkSheet = new \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet($spreadsheet, 'My Data');
 
@@ -93,7 +93,7 @@ Sheets within the same workbook can be copied by creating a clone of the
 worksheet you wish to copy, and then using the `addSheet()` method to
 insert the clone into the workbook.
 
-``` php
+```php
 $clonedWorksheet = clone $spreadsheet->getSheetByName('Worksheet 1');
 $clonedWorksheet->setTitle('Copy of Worksheet 1');
 $spreadsheet->addSheet($clonedWorksheet);
@@ -117,7 +117,7 @@ duplicate name.
 You can delete a worksheet from a workbook, identified by its index
 position, using the `removeSheetByIndex()` method
 
-``` php
+```php
 $sheetIndex = $spreadsheet->getIndex(
     $spreadsheet->getSheetByName('Worksheet 1')
 );

From 21bfb5b3243b8ceb9eda499a4d699fc42c11a9d1 Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Sun, 31 May 2020 22:49:28 +0900
Subject: [PATCH 010/153] 1.13.0

### Added

- Support writing to streams in all writers [#1292](https://github.com/PHPOffice/PhpSpreadsheet/issues/1292)
- Support CSV files with data wrapping a lot of lines [#1468](https://github.com/PHPOffice/PhpSpreadsheet/pull/1468)
- Support protection of worksheet by a specific hash algorithm [#1485](https://github.com/PHPOffice/PhpSpreadsheet/pull/1485)

### Fixed

- Fix Chart samples by updating chart parameter from 0 to DataSeries::EMPTY_AS_GAP [#1448](https://github.com/PHPOffice/PhpSpreadsheet/pull/1448)
- Fix return type in docblock for the Cells::get() [#1398](https://github.com/PHPOffice/PhpSpreadsheet/pull/1398)
- Fix RATE, PRICE, XIRR, and XNPV Functions [#1456](https://github.com/PHPOffice/PhpSpreadsheet/pull/1456)
- Save Excel 2010+ functions properly in XLSX [#1461](https://github.com/PHPOffice/PhpSpreadsheet/pull/1461)
- Several improvements in HTML writer [#1464](https://github.com/PHPOffice/PhpSpreadsheet/pull/1464)
- Fix incorrect behaviour when saving XLSX file with drawings [#1462](https://github.com/PHPOffice/PhpSpreadsheet/pull/1462),
- Fix Crash while trying setting a cell the value "123456\n" [#1476](https://github.com/PHPOffice/PhpSpreadsheet/pull/1481)
- Improved DATEDIF() function and reduced errors for Y and YM units [#1466](https://github.com/PHPOffice/PhpSpreadsheet/pull/1466)
- Stricter typing for mergeCells [#1494](https://github.com/PHPOffice/PhpSpreadsheet/pull/1494)

### Changed

- Drop support for PHP 7.1, according to https://phpspreadsheet.readthedocs.io/en/latest/#php-version-support
- Drop partial migration tool in favor of complete migration via RectorPHP [#1445](https://github.com/PHPOffice/PhpSpreadsheet/issues/1445)
- Limit composer package to `src/` [#1424](https://github.com/PHPOffice/PhpSpreadsheet/pull/1424)
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28aed385..0c139850 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com)
 and this project adheres to [Semantic Versioning](https://semver.org).
 
-## [Unreleased]
+## [1.13.0] - 2020-05-31
 
 ### Added
 

From ac7fb4a31d16cec9ee8313cd7ffe357bc9039447 Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Sun, 31 May 2020 23:11:40 +0900
Subject: [PATCH 011/153] Generate API doc on master

It seems we can't be both on a tag and on master at the same time
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 31ae804e..05e964a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@ jobs:
         - php ocular.phar code-coverage:upload --format=php-clover tests/coverage-clover.xml
 
     - stage: API documentations
-      if: tag is present AND branch = master
+      if: branch = master
       php: 7.4
       before_script:
         - curl -LO https://github.com/phpDocumentor/phpDocumentor/releases/download/v3.0.0-rc/phpDocumentor.phar

From d7efe9f67151c68eddfdbe9660a26696cb7cc4ea Mon Sep 17 00:00:00 2001
From: Reijn <reijnnn@gmail.com>
Date: Sun, 31 May 2020 19:03:19 +0300
Subject: [PATCH 012/153] Delete unnecessary class member

---
 src/PhpSpreadsheet/Worksheet/Protection.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/PhpSpreadsheet/Worksheet/Protection.php b/src/PhpSpreadsheet/Worksheet/Protection.php
index 81abc0b7..ba3af0a7 100644
--- a/src/PhpSpreadsheet/Worksheet/Protection.php
+++ b/src/PhpSpreadsheet/Worksheet/Protection.php
@@ -143,13 +143,6 @@ class Protection
      */
     private $algorithm = '';
 
-    /**
-     * Hash value.
-     *
-     * @var string
-     */
-    private $hash = '';
-
     /**
      * Salt value.
      *

From 9ba8db761b71b1d0dea43cac98ec18a60ae1911b Mon Sep 17 00:00:00 2001
From: oleibman <eclipsechasers2@yahoo.com>
Date: Sun, 31 May 2020 10:51:53 -0700
Subject: [PATCH 013/153] Update docs/topics/reading-and-writing-to-file.md

Co-authored-by: Adrien Crivelli <adrien.crivelli@gmail.com>
---
 docs/topics/reading-and-writing-to-file.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/topics/reading-and-writing-to-file.md b/docs/topics/reading-and-writing-to-file.md
index abd7c5f3..aa885f61 100644
--- a/docs/topics/reading-and-writing-to-file.md
+++ b/docs/topics/reading-and-writing-to-file.md
@@ -703,7 +703,7 @@ echo $writer->generateSheetData();
 echo $writer->generateHTMLFooter();
 ```
 
-#### Editing HTML During Save Via a Callback
+#### Editing HTML during save via a callback
 
 You can also add a callback function to edit the generated html
 before saving. For example, you could add a webfont

From 7e87a9f8d8cdd25dfec07ee2a9a12b791183bf09 Mon Sep 17 00:00:00 2001
From: oleibman <eclipsechasers2@yahoo.com>
Date: Sun, 31 May 2020 10:54:30 -0700
Subject: [PATCH 014/153] Update samples/Pdf/21a_Pdf.php

Co-authored-by: Adrien Crivelli <adrien.crivelli@gmail.com>
---
 samples/Pdf/21a_Pdf.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/Pdf/21a_Pdf.php b/samples/Pdf/21a_Pdf.php
index c4dc2c48..6ab1938f 100644
--- a/samples/Pdf/21a_Pdf.php
+++ b/samples/Pdf/21a_Pdf.php
@@ -25,7 +25,7 @@ background-color: yellow;
 
 EOF;
 
-    return preg_replace('@</head>@', "$newstyle</head>", $html);
+    return preg_replace('~</head>~', "$newstyle</head>", $html);
 }
 
 $helper->log('Write to Dompdf');

From 32b01148f438d534d09739c62c5a8162cfce1ebf Mon Sep 17 00:00:00 2001
From: oleibman <eclipsechasers2@yahoo.com>
Date: Sun, 31 May 2020 10:56:27 -0700
Subject: [PATCH 015/153] Update src/PhpSpreadsheet/Writer/Html.php

Co-authored-by: Adrien Crivelli <adrien.crivelli@gmail.com>
---
 src/PhpSpreadsheet/Writer/Html.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/PhpSpreadsheet/Writer/Html.php b/src/PhpSpreadsheet/Writer/Html.php
index 963b02d7..2796de50 100644
--- a/src/PhpSpreadsheet/Writer/Html.php
+++ b/src/PhpSpreadsheet/Writer/Html.php
@@ -197,9 +197,9 @@ class Html extends BaseWriter
 
         // Write footer
         $html .= $this->generateHTMLFooter();
-        $cbk = $this->editHtmlCallback;
-        if ($cbk) {
-            $html = $cbk($html);
+        $callback = $this->editHtmlCallback;
+        if ($callback) {
+            $html = $callback($html);
         }
 
         Calculation::setArrayReturnType($saveArrayReturnType);

From 68002815ec436157e851d863d4968e9b0417f59a Mon Sep 17 00:00:00 2001
From: oleibman <eclipsechasers2@yahoo.com>
Date: Sun, 31 May 2020 10:59:10 -0700
Subject: [PATCH 016/153] Update src/PhpSpreadsheet/Writer/Html.php

Co-authored-by: Adrien Crivelli <adrien.crivelli@gmail.com>
---
 src/PhpSpreadsheet/Writer/Html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PhpSpreadsheet/Writer/Html.php b/src/PhpSpreadsheet/Writer/Html.php
index 2796de50..1403d9be 100644
--- a/src/PhpSpreadsheet/Writer/Html.php
+++ b/src/PhpSpreadsheet/Writer/Html.php
@@ -134,9 +134,9 @@ class Html extends BaseWriter
     /**
      * Callback for editing generated html.
      *
-     * @var callable
+     * @var null|callable
      */
-    protected $editHtmlCallback = '';
+    protected $editHtmlCallback = null;
 
     /**
      * Create a new HTML.

From f42c3ef5a093571f22922c9e708896313e8109a2 Mon Sep 17 00:00:00 2001
From: oleibman <eclipsechasers2@yahoo.com>
Date: Sun, 31 May 2020 10:59:52 -0700
Subject: [PATCH 017/153] Update src/PhpSpreadsheet/Writer/Html.php

Co-authored-by: Adrien Crivelli <adrien.crivelli@gmail.com>
---
 src/PhpSpreadsheet/Writer/Html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpSpreadsheet/Writer/Html.php b/src/PhpSpreadsheet/Writer/Html.php
index 1403d9be..fceec678 100644
--- a/src/PhpSpreadsheet/Writer/Html.php
+++ b/src/PhpSpreadsheet/Writer/Html.php
@@ -208,7 +208,7 @@ class Html extends BaseWriter
         return $html;
     }
 
-    public function setEditHtmlCallback(callable $cbk): void
+    public function setEditHtmlCallback(?callable $cbk): void
     {
         $this->editHtmlCallback = $cbk;
     }

From 39eeef5ec658b796a689694a3ea66d95de596910 Mon Sep 17 00:00:00 2001
From: oleibman <eclipsechasers2@yahoo.com>
Date: Sun, 31 May 2020 11:01:14 -0700
Subject: [PATCH 018/153] Update src/PhpSpreadsheet/Writer/Html.php

Co-authored-by: Adrien Crivelli <adrien.crivelli@gmail.com>
---
 src/PhpSpreadsheet/Writer/Html.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/PhpSpreadsheet/Writer/Html.php b/src/PhpSpreadsheet/Writer/Html.php
index fceec678..942685f6 100644
--- a/src/PhpSpreadsheet/Writer/Html.php
+++ b/src/PhpSpreadsheet/Writer/Html.php
@@ -213,11 +213,6 @@ class Html extends BaseWriter
         $this->editHtmlCallback = $cbk;
     }
 
-    public function resetEditHtmlCallback(): void
-    {
-        $this->editHtmlCallback = '';
-    }
-
     const VALIGN_ARR = [
         Alignment::VERTICAL_BOTTOM => 'bottom',
         Alignment::VERTICAL_TOP => 'top',

From 48c65cff7fe76dc587757ce3e29d482af9055be0 Mon Sep 17 00:00:00 2001
From: oleibman <eclipsechasers2@yahoo.com>
Date: Sun, 31 May 2020 11:11:18 -0700
Subject: [PATCH 019/153] Update CallbackTest.php

resetEditHtmlCallback was removed per suggestions from PowerKiki
---
 tests/PhpSpreadsheetTests/Writer/Html/CallbackTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/PhpSpreadsheetTests/Writer/Html/CallbackTest.php b/tests/PhpSpreadsheetTests/Writer/Html/CallbackTest.php
index f712419c..388dbd0e 100644
--- a/tests/PhpSpreadsheetTests/Writer/Html/CallbackTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Html/CallbackTest.php
@@ -33,7 +33,7 @@ EOF;
         $html1 = $writer->generateHTMLall();
         $writer->setEditHtmlCallback([$this, 'yellowBody']);
         $html2 = $writer->generateHTMLall();
-        $writer->resetEditHtmlCallback();
+        $writer->setEditHtmlCallback(null);
         $html3 = $writer->generateHTMLall();
 
         self::assertFalse(strpos($html1, 'background-color: yellow'));

From bbaf03c2efec48720c67dbaa8f3b2aab6a112786 Mon Sep 17 00:00:00 2001
From: oleibman <eclipsechasers2@yahoo.com>
Date: Sun, 31 May 2020 11:18:47 -0700
Subject: [PATCH 020/153] Update Html.php

Travis says no need to initialize private class variable to null.
---
 src/PhpSpreadsheet/Writer/Html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpSpreadsheet/Writer/Html.php b/src/PhpSpreadsheet/Writer/Html.php
index 942685f6..752f286f 100644
--- a/src/PhpSpreadsheet/Writer/Html.php
+++ b/src/PhpSpreadsheet/Writer/Html.php
@@ -136,7 +136,7 @@ class Html extends BaseWriter
      *
      * @var null|callable
      */
-    protected $editHtmlCallback = null;
+    protected $editHtmlCallback;
 
     /**
      * Create a new HTML.

From 5c18bb5798be3c186e89b534de691a20beab21a7 Mon Sep 17 00:00:00 2001
From: Mark Baker <mark@lange.demon.co.uk>
Date: Tue, 2 Jun 2020 07:38:35 +0200
Subject: [PATCH 021/153] Range operator tests (#1501)

* Improved handling of named ranges, although there are still some issues (names ranges using a union type with an overlap don't handle the overlap twice, which as the MS Excel approach to set overlaps as opposed to the mathematical approach which only applies overlap values once)

* Fix tests that misused space and comma as simple separators in cell ranges
---
 .../Calculation/Calculation.php               | 12 ++-
 src/PhpSpreadsheet/Cell/Coordinate.php        | 73 ++++++++++++-----
 .../Calculation/Engine/RangeTest.php          | 80 +++++++++++++------
 .../Cell/CoordinateTest.php                   | 49 +++++++-----
 .../CellExtractAllCellReferencesInRange.php   | 25 +-----
 5 files changed, 151 insertions(+), 88 deletions(-)

diff --git a/src/PhpSpreadsheet/Calculation/Calculation.php b/src/PhpSpreadsheet/Calculation/Calculation.php
index 5aa309c5..2d67a134 100644
--- a/src/PhpSpreadsheet/Calculation/Calculation.php
+++ b/src/PhpSpreadsheet/Calculation/Calculation.php
@@ -3625,7 +3625,6 @@ class Calculation
                 $expectingOperand = false;
                 $val = $match[1];
                 $length = strlen($val);
-
                 if (preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/i', $val, $matches)) {
                     $val = preg_replace('/\s/u', '', $val);
                     if (isset(self::$phpSpreadsheetFunctions[strtoupper($matches[1])]) || isset(self::$controlFunctions[strtoupper($matches[1])])) {    // it's a function
@@ -3660,7 +3659,6 @@ class Calculation
                 } elseif (preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/i', $val, $matches)) {
                     //    Watch for this case-change when modifying to allow cell references in different worksheets...
                     //    Should only be applied to the actual cell column, not the worksheet name
-
                     //    If the last entry on the stack was a : operator, then we have a cell range reference
                     $testPrevOp = $stack->last(1);
                     if ($testPrevOp !== null && $testPrevOp['value'] == ':') {
@@ -3717,6 +3715,8 @@ class Calculation
                     }
 
                     $localeConstant = false;
+                    $stackItemType = 'Value';
+                    $stackItemReference = null;
                     if ($opCharacter == self::FORMULA_STRING_QUOTE) {
                         //    UnEscape any quotes within the string
                         $val = self::wrapResult(str_replace('""', self::FORMULA_STRING_QUOTE, self::unwrapResult($val)));
@@ -3727,12 +3727,17 @@ class Calculation
                             $val = (int) $val;
                         }
                     } elseif (isset(self::$excelConstants[trim(strtoupper($val))])) {
+                        $stackItemType = 'Constant';
                         $excelConstant = trim(strtoupper($val));
                         $val = self::$excelConstants[$excelConstant];
                     } elseif (($localeConstant = array_search(trim(strtoupper($val)), self::$localeBoolean)) !== false) {
+                        $stackItemType = 'Constant';
                         $val = self::$excelConstants[$localeConstant];
+                    } elseif (preg_match('/^' . self::CALCULATION_REGEXP_NAMEDRANGE . '.*/Ui', $val, $match)) {
+                        $stackItemType = 'Named Range';
+                        $stackItemReference = $val;
                     }
-                    $details = $stack->getStackItem('Value', $val, null, $currentCondition, $currentOnlyIf, $currentOnlyIfNot);
+                    $details = $stack->getStackItem($stackItemType, $val, $stackItemReference, $currentCondition, $currentOnlyIf, $currentOnlyIfNot);
                     if ($localeConstant) {
                         $details['localeValue'] = $localeConstant;
                     }
@@ -3842,7 +3847,6 @@ class Calculation
         $fakedForBranchPruning = [];
         // help us to know when pruning ['branchTestId' => true/false]
         $branchStore = [];
-
         //    Loop through each token in turn
         foreach ($tokens as $tokenData) {
             $token = $tokenData['value'];
diff --git a/src/PhpSpreadsheet/Cell/Coordinate.php b/src/PhpSpreadsheet/Cell/Coordinate.php
index 8c679913..2afeebe9 100644
--- a/src/PhpSpreadsheet/Cell/Coordinate.php
+++ b/src/PhpSpreadsheet/Cell/Coordinate.php
@@ -312,32 +312,59 @@ abstract class Coordinate
     /**
      * Extract all cell references in range, which may be comprised of multiple cell ranges.
      *
-     * @param string $pRange Range (e.g. A1 or A1:C10 or A1:E10 A20:E25)
+     * @param string $cellRange Range: e.g. 'A1' or 'A1:C10' or 'A1:E10,A20:E25' or 'A1:E5 C3:G7' or 'A1:C1,A3:C3 B1:C3'
      *
      * @return array Array containing single cell references
      */
-    public static function extractAllCellReferencesInRange($pRange)
+    public static function extractAllCellReferencesInRange($cellRange): array
     {
-        $returnValue = [];
+        [$ranges, $operators] = self::getCellBlocksFromRangeString($cellRange);
 
-        // Explode spaces
-        $cellBlocks = self::getCellBlocksFromRangeString($pRange);
-        foreach ($cellBlocks as $cellBlock) {
-            $returnValue = array_merge($returnValue, self::getReferencesForCellBlock($cellBlock));
+        $cells = [];
+        foreach ($ranges as $range) {
+            $cells[] = self::getReferencesForCellBlock($range);
         }
 
+        $cells = self::processRangeSetOperators($operators, $cells);
+
+        if (empty($cells)) {
+            return [];
+        }
+
+        $cellList = array_merge(...$cells);
+        $cellList = self::sortCellReferenceArray($cellList);
+
+        return $cellList;
+    }
+
+    private static function processRangeSetOperators(array $operators, array $cells): array
+    {
+        for ($offset = 0; $offset < count($operators); ++$offset) {
+            $operator = $operators[$offset];
+            if ($operator !== ' ') {
+                continue;
+            }
+
+            $cells[$offset] = array_intersect($cells[$offset], $cells[$offset + 1]);
+            unset($operators[$offset], $cells[$offset + 1]);
+            $operators = array_values($operators);
+            $cells = array_values($cells);
+            --$offset;
+        }
+
+        return $cells;
+    }
+
+    private static function sortCellReferenceArray(array $cellList): array
+    {
         //    Sort the result by column and row
         $sortKeys = [];
-        foreach (array_unique($returnValue) as $coord) {
-            $column = '';
-            $row = 0;
-
-            sscanf($coord, '%[A-Z]%d', $column, $row);
+        foreach ($cellList as $coord) {
+            [$column, $row] = sscanf($coord, '%[A-Z]%d');
             $sortKeys[sprintf('%3s%09d', $column, $row)] = $coord;
         }
         ksort($sortKeys);
 
-        // Return value
         return array_values($sortKeys);
     }
 
@@ -482,15 +509,25 @@ abstract class Coordinate
     }
 
     /**
-     * Get the individual cell blocks from a range string, splitting by space and removing any $ characters.
+     * Get the individual cell blocks from a range string, removing any $ characters.
+     *      then splitting by operators and returning an array with ranges and operators.
      *
-     * @param string $pRange
+     * @param string $rangeString
      *
-     * @return string[]
+     * @return array[]
      */
-    private static function getCellBlocksFromRangeString($pRange)
+    private static function getCellBlocksFromRangeString($rangeString)
     {
-        return explode(' ', str_replace('$', '', strtoupper($pRange)));
+        $rangeString = str_replace('$', '', strtoupper($rangeString));
+
+        // split range sets on intersection (space) or union (,) operators
+        $tokens = preg_split('/([ ,])/', $rangeString, -1, PREG_SPLIT_DELIM_CAPTURE);
+        // separate the range sets and the operators into arrays
+        $split = array_chunk($tokens, 2);
+        $ranges = array_column($split, 0);
+        $operators = array_column($split, 1);
+
+        return [$ranges, $operators];
     }
 
     /**
diff --git a/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php b/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php
index d1ad229b..ee566db2 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php
@@ -45,11 +45,21 @@ class RangeTest extends TestCase
     {
         return[
             ['=SUM(A1:B3,A1:C2)', 48],
+            ['=COUNT(A1:B3,A1:C2)', 12],
             ['=SUM(A1:B3 A1:C2)', 12],
+            ['=COUNT(A1:B3 A1:C2)', 4],
             ['=SUM(A1:A3,C1:C3)', 30],
+            ['=COUNT(A1:A3,C1:C3)', 6],
             ['=SUM(A1:A3 C1:C3)', Functions::null()],
+            ['=COUNT(A1:A3 C1:C3)', 0],
             ['=SUM(A1:B2,B2:C3)', 40],
+            ['=COUNT(A1:B2,B2:C3)', 8],
             ['=SUM(A1:B2 B2:C3)', 5],
+            ['=COUNT(A1:B2 B2:C3)', 1],
+            ['=SUM(A1:C1,A3:C3,B1:C3)', 63],
+            ['=COUNT(A1:C1,A3:C3,B1:C3)', 12],
+            ['=SUM(A1:C1,A3:C3 B1:C3)', 23],
+            ['=COUNT(A1:C1,A3:C3 B1:C3)', 5],
         ];
     }
 
@@ -69,35 +79,57 @@ class RangeTest extends TestCase
 
         $workSheet->setCellValue('E1', $formula);
 
-        $actualRresult = $workSheet->getCell('E1')->getCalculatedValue();
-        self::assertSame($expectedResult, $actualRresult);
+        $sumRresult = $workSheet->getCell('E1')->getCalculatedValue();
+        self::assertSame($expectedResult, $sumRresult);
     }
 
     public function providerNamedRangeEvaluation()
     {
         return[
-            [
-                'A1:B3',
-                'A1:C2',
-                '=SUM(GROUP1,GROUP2)',
-                48,
-            ],
-            [
-                'A1:B3',
-                'A1:C2',
-                '=SUM(GROUP1 GROUP2)',
-                12,
-            ],
-            [
-                'A1:B2',
-                'B2:C3',
-                '=SUM(GROUP1,GROUP2)',
-                40,
-            ],
-            [
-                'A1:B2',
-                'B2:C3',
-                '=SUM(GROUP1 GROUP2)',
+            ['A1:B3', 'A1:C2', '=SUM(GROUP1,GROUP2)', 48],
+            ['A1:B3', 'A1:C2', '=COUNT(GROUP1,GROUP2)', 12],
+            ['A1:B3', 'A1:C2', '=SUM(GROUP1 GROUP2)', 12],
+            ['A1:B3', 'A1:C2', '=COUNT(GROUP1 GROUP2)', 4],
+            ['A1:B2', 'B2:C3', '=SUM(GROUP1,GROUP2)', 40],
+            ['A1:B2', 'B2:C3', '=COUNT(GROUP1,GROUP2)', 8],
+            ['A1:B2', 'B2:C3', '=SUM(GROUP1 GROUP2)', 5],
+            ['A1:B2', 'B2:C3', '=COUNT(GROUP1 GROUP2)', 1],
+        ];
+    }
+
+    /**
+     * @dataProvider providerCompositeNamedRangeEvaluation
+     *
+     * @param string $composite
+     * @param int $expectedSum
+     * @param int $expectedCount
+     */
+    public function testCompositeNamedRangeEvaluation($composite, $expectedSum, $expectedCount): void
+    {
+        $workSheet = $this->spreadSheet->getActiveSheet();
+        $this->spreadSheet->addNamedRange(new NamedRange('COMPOSITE', $workSheet, $composite));
+
+        $workSheet->setCellValue('E1', '=SUM(COMPOSITE)');
+        $workSheet->setCellValue('E2', '=COUNT(COMPOSITE)');
+
+        $actualSum = $workSheet->getCell('E1')->getCalculatedValue();
+        self::assertSame($expectedSum, $actualSum);
+        $actualCount = $workSheet->getCell('E2')->getCalculatedValue();
+        self::assertSame($expectedCount, $actualCount);
+    }
+
+    public function providerCompositeNamedRangeEvaluation()
+    {
+        return[
+            //  Calculation engine doesn't yet handle union ranges with overlap
+            //  'Union with overlap' => [
+            //      'A1:C1,A3:C3,B1:C3',
+            //      63,
+            //      12,
+            //  ],
+            'Intersection' => [
+                'A1:C1,A3:C3 B1:C3',
+                23,
                 5,
             ],
         ];
diff --git a/tests/PhpSpreadsheetTests/Cell/CoordinateTest.php b/tests/PhpSpreadsheetTests/Cell/CoordinateTest.php
index 37579e80..8e0e98a9 100644
--- a/tests/PhpSpreadsheetTests/Cell/CoordinateTest.php
+++ b/tests/PhpSpreadsheetTests/Cell/CoordinateTest.php
@@ -83,10 +83,11 @@ class CoordinateTest extends TestCase
      * @dataProvider providerCoordinates
      *
      * @param mixed $expectedResult
+     * @param string $rangeSet
      */
-    public function testCoordinateFromString($expectedResult, ...$args): void
+    public function testCoordinateFromString($expectedResult, $rangeSet): void
     {
-        $result = Coordinate::coordinateFromString(...$args);
+        $result = Coordinate::coordinateFromString($rangeSet);
         self::assertEquals($expectedResult, $result);
     }
 
@@ -143,11 +144,12 @@ class CoordinateTest extends TestCase
     /**
      * @dataProvider providerAbsoluteCoordinates
      *
-     * @param mixed $expectedResult
+     * @param string $expectedResult
+     * @param string $rangeSet
      */
-    public function testAbsoluteCoordinateFromString($expectedResult, ...$args): void
+    public function testAbsoluteCoordinateFromString($expectedResult, $rangeSet): void
     {
-        $result = Coordinate::absoluteCoordinate(...$args);
+        $result = Coordinate::absoluteCoordinate($rangeSet);
         self::assertEquals($expectedResult, $result);
     }
 
@@ -175,10 +177,11 @@ class CoordinateTest extends TestCase
      * @dataProvider providerAbsoluteReferences
      *
      * @param mixed $expectedResult
+     * @param string $rangeSet
      */
-    public function testAbsoluteReferenceFromString($expectedResult, ...$args): void
+    public function testAbsoluteReferenceFromString($expectedResult, $rangeSet): void
     {
-        $result = Coordinate::absoluteReference(...$args);
+        $result = Coordinate::absoluteReference($rangeSet);
         self::assertEquals($expectedResult, $result);
     }
 
@@ -206,10 +209,11 @@ class CoordinateTest extends TestCase
      * @dataProvider providerSplitRange
      *
      * @param mixed $expectedResult
+     * @param string $rangeSet
      */
-    public function testSplitRange($expectedResult, ...$args): void
+    public function testSplitRange($expectedResult, $rangeSet): void
     {
-        $result = Coordinate::splitRange(...$args);
+        $result = Coordinate::splitRange($rangeSet);
         foreach ($result as $key => $split) {
             if (!is_array($expectedResult[$key])) {
                 self::assertEquals($expectedResult[$key], $split[0]);
@@ -252,10 +256,11 @@ class CoordinateTest extends TestCase
      * @dataProvider providerRangeBoundaries
      *
      * @param mixed $expectedResult
+     * @param string $rangeSet
      */
-    public function testRangeBoundaries($expectedResult, ...$args): void
+    public function testRangeBoundaries($expectedResult, $rangeSet): void
     {
-        $result = Coordinate::rangeBoundaries(...$args);
+        $result = Coordinate::rangeBoundaries($rangeSet);
         self::assertEquals($expectedResult, $result);
     }
 
@@ -268,10 +273,11 @@ class CoordinateTest extends TestCase
      * @dataProvider providerRangeDimension
      *
      * @param mixed $expectedResult
+     * @param string $rangeSet
      */
-    public function testRangeDimension($expectedResult, ...$args): void
+    public function testRangeDimension($expectedResult, $rangeSet): void
     {
-        $result = Coordinate::rangeDimension(...$args);
+        $result = Coordinate::rangeDimension($rangeSet);
         self::assertEquals($expectedResult, $result);
     }
 
@@ -284,10 +290,11 @@ class CoordinateTest extends TestCase
      * @dataProvider providerGetRangeBoundaries
      *
      * @param mixed $expectedResult
+     * @param string $rangeSet
      */
-    public function testGetRangeBoundaries($expectedResult, ...$args): void
+    public function testGetRangeBoundaries($expectedResult, $rangeSet): void
     {
-        $result = Coordinate::getRangeBoundaries(...$args);
+        $result = Coordinate::getRangeBoundaries($rangeSet);
         self::assertEquals($expectedResult, $result);
     }
 
@@ -299,11 +306,12 @@ class CoordinateTest extends TestCase
     /**
      * @dataProvider providerExtractAllCellReferencesInRange
      *
-     * @param mixed $expectedResult
+     * @param array $expectedResult
+     * @param string $rangeSet
      */
-    public function testExtractAllCellReferencesInRange($expectedResult, ...$args): void
+    public function testExtractAllCellReferencesInRange($expectedResult, $rangeSet): void
     {
-        $result = Coordinate::extractAllCellReferencesInRange(...$args);
+        $result = Coordinate::extractAllCellReferencesInRange($rangeSet);
         self::assertEquals($expectedResult, $result);
     }
 
@@ -350,10 +358,11 @@ class CoordinateTest extends TestCase
      * @dataProvider providerCoordinateIsRange
      *
      * @param mixed $expectedResult
+     * @param string $rangeSet
      */
-    public function testCoordinateIsRange($expectedResult, ...$args): void
+    public function testCoordinateIsRange($expectedResult, $rangeSet): void
     {
-        $result = Coordinate::coordinateIsRange(...$args);
+        $result = Coordinate::coordinateIsRange($rangeSet);
         self::assertEquals($expectedResult, $result);
     }
 
diff --git a/tests/data/CellExtractAllCellReferencesInRange.php b/tests/data/CellExtractAllCellReferencesInRange.php
index cf093289..b005b1fe 100644
--- a/tests/data/CellExtractAllCellReferencesInRange.php
+++ b/tests/data/CellExtractAllCellReferencesInRange.php
@@ -22,12 +22,6 @@ return [
     ],
     [
         [
-            'B4',
-            'B5',
-            'B6',
-            'D4',
-            'D5',
-            'D6',
         ],
         'B4:B6 D4:D6',
     ],
@@ -66,20 +60,10 @@ return [
     ],
     [
         [
-            'B4',
-            'B5',
-            'B6',
-            'C4',
             'C5',
             'C6',
-            'C7',
-            'D4',
             'D5',
             'D6',
-            'D7',
-            'E5',
-            'E6',
-            'E7',
         ],
         'B4:D6 C5:E7',
     ],
@@ -105,7 +89,7 @@ return [
             'F5',
             'F6',
         ],
-        'B2:D4 C5:D5 E3:E5 D6:E6 F4:F6',
+        'B2:D4,C5:D5,E3:E5,D6:E6,F4:F6',
     ],
     [
         [
@@ -129,16 +113,13 @@ return [
             'F5',
             'F6',
         ],
-        'B2:D4 C3:E5 D4:F6',
+        'B2:D4,C3:E5,D4:F6',
     ],
     [
         [
-            'B4',
             'B5',
-            'B6',
-            'B8',
         ],
-        'B4:B6 B8',
+        'B4:B6 B5',
     ],
     [
         [

From 7ab920de5bf96d75298c17434998eebd49f3e0b4 Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Wed, 3 Jun 2020 09:13:29 +0900
Subject: [PATCH 022/153] Typo

---
 docs/topics/recipes.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/topics/recipes.md b/docs/topics/recipes.md
index 45dd19bc..f85576a2 100644
--- a/docs/topics/recipes.md
+++ b/docs/topics/recipes.md
@@ -976,7 +976,7 @@ $spreadsheet->getActiveSheet()->getStyle('B1')
 
 ## Reading protected spreadsheet
 
-Spreadsheets that are protected the as described above can always be read by
+Spreadsheets that are protected as described above can always be read by
 PhpSpreadsheet. There is no need to know the password or do anything special in
 order to read a protected file.
 

From c47b407e3995c27ecc285a2cc09f9a5798fffeac Mon Sep 17 00:00:00 2001
From: Owen Leibman <eclipsechasers2@yahoo.com>
Date: Tue, 9 Jun 2020 00:22:22 -0700
Subject: [PATCH 023/153] Different Example for Callback

Replace default gridlines with different style. Usable in PDF
as well as HTML.

Documentation mentioned use of setUseBOM with Html, but that method
does not exist, and there is no real reason to support it.
Removed it from documentation.
---
 docs/topics/reading-and-writing-to-file.md    | 35 +++++--------------
 samples/Basic/17b_Html.php                    | 13 ++-----
 samples/Pdf/21a_Pdf.php                       | 30 +++-------------
 src/PhpSpreadsheet/Writer/Html.php            | 17 ++++-----
 .../Writer/Html/CallbackTest.php              |  2 +-
 5 files changed, 22 insertions(+), 75 deletions(-)

diff --git a/docs/topics/reading-and-writing-to-file.md b/docs/topics/reading-and-writing-to-file.md
index abd7c5f3..13b62e01 100644
--- a/docs/topics/reading-and-writing-to-file.md
+++ b/docs/topics/reading-and-writing-to-file.md
@@ -703,43 +703,24 @@ echo $writer->generateSheetData();
 echo $writer->generateHTMLFooter();
 ```
 
-#### Editing HTML During Save Via a Callback
+#### Editing HTML during save via a callback
 
 You can also add a callback function to edit the generated html
-before saving. For example, you could add a webfont
-(not currently supported for Pdf) as follows:
+before saving. For example, you could change the gridlines
+from a thin solid black line:
 
 ``` php
-function webfont(string $html): string
+function changeGridlines(string $html): string
 {
-    $linktag = <<<EOF
-<link href="https://fonts.googleapis.com/css2?family=Poiret+One&display=swap" rel="stylesheet" />
-
-EOF;
-    $html = preg_replace('@<style@', "$linktag<style", $html, 1);
-    $html = str_replace("font-family:'Calibri';",
-        "font-family:'Poiret One','Calibri',sans-serif;",
+    return str_replace('{border: 1px solid black;}',
+        '{border: 2px dashed red;}',
         $html);
-
-    return $html;
 }
 $writer = new \PhpOffice\PhpSpreadsheet\Writer\Html($spreadsheet);
-$writer->setEditHtmlCallback('webfont');
+$writer->setEditHtmlCallback('changeGridlines');
 $writer->save($filename);
 ```
 
-#### Writing UTF-8 HTML files
-
-A HTML file can be marked as UTF-8 by writing a BOM file header. This
-can be enabled by using the following code:
-
-``` php
-$writer = new \PhpOffice\PhpSpreadsheet\Writer\Html($spreadsheet);
-$writer->setUseBOM(true);
-
-$writer->save("05featuredemo.htm");
-```
-
 #### Decimal and thousands separators
 
 See section `\PhpOffice\PhpSpreadsheet\Writer\Csv` how to control the
@@ -866,7 +847,7 @@ $writer->setPreCalculateFormulas(false);
 $writer->save("05featuredemo.pdf");
 ```
 
-#### Editing Pdf During Save Via a Callback
+#### Editing Pdf during save via a callback
 
 You can also add a callback function to edit the html used to
 generate the Pdf before saving.
diff --git a/samples/Basic/17b_Html.php b/samples/Basic/17b_Html.php
index 05649314..97bb29a3 100644
--- a/samples/Basic/17b_Html.php
+++ b/samples/Basic/17b_Html.php
@@ -8,20 +8,13 @@ $spreadsheet = require __DIR__ . '/../templates/sampleSpreadsheet.php';
 $filename = $helper->getFilename(__FILE__, 'html');
 $writer = new Html($spreadsheet);
 
-function webfont(string $html): string
+function changeGridlines(string $html): string
 {
-    $linktag = <<<EOF
-<link href="https://fonts.googleapis.com/css2?family=Poiret+One&display=swap" rel="stylesheet" />
-
-EOF;
-    $html = preg_replace('@<style@', "$linktag<style", $html, 1);
-    $html = str_replace("font-family:'Calibri';", "font-family:'Poiret One','Calibri',sans-serif;", $html);
-
-    return $html;
+    return str_replace('{border: 1px solid black;}', '{border: 2px dashed red;}', $html);
 }
 
 $callStartTime = microtime(true);
 $writer->setEmbedImages(true);
-$writer->setEditHtmlCallback('webfont');
+$writer->setEditHtmlCallback('changeGridlines');
 $writer->save($filename);
 $helper->logWrite($writer, $filename, $callStartTime);
diff --git a/samples/Pdf/21a_Pdf.php b/samples/Pdf/21a_Pdf.php
index c4dc2c48..b5572afe 100644
--- a/samples/Pdf/21a_Pdf.php
+++ b/samples/Pdf/21a_Pdf.php
@@ -1,9 +1,7 @@
 <?php
 
 use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
-use PhpOffice\PhpSpreadsheet\Writer\Pdf\Dompdf;
 use PhpOffice\PhpSpreadsheet\Writer\Pdf\Mpdf;
-use PhpOffice\PhpSpreadsheet\Writer\Pdf\Tcpdf;
 
 require __DIR__ . '/../Header.php';
 $spreadsheet = require __DIR__ . '/../templates/sampleSpreadsheet.php';
@@ -13,35 +11,15 @@ $spreadsheet->getActiveSheet()->setShowGridLines(false);
 
 $helper->log('Set orientation to landscape');
 $spreadsheet->getActiveSheet()->getPageSetup()->setOrientation(PageSetup::ORIENTATION_LANDSCAPE);
+$spreadsheet->setActiveSheetIndex(0)->setPrintGridlines(true);
 
-function yellowBody(string $html): string
+function changeGridlines(string $html): string
 {
-    $newstyle = <<<EOF
-<style type='text/css'>
-body {
-background-color: yellow;
+    return str_replace('{border: 1px solid black;}', '{border: 2px dashed red;}', $html);
 }
-</style>
-
-EOF;
-
-    return preg_replace('@</head>@', "$newstyle</head>", $html);
-}
-
-$helper->log('Write to Dompdf');
-$writer = new Dompdf($spreadsheet);
-$filename = $helper->getFileName('21a_Pdf_dompdf.xlsx', 'pdf');
-$writer->setEditHtmlCallback('yellowBody');
-$writer->save($filename);
 
 $helper->log('Write to Mpdf');
 $writer = new Mpdf($spreadsheet);
 $filename = $helper->getFileName('21a_Pdf_mpdf.xlsx', 'pdf');
-$writer->setEditHtmlCallback('yellowBody');
-$writer->save($filename);
-
-$helper->log('Write to Tcpdf');
-$writer = new Tcpdf($spreadsheet);
-$filename = $helper->getFileName('21a_Pdf_tcpdf.xlsx', 'pdf');
-$writer->setEditHtmlCallback('yellowBody');
+$writer->setEditHtmlCallback('changeGridlines');
 $writer->save($filename);
diff --git a/src/PhpSpreadsheet/Writer/Html.php b/src/PhpSpreadsheet/Writer/Html.php
index 963b02d7..752f286f 100644
--- a/src/PhpSpreadsheet/Writer/Html.php
+++ b/src/PhpSpreadsheet/Writer/Html.php
@@ -134,9 +134,9 @@ class Html extends BaseWriter
     /**
      * Callback for editing generated html.
      *
-     * @var callable
+     * @var null|callable
      */
-    protected $editHtmlCallback = '';
+    protected $editHtmlCallback;
 
     /**
      * Create a new HTML.
@@ -197,9 +197,9 @@ class Html extends BaseWriter
 
         // Write footer
         $html .= $this->generateHTMLFooter();
-        $cbk = $this->editHtmlCallback;
-        if ($cbk) {
-            $html = $cbk($html);
+        $callback = $this->editHtmlCallback;
+        if ($callback) {
+            $html = $callback($html);
         }
 
         Calculation::setArrayReturnType($saveArrayReturnType);
@@ -208,16 +208,11 @@ class Html extends BaseWriter
         return $html;
     }
 
-    public function setEditHtmlCallback(callable $cbk): void
+    public function setEditHtmlCallback(?callable $cbk): void
     {
         $this->editHtmlCallback = $cbk;
     }
 
-    public function resetEditHtmlCallback(): void
-    {
-        $this->editHtmlCallback = '';
-    }
-
     const VALIGN_ARR = [
         Alignment::VERTICAL_BOTTOM => 'bottom',
         Alignment::VERTICAL_TOP => 'top',
diff --git a/tests/PhpSpreadsheetTests/Writer/Html/CallbackTest.php b/tests/PhpSpreadsheetTests/Writer/Html/CallbackTest.php
index f712419c..388dbd0e 100644
--- a/tests/PhpSpreadsheetTests/Writer/Html/CallbackTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Html/CallbackTest.php
@@ -33,7 +33,7 @@ EOF;
         $html1 = $writer->generateHTMLall();
         $writer->setEditHtmlCallback([$this, 'yellowBody']);
         $html2 = $writer->generateHTMLall();
-        $writer->resetEditHtmlCallback();
+        $writer->setEditHtmlCallback(null);
         $html3 = $writer->generateHTMLall();
 
         self::assertFalse(strpos($html1, 'background-color: yellow'));

From 12dd92bafe75d6fa19a19604156a06ae9ebb346c Mon Sep 17 00:00:00 2001
From: Mark Baker <mark@lange.demon.co.uk>
Date: Sat, 13 Jun 2020 17:35:29 +0200
Subject: [PATCH 024/153] Resolve utf-8 named ranges in calculation engine
 (#1522)

* Resolve use of UTF-8 in defined names in the calculation engine
---
 CHANGELOG.md                                  |  6 ++++
 .../Calculation/Calculation.php               | 20 ++++++-------
 .../Calculation/Engine/RangeTest.php          | 30 +++++++++++++++++++
 3 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c139850..37f4f3dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com)
 and this project adheres to [Semantic Versioning](https://semver.org).
 
+## [Unreleased]
+
+### Fixed
+
+- Resolve evaluation of utf-8 named ranges in calculation engine [#1522](https://github.com/PHPOffice/PhpSpreadsheet/pull/1522)
+
 ## [1.13.0] - 2020-05-31
 
 ### Added
diff --git a/src/PhpSpreadsheet/Calculation/Calculation.php b/src/PhpSpreadsheet/Calculation/Calculation.php
index 2d67a134..848f9068 100644
--- a/src/PhpSpreadsheet/Calculation/Calculation.php
+++ b/src/PhpSpreadsheet/Calculation/Calculation.php
@@ -24,11 +24,11 @@ class Calculation
     //    Opening bracket
     const CALCULATION_REGEXP_OPENBRACE = '\(';
     //    Function (allow for the old @ symbol that could be used to prefix a function, but we'll ignore it)
-    const CALCULATION_REGEXP_FUNCTION = '@?(?:_xlfn\.)?([A-Z][A-Z0-9\.]*)[\s]*\(';
+    const CALCULATION_REGEXP_FUNCTION = '@?(?:_xlfn\.)?([\p{L}][\p{L}\p{N}\.]*)[\s]*\(';
     //    Cell reference (cell or range of cells, with or without a sheet reference)
     const CALCULATION_REGEXP_CELLREF = '((([^\s,!&%^\/\*\+<>=-]*)|(\'[^\']*\')|(\"[^\"]*\"))!)?\$?\b([a-z]{1,3})\$?(\d{1,7})(?![\w.])';
     //    Named Range of cells
-    const CALCULATION_REGEXP_NAMEDRANGE = '((([^\s,!&%^\/\*\+<>=-]*)|(\'[^\']*\')|(\"[^\"]*\"))!)?([_A-Z][_A-Z0-9\.]*)';
+    const CALCULATION_REGEXP_NAMEDRANGE = '((([^\s,!&%^\/\*\+<>=-]*)|(\'[^\']*\')|(\"[^\"]*\"))!)?([_\p{L}][_\p{L}\p{N}\.]*)';
     //    Error
     const CALCULATION_REGEXP_ERROR = '\#[A-Z][A-Z0_\/]*[!\?]?';
 
@@ -3395,7 +3395,7 @@ class Calculation
                                 '|' . self::CALCULATION_REGEXP_OPENBRACE .
                                 '|' . self::CALCULATION_REGEXP_NAMEDRANGE .
                                 '|' . self::CALCULATION_REGEXP_ERROR .
-                                ')/si';
+                                ')/sui';
 
         //    Start with initialisation
         $index = 0;
@@ -3499,7 +3499,7 @@ class Calculation
                     --$parenthesisDepthMap[$pendingStoreKey];
                 }
 
-                if (is_array($d) && preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/i', $d['value'], $matches)) {    //    Did this parenthesis just close a function?
+                if (is_array($d) && preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/miu', $d['value'], $matches)) {    //    Did this parenthesis just close a function?
                     if (!empty($pendingStoreKey) && $parenthesisDepthMap[$pendingStoreKey] == -1) {
                         // we are closing an IF(
                         if ($d['value'] != 'IF(') {
@@ -3602,7 +3602,7 @@ class Calculation
                 }
                 // make sure there was a function
                 $d = $stack->last(2);
-                if (!preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/i', $d['value'], $matches)) {
+                if (!preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/miu', $d['value'], $matches)) {
                     return $this->raiseFormulaError('Formula Error: Unexpected ,');
                 }
                 $d = $stack->pop();
@@ -3625,7 +3625,7 @@ class Calculation
                 $expectingOperand = false;
                 $val = $match[1];
                 $length = strlen($val);
-                if (preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/i', $val, $matches)) {
+                if (preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/miu', $val, $matches)) {
                     $val = preg_replace('/\s/u', '', $val);
                     if (isset(self::$phpSpreadsheetFunctions[strtoupper($matches[1])]) || isset(self::$controlFunctions[strtoupper($matches[1])])) {    // it's a function
                         $valToUpper = strtoupper($val);
@@ -3733,7 +3733,7 @@ class Calculation
                     } elseif (($localeConstant = array_search(trim(strtoupper($val)), self::$localeBoolean)) !== false) {
                         $stackItemType = 'Constant';
                         $val = self::$excelConstants[$localeConstant];
-                    } elseif (preg_match('/^' . self::CALCULATION_REGEXP_NAMEDRANGE . '.*/Ui', $val, $match)) {
+                    } elseif (preg_match('/^' . self::CALCULATION_REGEXP_NAMEDRANGE . '.*/miu', $val, $match)) {
                         $stackItemType = 'Named Range';
                         $stackItemReference = $val;
                     }
@@ -3782,7 +3782,7 @@ class Calculation
                 if (($expectingOperator) &&
                     ((preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '.*/Ui', substr($formula, $index), $match)) &&
                         ($output[count($output) - 1]['type'] == 'Cell Reference') ||
-                        (preg_match('/^' . self::CALCULATION_REGEXP_NAMEDRANGE . '.*/Ui', substr($formula, $index), $match)) &&
+                        (preg_match('/^' . self::CALCULATION_REGEXP_NAMEDRANGE . '.*/miu', substr($formula, $index), $match)) &&
                             ($output[count($output) - 1]['type'] == 'Named Range' || $output[count($output) - 1]['type'] == 'Value')
                     )) {
                     while ($stack->count() > 0 &&
@@ -4208,7 +4208,7 @@ class Calculation
                 }
 
                 // 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 . '$/i', $token, $matches)) {
+            } elseif (preg_match('/^' . self::CALCULATION_REGEXP_FUNCTION . '$/miu', $token, $matches)) {
                 if ($pCellParent) {
                     $pCell->attach($pCellParent);
                 }
@@ -4306,7 +4306,7 @@ class Calculation
                         $branchStore[$storeKey] = $token;
                     }
                     // if the token is a named range, push the named range name onto the stack
-                } elseif (preg_match('/^' . self::CALCULATION_REGEXP_NAMEDRANGE . '$/i', $token, $matches)) {
+                } elseif (preg_match('/^' . self::CALCULATION_REGEXP_NAMEDRANGE . '$/miu', $token, $matches)) {
                     $namedRange = $matches[6];
                     $this->debugLog->writeDebugLog('Evaluating Named Range ', $namedRange);
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php b/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php
index ee566db2..e2e6e11d 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php
@@ -97,6 +97,36 @@ class RangeTest extends TestCase
         ];
     }
 
+    /**
+     * @dataProvider providerUTF8NamedRangeEvaluation
+     *
+     * @param string $names
+     * @param string $ranges
+     * @param string $formula
+     * @param int $expectedResult
+     */
+    public function testUTF8NamedRangeEvaluation($names, $ranges, $formula, $expectedResult): void
+    {
+        $workSheet = $this->spreadSheet->getActiveSheet();
+        foreach ($names as $index => $name) {
+            $range = $ranges[$index];
+            $this->spreadSheet->addNamedRange(new NamedRange($name, $workSheet, $range));
+        }
+        $workSheet->setCellValue('E1', $formula);
+
+        $sumRresult = $workSheet->getCell('E1')->getCalculatedValue();
+        self::assertSame($expectedResult, $sumRresult);
+    }
+
+    public function providerUTF8NamedRangeEvaluation()
+    {
+        return[
+            [['Γειά', 'σου', 'Κόσμε'], ['A1', 'B1:B2', 'C1:C3'], '=SUM(Γειά,σου,Κόσμε)', 26],
+            [['Γειά', 'σου', 'Κόσμε'], ['A1', 'B1:B2', 'C1:C3'], '=COUNT(Γειά,σου,Κόσμε)', 6],
+            [['Здравствуй', 'мир'], ['A1:A3', 'C1:C3'], '=SUM(Здравствуй,мир)', 30],
+        ];
+    }
+
     /**
      * @dataProvider providerCompositeNamedRangeEvaluation
      *

From 82ea1d559647f357b5ce04e60a0bb33ccaa6de77 Mon Sep 17 00:00:00 2001
From: oleibman <eclipsechasers2@yahoo.com>
Date: Fri, 19 Jun 2020 11:26:02 -0700
Subject: [PATCH 025/153] Fix for #1516 (#1530)

This problem is that ZipStream, in contrast to ZipArchive,
is saving 2 files with the same path. I have opened an issue with
ZipStream, who agree that this appears to be a bug.

For the case in question, PhpSpreadsheet is attempting to save
a file with the same path twice (and unexpectedly succeeding)
because of a clone operation. This fix attempts to rectify the problem
by keeping track of all the paths being saved in the zip file,
and not attempting to save any duplicate paths.

The problem case attempted to save printersettings1.bin twice,
but there are other possible exposures, e.g. by cloning a sheet
with a drawing.The new test cases clone an existing sample which
has both printer settings and drawings.
---
 src/PhpSpreadsheet/Writer/Xlsx.php            |  88 +++++++++------
 .../Writer/Xlsx/UnparsedDataCloneTest.php     | 101 ++++++++++++++++++
 2 files changed, 154 insertions(+), 35 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Writer/Xlsx/UnparsedDataCloneTest.php

diff --git a/src/PhpSpreadsheet/Writer/Xlsx.php b/src/PhpSpreadsheet/Writer/Xlsx.php
index bfcde049..4cb10287 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx.php
@@ -107,6 +107,13 @@ class Xlsx extends BaseWriter
      */
     private $drawingHashTable;
 
+    /**
+     * Private handle for zip stream.
+     *
+     * @var ZipStream
+     */
+    private $zip;
+
     /**
      * Create a new Xlsx Writer.
      */
@@ -173,6 +180,7 @@ class Xlsx extends BaseWriter
     {
         if ($this->spreadSheet !== null) {
             // garbage collect
+            $this->pathNames = [];
             $this->spreadSheet->garbageCollect();
 
             $this->openFileHandle($pFilename);
@@ -203,73 +211,73 @@ class Xlsx extends BaseWriter
             $options->setEnableZip64(false);
             $options->setOutputStream($this->fileHandle);
 
-            $zip = new ZipStream(null, $options);
+            $this->zip = new ZipStream(null, $options);
 
             // Add [Content_Types].xml to ZIP file
-            $zip->addFile('[Content_Types].xml', $this->getWriterPart('ContentTypes')->writeContentTypes($this->spreadSheet, $this->includeCharts));
+            $this->addZipFile('[Content_Types].xml', $this->getWriterPart('ContentTypes')->writeContentTypes($this->spreadSheet, $this->includeCharts));
 
             //if hasMacros, add the vbaProject.bin file, Certificate file(if exists)
             if ($this->spreadSheet->hasMacros()) {
                 $macrosCode = $this->spreadSheet->getMacrosCode();
                 if ($macrosCode !== null) {
                     // we have the code ?
-                    $zip->addFile('xl/vbaProject.bin', $macrosCode); //allways in 'xl', allways named vbaProject.bin
+                    $this->addZipFile('xl/vbaProject.bin', $macrosCode); //allways in 'xl', allways named vbaProject.bin
                     if ($this->spreadSheet->hasMacrosCertificate()) {
                         //signed macros ?
                         // Yes : add the certificate file and the related rels file
-                        $zip->addFile('xl/vbaProjectSignature.bin', $this->spreadSheet->getMacrosCertificate());
-                        $zip->addFile('xl/_rels/vbaProject.bin.rels', $this->getWriterPart('RelsVBA')->writeVBARelationships($this->spreadSheet));
+                        $this->addZipFile('xl/vbaProjectSignature.bin', $this->spreadSheet->getMacrosCertificate());
+                        $this->addZipFile('xl/_rels/vbaProject.bin.rels', $this->getWriterPart('RelsVBA')->writeVBARelationships($this->spreadSheet));
                     }
                 }
             }
             //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');
-                $zip->addFile($tmpRibbonTarget, $this->spreadSheet->getRibbonXMLData('data'));
+                $this->addZipFile($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) {
-                        $zip->addFile($tmpRootPath . $aPath, $aContent);
+                        $this->addZipFile($tmpRootPath . $aPath, $aContent);
                     }
                     //the rels for files
-                    $zip->addFile($tmpRootPath . '_rels/' . basename($tmpRibbonTarget) . '.rels', $this->getWriterPart('RelsRibbonObjects')->writeRibbonRelationships($this->spreadSheet));
+                    $this->addZipFile($tmpRootPath . '_rels/' . basename($tmpRibbonTarget) . '.rels', $this->getWriterPart('RelsRibbonObjects')->writeRibbonRelationships($this->spreadSheet));
                 }
             }
 
             // Add relationships to ZIP file
-            $zip->addFile('_rels/.rels', $this->getWriterPart('Rels')->writeRelationships($this->spreadSheet));
-            $zip->addFile('xl/_rels/workbook.xml.rels', $this->getWriterPart('Rels')->writeWorkbookRelationships($this->spreadSheet));
+            $this->addZipFile('_rels/.rels', $this->getWriterPart('Rels')->writeRelationships($this->spreadSheet));
+            $this->addZipFile('xl/_rels/workbook.xml.rels', $this->getWriterPart('Rels')->writeWorkbookRelationships($this->spreadSheet));
 
             // Add document properties to ZIP file
-            $zip->addFile('docProps/app.xml', $this->getWriterPart('DocProps')->writeDocPropsApp($this->spreadSheet));
-            $zip->addFile('docProps/core.xml', $this->getWriterPart('DocProps')->writeDocPropsCore($this->spreadSheet));
+            $this->addZipFile('docProps/app.xml', $this->getWriterPart('DocProps')->writeDocPropsApp($this->spreadSheet));
+            $this->addZipFile('docProps/core.xml', $this->getWriterPart('DocProps')->writeDocPropsCore($this->spreadSheet));
             $customPropertiesPart = $this->getWriterPart('DocProps')->writeDocPropsCustom($this->spreadSheet);
             if ($customPropertiesPart !== null) {
-                $zip->addFile('docProps/custom.xml', $customPropertiesPart);
+                $this->addZipFile('docProps/custom.xml', $customPropertiesPart);
             }
 
             // Add theme to ZIP file
-            $zip->addFile('xl/theme/theme1.xml', $this->getWriterPart('Theme')->writeTheme($this->spreadSheet));
+            $this->addZipFile('xl/theme/theme1.xml', $this->getWriterPart('Theme')->writeTheme($this->spreadSheet));
 
             // Add string table to ZIP file
-            $zip->addFile('xl/sharedStrings.xml', $this->getWriterPart('StringTable')->writeStringTable($this->stringTable));
+            $this->addZipFile('xl/sharedStrings.xml', $this->getWriterPart('StringTable')->writeStringTable($this->stringTable));
 
             // Add styles to ZIP file
-            $zip->addFile('xl/styles.xml', $this->getWriterPart('Style')->writeStyles($this->spreadSheet));
+            $this->addZipFile('xl/styles.xml', $this->getWriterPart('Style')->writeStyles($this->spreadSheet));
 
             // Add workbook to ZIP file
-            $zip->addFile('xl/workbook.xml', $this->getWriterPart('Workbook')->writeWorkbook($this->spreadSheet, $this->preCalculateFormulas));
+            $this->addZipFile('xl/workbook.xml', $this->getWriterPart('Workbook')->writeWorkbook($this->spreadSheet, $this->preCalculateFormulas));
 
             $chartCount = 0;
             // Add worksheets
             for ($i = 0; $i < $this->spreadSheet->getSheetCount(); ++$i) {
-                $zip->addFile('xl/worksheets/sheet' . ($i + 1) . '.xml', $this->getWriterPart('Worksheet')->writeWorksheet($this->spreadSheet->getSheet($i), $this->stringTable, $this->includeCharts));
+                $this->addZipFile('xl/worksheets/sheet' . ($i + 1) . '.xml', $this->getWriterPart('Worksheet')->writeWorksheet($this->spreadSheet->getSheet($i), $this->stringTable, $this->includeCharts));
                 if ($this->includeCharts) {
                     $charts = $this->spreadSheet->getSheet($i)->getChartCollection();
                     if (count($charts) > 0) {
                         foreach ($charts as $chart) {
-                            $zip->addFile('xl/charts/chart' . ($chartCount + 1) . '.xml', $this->getWriterPart('Chart')->writeChart($chart, $this->preCalculateFormulas));
+                            $this->addZipFile('xl/charts/chart' . ($chartCount + 1) . '.xml', $this->getWriterPart('Chart')->writeChart($chart, $this->preCalculateFormulas));
                             ++$chartCount;
                         }
                     }
@@ -280,19 +288,19 @@ class Xlsx extends BaseWriter
             // Add worksheet relationships (drawings, ...)
             for ($i = 0; $i < $this->spreadSheet->getSheetCount(); ++$i) {
                 // Add relationships
-                $zip->addFile('xl/worksheets/_rels/sheet' . ($i + 1) . '.xml.rels', $this->getWriterPart('Rels')->writeWorksheetRelationships($this->spreadSheet->getSheet($i), ($i + 1), $this->includeCharts));
+                $this->addZipFile('xl/worksheets/_rels/sheet' . ($i + 1) . '.xml.rels', $this->getWriterPart('Rels')->writeWorksheetRelationships($this->spreadSheet->getSheet($i), ($i + 1), $this->includeCharts));
 
                 // Add unparsedLoadedData
                 $sheetCodeName = $this->spreadSheet->getSheet($i)->getCodeName();
                 $unparsedLoadedData = $this->spreadSheet->getUnparsedLoadedData();
                 if (isset($unparsedLoadedData['sheets'][$sheetCodeName]['ctrlProps'])) {
                     foreach ($unparsedLoadedData['sheets'][$sheetCodeName]['ctrlProps'] as $ctrlProp) {
-                        $zip->addFile($ctrlProp['filePath'], $ctrlProp['content']);
+                        $this->addZipFile($ctrlProp['filePath'], $ctrlProp['content']);
                     }
                 }
                 if (isset($unparsedLoadedData['sheets'][$sheetCodeName]['printerSettings'])) {
                     foreach ($unparsedLoadedData['sheets'][$sheetCodeName]['printerSettings'] as $ctrlProp) {
-                        $zip->addFile($ctrlProp['filePath'], $ctrlProp['content']);
+                        $this->addZipFile($ctrlProp['filePath'], $ctrlProp['content']);
                     }
                 }
 
@@ -305,13 +313,13 @@ class Xlsx extends BaseWriter
                 // Add drawing and image relationship parts
                 if (($drawingCount > 0) || ($chartCount > 0)) {
                     // Drawing relationships
-                    $zip->addFile('xl/drawings/_rels/drawing' . ($i + 1) . '.xml.rels', $this->getWriterPart('Rels')->writeDrawingRelationships($this->spreadSheet->getSheet($i), $chartRef1, $this->includeCharts));
+                    $this->addZipFile('xl/drawings/_rels/drawing' . ($i + 1) . '.xml.rels', $this->getWriterPart('Rels')->writeDrawingRelationships($this->spreadSheet->getSheet($i), $chartRef1, $this->includeCharts));
 
                     // Drawings
-                    $zip->addFile('xl/drawings/drawing' . ($i + 1) . '.xml', $this->getWriterPart('Drawing')->writeDrawings($this->spreadSheet->getSheet($i), $this->includeCharts));
+                    $this->addZipFile('xl/drawings/drawing' . ($i + 1) . '.xml', $this->getWriterPart('Drawing')->writeDrawings($this->spreadSheet->getSheet($i), $this->includeCharts));
                 } elseif (isset($unparsedLoadedData['sheets'][$sheetCodeName]['drawingAlternateContents'])) {
                     // Drawings
-                    $zip->addFile('xl/drawings/drawing' . ($i + 1) . '.xml', $this->getWriterPart('Drawing')->writeDrawings($this->spreadSheet->getSheet($i), $this->includeCharts));
+                    $this->addZipFile('xl/drawings/drawing' . ($i + 1) . '.xml', $this->getWriterPart('Drawing')->writeDrawings($this->spreadSheet->getSheet($i), $this->includeCharts));
                 }
 
                 // Add unparsed drawings
@@ -320,7 +328,7 @@ class Xlsx extends BaseWriter
                         $drawingFile = array_search($relId, $unparsedLoadedData['sheets'][$sheetCodeName]['drawingOriginalIds']);
                         if ($drawingFile !== false) {
                             $drawingFile = ltrim($drawingFile, '.');
-                            $zip->addFile('xl' . $drawingFile, $drawingXml);
+                            $this->addZipFile('xl' . $drawingFile, $drawingXml);
                         }
                     }
                 }
@@ -328,30 +336,30 @@ class Xlsx extends BaseWriter
                 // Add comment relationship parts
                 if (count($this->spreadSheet->getSheet($i)->getComments()) > 0) {
                     // VML Comments
-                    $zip->addFile('xl/drawings/vmlDrawing' . ($i + 1) . '.vml', $this->getWriterPart('Comments')->writeVMLComments($this->spreadSheet->getSheet($i)));
+                    $this->addZipFile('xl/drawings/vmlDrawing' . ($i + 1) . '.vml', $this->getWriterPart('Comments')->writeVMLComments($this->spreadSheet->getSheet($i)));
 
                     // Comments
-                    $zip->addFile('xl/comments' . ($i + 1) . '.xml', $this->getWriterPart('Comments')->writeComments($this->spreadSheet->getSheet($i)));
+                    $this->addZipFile('xl/comments' . ($i + 1) . '.xml', $this->getWriterPart('Comments')->writeComments($this->spreadSheet->getSheet($i)));
                 }
 
                 // Add unparsed relationship parts
                 if (isset($unparsedLoadedData['sheets'][$sheetCodeName]['vmlDrawings'])) {
                     foreach ($unparsedLoadedData['sheets'][$sheetCodeName]['vmlDrawings'] as $vmlDrawing) {
-                        $zip->addFile($vmlDrawing['filePath'], $vmlDrawing['content']);
+                        $this->addZipFile($vmlDrawing['filePath'], $vmlDrawing['content']);
                     }
                 }
 
                 // Add header/footer relationship parts
                 if (count($this->spreadSheet->getSheet($i)->getHeaderFooter()->getImages()) > 0) {
                     // VML Drawings
-                    $zip->addFile('xl/drawings/vmlDrawingHF' . ($i + 1) . '.vml', $this->getWriterPart('Drawing')->writeVMLHeaderFooterImages($this->spreadSheet->getSheet($i)));
+                    $this->addZipFile('xl/drawings/vmlDrawingHF' . ($i + 1) . '.vml', $this->getWriterPart('Drawing')->writeVMLHeaderFooterImages($this->spreadSheet->getSheet($i)));
 
                     // VML Drawing relationships
-                    $zip->addFile('xl/drawings/_rels/vmlDrawingHF' . ($i + 1) . '.vml.rels', $this->getWriterPart('Rels')->writeHeaderFooterDrawingRelationships($this->spreadSheet->getSheet($i)));
+                    $this->addZipFile('xl/drawings/_rels/vmlDrawingHF' . ($i + 1) . '.vml.rels', $this->getWriterPart('Rels')->writeHeaderFooterDrawingRelationships($this->spreadSheet->getSheet($i)));
 
                     // Media
                     foreach ($this->spreadSheet->getSheet($i)->getHeaderFooter()->getImages() as $image) {
-                        $zip->addFile('xl/media/' . $image->getIndexedFilename(), file_get_contents($image->getPath()));
+                        $this->addZipFile('xl/media/' . $image->getIndexedFilename(), file_get_contents($image->getPath()));
                     }
                 }
             }
@@ -374,7 +382,7 @@ class Xlsx extends BaseWriter
                         $imageContents = file_get_contents($imagePath);
                     }
 
-                    $zip->addFile('xl/media/' . str_replace(' ', '_', $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()), $imageContents);
+                    $this->addZipFile('xl/media/' . str_replace(' ', '_', $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()), $imageContents);
                 } elseif ($this->getDrawingHashTable()->getByIndex($i) instanceof MemoryDrawing) {
                     ob_start();
                     call_user_func(
@@ -384,7 +392,7 @@ class Xlsx extends BaseWriter
                     $imageContents = ob_get_contents();
                     ob_end_clean();
 
-                    $zip->addFile('xl/media/' . str_replace(' ', '_', $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()), $imageContents);
+                    $this->addZipFile('xl/media/' . str_replace(' ', '_', $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()), $imageContents);
                 }
             }
 
@@ -393,7 +401,7 @@ class Xlsx extends BaseWriter
 
             // Close file
             try {
-                $zip->finish();
+                $this->zip->finish();
             } catch (OverflowException $e) {
                 throw new WriterException('Could not close resource.');
             }
@@ -535,4 +543,14 @@ class Xlsx extends BaseWriter
 
         return $this;
     }
+
+    private $pathNames = [];
+
+    private function addZipFile(string $path, string $content): void
+    {
+        if (!in_array($path, $this->pathNames)) {
+            $this->pathNames[] = $path;
+            $this->zip->addFile($path, $content);
+        }
+    }
 }
diff --git a/tests/PhpSpreadsheetTests/Writer/Xlsx/UnparsedDataCloneTest.php b/tests/PhpSpreadsheetTests/Writer/Xlsx/UnparsedDataCloneTest.php
new file mode 100644
index 00000000..d2afb423
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Writer/Xlsx/UnparsedDataCloneTest.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Writer\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Settings;
+use PhpOffice\PhpSpreadsheet\Shared\File;
+use PHPUnit\Framework\TestCase;
+
+class UnparsedDataCloneTest extends TestCase
+{
+    /**
+     * Test load and save Xlsx file with unparsed data (form elements, protected sheets, alternate contents, printer settings,..).
+     */
+    public function testLoadSaveXlsxWithUnparsedDataClone(): void
+    {
+        $sampleFilename = 'tests/data/Writer/XLSX/drawing_on_2nd_page.xlsx';
+        $resultFilename = tempnam(File::sysGetTempDir(), 'phpspreadsheet-test');
+        Settings::setLibXmlLoaderOptions(null); // reset to default options
+        $reader = new \PhpOffice\PhpSpreadsheet\Reader\Xlsx();
+        $spreadsheet = $reader->load($sampleFilename);
+        $spreadsheet->setActiveSheetIndex(1);
+        $sheet = $spreadsheet->getActiveSheet();
+        $drawings = $sheet->getDrawingCollection();
+        self::assertCount(1, $drawings);
+        $sheetCodeName = $sheet->getCodeName();
+        $unparsedLoadedData = $spreadsheet->getUnparsedLoadedData();
+        self::assertArrayHasKey('printerSettings', $unparsedLoadedData['sheets'][$sheetCodeName]);
+        self::assertCount(1, $unparsedLoadedData['sheets'][$sheetCodeName]['printerSettings']);
+
+        $clonedSheet = clone $spreadsheet->getActiveSheet();
+        $clonedSheet->setTitle('Clone');
+        $spreadsheet->addSheet($clonedSheet);
+
+        $writer = new \PhpOffice\PhpSpreadsheet\Writer\Xlsx($spreadsheet);
+        $writer->save($resultFilename);
+        $dupname = 'Unable to open saved file';
+        $zip = zip_open($resultFilename);
+        if (is_resource($zip)) {
+            $names = [];
+            $dupname = '';
+            while ($zip_entry = zip_read($zip)) {
+                $zipname = zip_entry_name($zip_entry);
+                if (in_array($zipname, $names)) {
+                    $dupname .= "$zipname,";
+                } else {
+                    $names[] = $zipname;
+                }
+            }
+            zip_close($zip);
+        }
+        unlink($resultFilename);
+        self::assertEquals('', $dupname);
+    }
+
+    /**
+     * Test that saving twice with same writer works.
+     */
+    public function testSaveTwice(): void
+    {
+        $sampleFilename = 'tests/data/Writer/XLSX/drawing_on_2nd_page.xlsx';
+        $resultFilename1 = tempnam(File::sysGetTempDir(), 'phpspreadsheet-test1');
+        $resultFilename2 = tempnam(File::sysGetTempDir(), 'phpspreadsheet-test2');
+        self::assertNotEquals($resultFilename1, $resultFilename2);
+        Settings::setLibXmlLoaderOptions(null); // reset to default options
+        $reader = new \PhpOffice\PhpSpreadsheet\Reader\Xlsx();
+        $spreadsheet = $reader->load($sampleFilename);
+        $sheet = $spreadsheet->setActiveSheetIndex(1);
+        $sheet->setTitle('Original');
+
+        $clonedSheet = clone $spreadsheet->getActiveSheet();
+        $clonedSheet->setTitle('Clone');
+        $spreadsheet->addSheet($clonedSheet);
+        $clonedSheet->getCell('A8')->setValue('cloned');
+        $sheet->getCell('A8')->setValue('original');
+
+        $writer = new \PhpOffice\PhpSpreadsheet\Writer\Xlsx($spreadsheet);
+        $writer->save($resultFilename1);
+        $reader1 = new \PhpOffice\PhpSpreadsheet\Reader\Xlsx();
+        $spreadsheet1 = $reader1->load($resultFilename1);
+        unlink($resultFilename1);
+        $sheet1c = $spreadsheet1->getSheetByName('Clone');
+        $sheet1o = $spreadsheet1->getSheetByName('Original');
+
+        $writer->save($resultFilename2);
+        $reader2 = new \PhpOffice\PhpSpreadsheet\Reader\Xlsx();
+        $spreadsheet2 = $reader2->load($resultFilename2);
+        unlink($resultFilename2);
+        $sheet2c = $spreadsheet2->getSheetByName('Clone');
+        $sheet2o = $spreadsheet2->getSheetByName('Original');
+
+        self::assertEquals($spreadsheet1->getSheetCount(), $spreadsheet2->getSheetCount());
+        self::assertCount(1, $sheet1c->getDrawingCollection());
+        self::assertCount(1, $sheet1o->getDrawingCollection());
+        self::assertCount(1, $sheet2c->getDrawingCollection());
+        self::assertCount(1, $sheet2o->getDrawingCollection());
+        self::assertEquals('original', $sheet1o->getCell('A8')->getValue());
+        self::assertEquals('original', $sheet2o->getCell('A8')->getValue());
+        self::assertEquals('cloned', $sheet1c->getCell('A8')->getValue());
+        self::assertEquals('cloned', $sheet2c->getCell('A8')->getValue());
+    }
+}

From ce6ac1f0404ae5bd9155faeba4d1f5816b354e34 Mon Sep 17 00:00:00 2001
From: oleibman <eclipsechasers2@yahoo.com>
Date: Fri, 19 Jun 2020 11:28:57 -0700
Subject: [PATCH 026/153]  Fix For #1509 (#1518)

* Fix For #1509

User expected no CSV enclosures after $writer->setEnclosure(''),
which had been changed to be consistent with $reader->setEnclosure('').
Writer will now omit enclosures after code above; no change to Reader.
Tests have been added for this condition.

* Add Option to Write CSV Enclosure Only When Required

Allowing the user to specify no enclosure when writing a CSV can lead to
a situation where PhpSpreadsheet (likewise Excel) will not read the
resulting file as intended, e.g. if any cell contains a delimiter character.
This is demonstrated in new test TestBadReread.
No existing setting will rectify this situation.

A better choice would be to add an option to write the enclosure
only when it is needed, which is what Excel does. The RFC4180 spec at
https://tools.ietf.org/html/rfc4180
states when it is needed - when the cell contains the delimiter,
or the enclosure, or a newline.
New test TestGoodReread demonstrates that the file is read as intended.

The documentation has been updated to describe the new function,
and to change the write example where the enclosure is set to null.

* Scrutinizer Suggestions

3 minor changes, all in tests.
---
 docs/topics/reading-and-writing-to-file.md    |  18 +-
 src/PhpSpreadsheet/Writer/Csv.php             |  42 +++-
 .../Writer/Csv/CsvEnclosureTest.php           | 216 ++++++++++++++++++
 .../Writer/Csv/CsvWriteTest.php               |   4 +-
 4 files changed, 265 insertions(+), 15 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Writer/Csv/CsvEnclosureTest.php

diff --git a/docs/topics/reading-and-writing-to-file.md b/docs/topics/reading-and-writing-to-file.md
index 020e0634..f8ba084b 100644
--- a/docs/topics/reading-and-writing-to-file.md
+++ b/docs/topics/reading-and-writing-to-file.md
@@ -478,7 +478,7 @@ imports onto the 6th sheet:
 ```php
 $reader = new \PhpOffice\PhpSpreadsheet\Reader\Csv();
 $reader->setDelimiter(';');
-$reader->setEnclosure('');
+$reader->setEnclosure('"');
 $reader->setSheetIndex(5);
 
 $reader->loadIntoExisting("05featuredemo.csv", $spreadsheet);
@@ -505,13 +505,26 @@ file:
 ```php
 $writer = new \PhpOffice\PhpSpreadsheet\Writer\Csv($spreadsheet);
 $writer->setDelimiter(';');
-$writer->setEnclosure('');
+$writer->setEnclosure('"');
 $writer->setLineEnding("\r\n");
 $writer->setSheetIndex(0);
 
 $writer->save("05featuredemo.csv");
 ```
 
+#### CSV enclosures
+
+By default, all CSV fields are wrapped in the enclosure character,
+which defaults to double-quote.
+You can change to use the enclosure character only when required:
+
+``` php
+$writer = new \PhpOffice\PhpSpreadsheet\Writer\Csv($spreadsheet);
+$writer->setEnclosureRequired(false);
+
+$writer->save("05featuredemo.csv");
+```
+
 #### Write a specific worksheet
 
 CSV files can only contain one worksheet. Therefore, you can specify
@@ -538,6 +551,7 @@ $writer->save("05featuredemo.csv");
 CSV files are written in UTF-8. If they do not contain characters
 outside the ASCII range, nothing else need be done.
 However, if such characters are in the file,
+or if the file starts with the 2 characters 'ID',
 it should explicitly include a BOM file header;
 if it doesn't, Excel will not interpret those characters correctly.
 This can be enabled by using the following code:
diff --git a/src/PhpSpreadsheet/Writer/Csv.php b/src/PhpSpreadsheet/Writer/Csv.php
index 414bdf90..74f28636 100644
--- a/src/PhpSpreadsheet/Writer/Csv.php
+++ b/src/PhpSpreadsheet/Writer/Csv.php
@@ -168,9 +168,9 @@ class Csv extends BaseWriter
      *
      * @return $this
      */
-    public function setEnclosure($pValue)
+    public function setEnclosure($pValue = '"')
     {
-        $this->enclosure = $pValue ? $pValue : '"';
+        $this->enclosure = $pValue;
 
         return $this;
     }
@@ -296,6 +296,20 @@ class Csv extends BaseWriter
         return $this;
     }
 
+    private $enclosureRequired = true;
+
+    public function setEnclosureRequired(bool $value): self
+    {
+        $this->enclosureRequired = $value;
+
+        return $this;
+    }
+
+    public function getEnclosureRequired(): bool
+    {
+        return $this->enclosureRequired;
+    }
+
     /**
      * Write line to CSV file.
      *
@@ -305,24 +319,28 @@ class Csv extends BaseWriter
     private function writeLine($pFileHandle, array $pValues): void
     {
         // No leading delimiter
-        $writeDelimiter = false;
+        $delimiter = '';
 
         // Build the line
         $line = '';
 
         foreach ($pValues as $element) {
-            // Escape enclosures
-            $element = str_replace($this->enclosure, $this->enclosure . $this->enclosure, $element);
-
             // Add delimiter
-            if ($writeDelimiter) {
-                $line .= $this->delimiter;
-            } else {
-                $writeDelimiter = true;
+            $line .= $delimiter;
+            $delimiter = $this->delimiter;
+            // Escape enclosures
+            $enclosure = $this->enclosure;
+            if ($enclosure) {
+                // If enclosure is not required, use enclosure only if
+                // element contains newline, delimiter, or enclosure.
+                if (!$this->enclosureRequired && strpbrk($element, "$delimiter$enclosure\n") === false) {
+                    $enclosure = '';
+                } else {
+                    $element = str_replace($enclosure, $enclosure . $enclosure, $element);
+                }
             }
-
             // Add enclosed string
-            $line .= $this->enclosure . $element . $this->enclosure;
+            $line .= $enclosure . $element . $enclosure;
         }
 
         // Add line ending
diff --git a/tests/PhpSpreadsheetTests/Writer/Csv/CsvEnclosureTest.php b/tests/PhpSpreadsheetTests/Writer/Csv/CsvEnclosureTest.php
new file mode 100644
index 00000000..d048183c
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Writer/Csv/CsvEnclosureTest.php
@@ -0,0 +1,216 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Writer\Csv;
+
+use PhpOffice\PhpSpreadsheet\Reader\Csv as CsvReader;
+use PhpOffice\PhpSpreadsheet\Shared\File;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Csv as CsvWriter;
+use PhpOffice\PhpSpreadsheetTests\Functional;
+
+class CsvEnclosureTest extends Functional\AbstractFunctional
+{
+    private static $cellValues = [
+        'A1' => '2020-06-03',
+        'B1' => '000123',
+        'C1' => '06.53',
+        'D1' => '14.22',
+        'A2' => '2020-06-04',
+        'B2' => '000234',
+        'C2' => '07.12',
+        'D2' => '15.44',
+    ];
+
+    public function testNormalEnclosure(): void
+    {
+        $delimiter = ';';
+        $enclosure = '"';
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        foreach (self::$cellValues as $key => $value) {
+            $sheet->setCellValue($key, $value);
+        }
+        $writer = new CsvWriter($spreadsheet);
+        $writer->setDelimiter($delimiter);
+        $writer->setEnclosure($enclosure);
+        $filename = tempnam(File::sysGetTempDir(), 'phpspreadsheet-test');
+        $writer->save($filename);
+        $filedata = file_get_contents($filename);
+        $filedata = preg_replace('/\\r?\\n/', $delimiter, $filedata);
+        $reader = new CsvReader();
+        $reader->setDelimiter($delimiter);
+        $reader->setEnclosure($enclosure);
+        $newspreadsheet = $reader->load($filename);
+        unlink($filename);
+        $sheet = $newspreadsheet->getActiveSheet();
+        $expected = '';
+        foreach (self::$cellValues as $key => $value) {
+            self::assertEquals($value, $sheet->getCell($key)->getValue());
+            $expected .= "$enclosure$value$enclosure$delimiter";
+        }
+        self::assertEquals($expected, $filedata);
+    }
+
+    public function testNoEnclosure(): void
+    {
+        $delimiter = ';';
+        $enclosure = '';
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        foreach (self::$cellValues as $key => $value) {
+            $sheet->setCellValue($key, $value);
+        }
+        $writer = new CsvWriter($spreadsheet);
+        $writer->setDelimiter($delimiter);
+        $writer->setEnclosure($enclosure);
+        self::assertEquals('', $writer->getEnclosure());
+        $filename = tempnam(File::sysGetTempDir(), 'phpspreadsheet-test');
+        $writer->save($filename);
+        $filedata = file_get_contents($filename);
+        $filedata = preg_replace('/\\r?\\n/', $delimiter, $filedata);
+        $reader = new CsvReader();
+        $reader->setDelimiter($delimiter);
+        $reader->setEnclosure($enclosure);
+        self::assertEquals('"', $reader->getEnclosure());
+        $newspreadsheet = $reader->load($filename);
+        unlink($filename);
+        $sheet = $newspreadsheet->getActiveSheet();
+        $expected = '';
+        foreach (self::$cellValues as $key => $value) {
+            self::assertEquals($value, $sheet->getCell($key)->getValue());
+            $expected .= "$enclosure$value$enclosure$delimiter";
+        }
+        self::assertEquals($expected, $filedata);
+    }
+
+    public function testNotRequiredEnclosure1(): void
+    {
+        $delimiter = ';';
+        $enclosure = '"';
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        foreach (self::$cellValues as $key => $value) {
+            $sheet->setCellValue($key, $value);
+        }
+        $writer = new CsvWriter($spreadsheet);
+        self::assertTrue($writer->getEnclosureRequired());
+        $writer->setEnclosureRequired(false)->setDelimiter($delimiter)->setEnclosure($enclosure);
+        $filename = tempnam(File::sysGetTempDir(), 'phpspreadsheet-test');
+        $writer->save($filename);
+        $filedata = file_get_contents($filename);
+        $filedata = preg_replace('/\\r?\\n/', $delimiter, $filedata);
+        $reader = new CsvReader();
+        $reader->setDelimiter($delimiter);
+        $reader->setEnclosure($enclosure);
+        $newspreadsheet = $reader->load($filename);
+        unlink($filename);
+        $sheet = $newspreadsheet->getActiveSheet();
+        $expected = '';
+        foreach (self::$cellValues as $key => $value) {
+            self::assertEquals($value, $sheet->getCell($key)->getValue());
+            $expected .= "$value$delimiter";
+        }
+        self::assertEquals($expected, $filedata);
+    }
+
+    public function testNotRequiredEnclosure2(): void
+    {
+        $cellValues2 = [
+            'A1' => '2020-06-03',
+            'B1' => 'has,separator',
+            'C1' => 'has;non-separator',
+            'D1' => 'has"enclosure',
+            'A2' => 'has space',
+            'B2' => "has\nnewline",
+            'C2' => '',
+            'D2' => '15.44',
+            'A3' => ' leadingspace',
+            'B3' => 'trailingspace ',
+            'C3' => '=D2*2',
+            'D3' => ',leadingcomma',
+            'A4' => 'trailingquote"',
+            'B4' => 'unused',
+            'C4' => 'unused',
+            'D4' => 'unused',
+        ];
+        $calcc3 = '30.88';
+        $expected1 = '2020-06-03,"has,separator",has;non-separator,"has""enclosure"';
+        $expected2 = 'has space,"has' . "\n" . 'newline",,15.44';
+        $expected3 = ' leadingspace,trailingspace ,' . $calcc3 . ',",leadingcomma"';
+        $expected4 = '"trailingquote""",unused,unused,unused';
+        $expectedfile = "$expected1\n$expected2\n$expected3\n$expected4\n";
+        $delimiter = ',';
+        $enclosure = '"';
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        foreach ($cellValues2 as $key => $value) {
+            $sheet->setCellValue($key, $value);
+        }
+        $writer = new CsvWriter($spreadsheet);
+        self::assertTrue($writer->getEnclosureRequired());
+        $writer->setEnclosureRequired(false)->setDelimiter($delimiter)->setEnclosure($enclosure);
+        $filename = tempnam(File::sysGetTempDir(), 'phpspreadsheet-test');
+        $writer->save($filename);
+        $filedata = file_get_contents($filename);
+        $filedata = preg_replace('/\\r/', '', $filedata);
+        $reader = new CsvReader();
+        $reader->setDelimiter($delimiter);
+        $reader->setEnclosure($enclosure);
+        $newspreadsheet = $reader->load($filename);
+        unlink($filename);
+        $sheet = $newspreadsheet->getActiveSheet();
+        foreach ($cellValues2 as $key => $value) {
+            self::assertEquals(($key === 'C3') ? $calcc3 : $value, $sheet->getCell($key)->getValue());
+        }
+        self::assertEquals($expectedfile, $filedata);
+    }
+
+    public function testGoodReread(): void
+    {
+        $delimiter = ',';
+        $enclosure = '"';
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->setCellValue('A1', '1');
+        $sheet->setCellValue('B1', '2,3');
+        $sheet->setCellValue('C1', '4');
+        $writer = new CsvWriter($spreadsheet);
+        $writer->setEnclosureRequired(false)->setDelimiter($delimiter)->setEnclosure($enclosure);
+        $filename = tempnam(File::sysGetTempDir(), 'phpspreadsheet-test');
+        $writer->save($filename);
+        $reader = new CsvReader();
+        $reader->setDelimiter($delimiter);
+        $reader->setEnclosure($enclosure);
+        $newspreadsheet = $reader->load($filename);
+        unlink($filename);
+        $sheet = $newspreadsheet->getActiveSheet();
+        self::assertEquals('1', $sheet->getCell('A1')->getValue());
+        self::assertEquals('2,3', $sheet->getCell('B1')->getValue());
+        self::assertEquals('4', $sheet->getCell('C1')->getValue());
+    }
+
+    public function testBadReread(): void
+    {
+        $delimiter = ',';
+        $enclosure = '';
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->setCellValue('A1', '1');
+        $sheet->setCellValue('B1', '2,3');
+        $sheet->setCellValue('C1', '4');
+        $writer = new CsvWriter($spreadsheet);
+        $writer->setDelimiter($delimiter)->setEnclosure($enclosure);
+        $filename = tempnam(File::sysGetTempDir(), 'phpspreadsheet-test');
+        $writer->save($filename);
+        $reader = new CsvReader();
+        $reader->setDelimiter($delimiter);
+        $reader->setEnclosure($enclosure);
+        $newspreadsheet = $reader->load($filename);
+        unlink($filename);
+        $sheet = $newspreadsheet->getActiveSheet();
+        self::assertEquals('1', $sheet->getCell('A1')->getValue());
+        self::assertEquals('2', $sheet->getCell('B1')->getValue());
+        self::assertEquals('3', $sheet->getCell('C1')->getValue());
+        self::assertEquals('4', $sheet->getCell('D1')->getValue());
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Writer/Csv/CsvWriteTest.php b/tests/PhpSpreadsheetTests/Writer/Csv/CsvWriteTest.php
index 7252ecf9..7fe1902b 100644
--- a/tests/PhpSpreadsheetTests/Writer/Csv/CsvWriteTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Csv/CsvWriteTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpOffice\PhpSpreadsheetTests\Functional;
+namespace PhpOffice\PhpSpreadsheetTests\Writer\Csv;
 
 use PhpOffice\PhpSpreadsheet\Reader\Csv as CsvReader;
 use PhpOffice\PhpSpreadsheet\Shared\File;
@@ -50,6 +50,8 @@ class CsvWriteTest extends Functional\AbstractFunctional
         $writer->setEnclosure('\'');
         self::assertEquals('\'', $writer->getEnclosure());
         $writer->setEnclosure('');
+        self::assertEquals('', $writer->getEnclosure());
+        $writer->setEnclosure();
         self::assertEquals('"', $writer->getEnclosure());
         self::assertEquals(PHP_EOL, $writer->getLineEnding());
         self::assertFalse($writer->getUseBOM());

From 73379cdfb1034db66167ae2c01e0b339366b4ddd Mon Sep 17 00:00:00 2001
From: oleibman <eclipsechasers2@yahoo.com>
Date: Fri, 19 Jun 2020 11:34:02 -0700
Subject: [PATCH 027/153] Improve Coverage for Gnumeric (#1517)

* Improve Coverage for Gnumeric

I believe that both BaseReader and Gnumeric Reader are now 100% covered.

My goal was to use PhpSpreadsheet to load the test file,
save it as Xlsx, and visually compare the two, then add a test
loaded with assertions. Results were generally pretty good,
but there were no tests with assertions. I added a few cells
to exercise some previously uncovered code. Code was extensively
refactored; logic changes are noted below.

Code allowed for specifying document properties in an old format.
I considered removing that, but I found the original spec at
http://www.jfree.org/jworkbook/download/gnumeric-xml.pdf
This allowed me to create an old file, which was not handled
correctly because of namespace differences. The code was corrected
to allow for this difference.

Added support for textRotation.

Mapping of fill types was not correct.

* PHP7.2 Error

One assertion failed under PHP7.2. Apparently there was some change in
the handling of SimpleXMLElement between 7.2 and 7.3. Casting to string
before use eliminates the problem.

* Scrutinizer Recommendations

All minor, solved (hopefully) mostly by casts.

* One Last Scrutinizer Fix

... I hope.
---
 samples/templates/GnumericTest.gnumeric       |  Bin 7823 -> 8064 bytes
 samples/templates/old.gnumeric                |  Bin 0 -> 1276 bytes
 src/PhpSpreadsheet/Reader/BaseReader.php      |   23 +-
 src/PhpSpreadsheet/Reader/Gnumeric.php        | 1123 ++++++++---------
 tests/PhpSpreadsheetTests/IOFactoryTest.php   |    1 +
 .../Reader/Gnumeric/GnumericFilter.php        |   14 +
 .../Reader/Gnumeric/GnumericInfoTest.php      |   47 +
 .../Reader/Gnumeric/GnumericLoadTest.php      |  162 +++
 .../Reader/Gnumeric/GnumericStylesTest.php    |  269 ++++
 9 files changed, 1060 insertions(+), 579 deletions(-)
 create mode 100644 samples/templates/old.gnumeric
 create mode 100644 tests/PhpSpreadsheetTests/Reader/Gnumeric/GnumericFilter.php
 create mode 100644 tests/PhpSpreadsheetTests/Reader/Gnumeric/GnumericInfoTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Reader/Gnumeric/GnumericLoadTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Reader/Gnumeric/GnumericStylesTest.php

diff --git a/samples/templates/GnumericTest.gnumeric b/samples/templates/GnumericTest.gnumeric
index ea2fac379e51e707060c8c8d5314899c60bad287..0493e762360924353d0d60a1709528637db0224b 100644
GIT binary patch
literal 8064
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
OAO0WBvt|lzf&l<1Kg6Q|

literal 7823
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

diff --git a/samples/templates/old.gnumeric b/samples/templates/old.gnumeric
new file mode 100644
index 0000000000000000000000000000000000000000..36b84902304d8f5b547785e563cfe00d684c4cc6
GIT binary patch
literal 1276
zcmV<Y1OxjYiwFqZvD97w18;0(XKr<EWpZg_E_iKh0L@ozPa`)F{(is0+7JCk-hh^-
zBq!cMg(D*2sIICaXLqu(@Y*Zeo0t3b9oxIfZZ>d0E43h@ooB`~<MA_NbNqRka54v_
znH0UC-Dm{_L?|OB;$HALy4*VoKKDNz$BF7bN%cID@|oZgp}Pq6f|)UCx7l1Q7L8bB
z2`Cmeq>7vKcB>JYD9CM>npJEU`_8J<YPFkx+}#et86<R%32mqd0at0()egLsAvG?y
z7egI2mO2XZBu|V{Y?2w!+dwW0nn1tU%2x)9ZdcFbVmy<IeV4*eKGva<oKL7aZmw7O
z#b%X4|G>lU+rx9pGw6>V9xuGg%b&ckoxocY!b34E{NJP_qyY<!4V~!!Dw9Z#X=da&
zlu63L^5S35qzV))8fHmC)hd^63?$_wX_|88d0NW{1MO+_CgOfU+jRzoB9B^fTZ@nx
zB<O3-&*_{+<cjeL^5z2(Fnx%nTD=xya6PzKhQP^Hz7z5QGy+9Npba^zcz9oMnIs@g
zomX!Uo_iqYfc?VK%~`xRk(7#8iy)+c4|slt)k3Q1A8hgWiidXvPpF_Vyvm>Z1qgBr
zY=X8Qh+vrE@Tz|vkxQu(YBswYD4E(R2S3_Vv)+Tl8G!kMp>9M3%WbglzS{Z1HTr1_
zD6h4$Zsx)j$OMd9ktY_JSugmdeH4&uVDZfKg8ieTpjnQn%K|xPI^}d_H=A*)d%=`)
zjhEUri{Kk5SplvTiz>jG<k#-dE9iq<Y@vCS`^<1A0HYX{A)L#@RWgxWp8}VQ-Kqz_
z7pE#!pi;Omo0GhwOU$glmuqryt;77vIxBkJHz|`oJ}cah*E?uO%?Eh!=0;2%Nw9s_
z-c^h*gJQhPlnf*q;*L8<jr{;g1k*>sa4%u9K9-3zMka5u<S;dFu~W8QZ!w(tmMtvX
z2aV1PmQ#s$>JKfO^&$-MSpdY|ZoL2-D8#{s?H!QKH+pNeaCxVlH=@Ncmb><PL2Hxk
zONtnYSw~?GV$7yvDfnuv&5DDr8zoZ6aHg<>>bgi#talA|<70;_1u0N7wx^!!wpH%@
zwsklrLG{(x%rM=^m(XK{p4mD%mT@W~9nusEvyI9d`^LlBIK@K=$Q_F!j=_GSN&4HL
zqm$FW0+Kh=I{u|U+3h6*JQ?EG4Nk5ub}URW57j@(-!ERuDeyvj4Ba7=g$IaHP4F$P
z3^u7PrxzaVEN~C}$l;yCLnk===flJO!=UVkT%T|j+y4pz@-_cNf<7slj$mn=t9w^1
zXEK~&nH*@Rs_=SzzCT0c^f<;4b|{WUYuUx$fSl6sxffjGPj~$X+khIZpujw(TATX&
zqZeF(07ZGQuC_45_sp;8Px8p8fp2*hy3a?<NZH}%q#<50&oDxUX7S7-{cGTJu&-@j
zYU{9EiPJK7M#x2nmU(*W=S>Z_45*{-)a&p$qp=i}?^poyz1`YoJ;@DJ5j-s_P(d54
zvVAyBX~xZveTRV^M+cir4hd4%w>yo}H3%F+%SuhoGNq*|i07r8dE3Ts;Am^Z(DH`Y
z;ffsq=elwy-_n)L48ha#U3k*oBrEZ>@lk~{6@2tP<fj*1BrD?EWWpgCxgp!Oq)s!t
m?NSmpOhqWNdAvENh7zA8L?b$>WMBMG)BhVUvjX#e4*&o~Cv?65

literal 0
HcmV?d00001

diff --git a/src/PhpSpreadsheet/Reader/BaseReader.php b/src/PhpSpreadsheet/Reader/BaseReader.php
index 77a6421b..eb0e3ba2 100644
--- a/src/PhpSpreadsheet/Reader/BaseReader.php
+++ b/src/PhpSpreadsheet/Reader/BaseReader.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Reader;
 
+use PhpOffice\PhpSpreadsheet\Reader\Exception as ReaderException;
 use PhpOffice\PhpSpreadsheet\Reader\Security\XmlScanner;
 use PhpOffice\PhpSpreadsheet\Shared\File;
 
@@ -133,11 +134,7 @@ abstract class BaseReader implements IReader
 
     public function getSecurityScanner()
     {
-        if (property_exists($this, 'securityScanner')) {
-            return $this->securityScanner;
-        }
-
-        return null;
+        return $this->securityScanner;
     }
 
     /**
@@ -147,12 +144,18 @@ abstract class BaseReader implements IReader
      */
     protected function openFile($pFilename): void
     {
-        File::assertFile($pFilename);
+        if ($pFilename) {
+            File::assertFile($pFilename);
 
-        // Open file
-        $this->fileHandle = fopen($pFilename, 'rb');
-        if ($this->fileHandle === false) {
-            throw new Exception('Could not open file ' . $pFilename . ' for reading.');
+            // Open file
+            $fileHandle = fopen($pFilename, 'rb');
+        } else {
+            $fileHandle = false;
+        }
+        if ($fileHandle !== false) {
+            $this->fileHandle = $fileHandle;
+        } else {
+            throw new ReaderException('Could not open file ' . $pFilename . ' for reading.');
         }
     }
 }
diff --git a/src/PhpSpreadsheet/Reader/Gnumeric.php b/src/PhpSpreadsheet/Reader/Gnumeric.php
index f9768029..81096730 100644
--- a/src/PhpSpreadsheet/Reader/Gnumeric.php
+++ b/src/PhpSpreadsheet/Reader/Gnumeric.php
@@ -18,6 +18,7 @@ use PhpOffice\PhpSpreadsheet\Style\Borders;
 use PhpOffice\PhpSpreadsheet\Style\Fill;
 use PhpOffice\PhpSpreadsheet\Style\Font;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use SimpleXMLElement;
 use XMLReader;
 
 class Gnumeric extends BaseReader
@@ -29,8 +30,23 @@ class Gnumeric extends BaseReader
      */
     private $expressions = [];
 
+    /**
+     * Spreadsheet shared across all functions.
+     *
+     * @var Spreadsheet
+     */
+    private $spreadsheet;
+
     private $referenceHelper;
 
+    /**
+     * Namespace shared across all functions.
+     * It is 'gnm', except for really old sheets which use 'gmr'.
+     *
+     * @var string
+     */
+    private $gnm = 'gnm';
+
     /**
      * Create a new Gnumeric.
      */
@@ -53,18 +69,22 @@ class Gnumeric extends BaseReader
         File::assertFile($pFilename);
 
         // Check if gzlib functions are available
-        if (!function_exists('gzread')) {
-            throw new Exception('gzlib library is not enabled');
+        $data = '';
+        if (function_exists('gzread')) {
+            // Read signature data (first 3 bytes)
+            $fh = fopen($pFilename, 'rb');
+            $data = fread($fh, 2);
+            fclose($fh);
         }
 
-        // Read signature data (first 3 bytes)
-        $fh = fopen($pFilename, 'rb');
-        $data = fread($fh, 2);
-        fclose($fh);
-
         return $data == chr(0x1F) . chr(0x8B);
     }
 
+    private static function matchXml(string $name, string $field): bool
+    {
+        return 1 === preg_match("/^(gnm|gmr):$field$/", $name);
+    }
+
     /**
      * Reads names of the worksheets from a file, without parsing the whole file to a Spreadsheet object.
      *
@@ -82,10 +102,10 @@ class Gnumeric extends BaseReader
 
         $worksheetNames = [];
         while ($xml->read()) {
-            if ($xml->name == 'gnm:SheetName' && $xml->nodeType == XMLReader::ELEMENT) {
+            if (self::matchXml($xml->name, 'SheetName') && $xml->nodeType == XMLReader::ELEMENT) {
                 $xml->read(); //    Move onto the value node
                 $worksheetNames[] = (string) $xml->value;
-            } elseif ($xml->name == 'gnm:Sheets') {
+            } elseif (self::matchXml($xml->name, 'Sheets')) {
                 //    break out of the loop once we've got our sheet names rather than parse the entire file
                 break;
             }
@@ -111,7 +131,7 @@ class Gnumeric extends BaseReader
 
         $worksheetInfo = [];
         while ($xml->read()) {
-            if ($xml->name == 'gnm:Sheet' && $xml->nodeType == XMLReader::ELEMENT) {
+            if (self::matchXml($xml->name, 'Sheet') && $xml->nodeType == XMLReader::ELEMENT) {
                 $tmpInfo = [
                     'worksheetName' => '',
                     'lastColumnLetter' => 'A',
@@ -121,18 +141,20 @@ class Gnumeric extends BaseReader
                 ];
 
                 while ($xml->read()) {
-                    if ($xml->name == 'gnm:Name' && $xml->nodeType == XMLReader::ELEMENT) {
-                        $xml->read(); //    Move onto the value node
-                        $tmpInfo['worksheetName'] = (string) $xml->value;
-                    } elseif ($xml->name == 'gnm:MaxCol' && $xml->nodeType == XMLReader::ELEMENT) {
-                        $xml->read(); //    Move onto the value node
-                        $tmpInfo['lastColumnIndex'] = (int) $xml->value;
-                        $tmpInfo['totalColumns'] = (int) $xml->value + 1;
-                    } elseif ($xml->name == 'gnm:MaxRow' && $xml->nodeType == XMLReader::ELEMENT) {
-                        $xml->read(); //    Move onto the value node
-                        $tmpInfo['totalRows'] = (int) $xml->value + 1;
+                    if ($xml->nodeType == XMLReader::ELEMENT) {
+                        if (self::matchXml($xml->name, 'Name')) {
+                            $xml->read(); //    Move onto the value node
+                            $tmpInfo['worksheetName'] = (string) $xml->value;
+                        } elseif (self::matchXml($xml->name, 'MaxCol')) {
+                            $xml->read(); //    Move onto the value node
+                            $tmpInfo['lastColumnIndex'] = (int) $xml->value;
+                            $tmpInfo['totalColumns'] = (int) $xml->value + 1;
+                        } elseif (self::matchXml($xml->name, 'MaxRow')) {
+                            $xml->read(); //    Move onto the value node
+                            $tmpInfo['totalRows'] = (int) $xml->value + 1;
 
-                        break;
+                            break;
+                        }
                     }
                 }
                 $tmpInfo['lastColumnLetter'] = Coordinate::stringFromColumnIndex($tmpInfo['lastColumnIndex'] + 1);
@@ -162,6 +184,283 @@ class Gnumeric extends BaseReader
         return $data;
     }
 
+    private static $mappings = [
+        'borderStyle' => [
+            '0' => Border::BORDER_NONE,
+            '1' => Border::BORDER_THIN,
+            '2' => Border::BORDER_MEDIUM,
+            '3' => Border::BORDER_SLANTDASHDOT,
+            '4' => Border::BORDER_DASHED,
+            '5' => Border::BORDER_THICK,
+            '6' => Border::BORDER_DOUBLE,
+            '7' => Border::BORDER_DOTTED,
+            '8' => Border::BORDER_MEDIUMDASHED,
+            '9' => Border::BORDER_DASHDOT,
+            '10' => Border::BORDER_MEDIUMDASHDOT,
+            '11' => Border::BORDER_DASHDOTDOT,
+            '12' => Border::BORDER_MEDIUMDASHDOTDOT,
+            '13' => Border::BORDER_MEDIUMDASHDOTDOT,
+        ],
+        'dataType' => [
+            '10' => DataType::TYPE_NULL,
+            '20' => DataType::TYPE_BOOL,
+            '30' => DataType::TYPE_NUMERIC, // Integer doesn't exist in Excel
+            '40' => DataType::TYPE_NUMERIC, // Float
+            '50' => DataType::TYPE_ERROR,
+            '60' => DataType::TYPE_STRING,
+            //'70':        //    Cell Range
+            //'80':        //    Array
+        ],
+        'fillType' => [
+            '1' => Fill::FILL_SOLID,
+            '2' => Fill::FILL_PATTERN_DARKGRAY,
+            '3' => Fill::FILL_PATTERN_MEDIUMGRAY,
+            '4' => Fill::FILL_PATTERN_LIGHTGRAY,
+            '5' => Fill::FILL_PATTERN_GRAY125,
+            '6' => Fill::FILL_PATTERN_GRAY0625,
+            '7' => Fill::FILL_PATTERN_DARKHORIZONTAL, // horizontal stripe
+            '8' => Fill::FILL_PATTERN_DARKVERTICAL, // vertical stripe
+            '9' => Fill::FILL_PATTERN_DARKDOWN, // diagonal stripe
+            '10' => Fill::FILL_PATTERN_DARKUP, // reverse diagonal stripe
+            '11' => Fill::FILL_PATTERN_DARKGRID, // diagoanl crosshatch
+            '12' => Fill::FILL_PATTERN_DARKTRELLIS, // thick diagonal crosshatch
+            '13' => Fill::FILL_PATTERN_LIGHTHORIZONTAL,
+            '14' => Fill::FILL_PATTERN_LIGHTVERTICAL,
+            '15' => Fill::FILL_PATTERN_LIGHTUP,
+            '16' => Fill::FILL_PATTERN_LIGHTDOWN,
+            '17' => Fill::FILL_PATTERN_LIGHTGRID, // thin horizontal crosshatch
+            '18' => Fill::FILL_PATTERN_LIGHTTRELLIS, // thin diagonal crosshatch
+        ],
+        'horizontal' => [
+            '1' => Alignment::HORIZONTAL_GENERAL,
+            '2' => Alignment::HORIZONTAL_LEFT,
+            '4' => Alignment::HORIZONTAL_RIGHT,
+            '8' => Alignment::HORIZONTAL_CENTER,
+            '16' => Alignment::HORIZONTAL_CENTER_CONTINUOUS,
+            '32' => Alignment::HORIZONTAL_JUSTIFY,
+            '64' => Alignment::HORIZONTAL_CENTER_CONTINUOUS,
+        ],
+        'underline' => [
+            '1' => Font::UNDERLINE_SINGLE,
+            '2' => Font::UNDERLINE_DOUBLE,
+            '3' => Font::UNDERLINE_SINGLEACCOUNTING,
+            '4' => Font::UNDERLINE_DOUBLEACCOUNTING,
+        ],
+        'vertical' => [
+            '1' => Alignment::VERTICAL_TOP,
+            '2' => Alignment::VERTICAL_BOTTOM,
+            '4' => Alignment::VERTICAL_CENTER,
+            '8' => Alignment::VERTICAL_JUSTIFY,
+        ],
+    ];
+
+    public static function gnumericMappings(): array
+    {
+        return self::$mappings;
+    }
+
+    private function docPropertiesOld(SimpleXMLElement $gnmXML): void
+    {
+        $docProps = $this->spreadsheet->getProperties();
+        foreach ($gnmXML->Summary->Item as $summaryItem) {
+            $propertyName = $summaryItem->name;
+            $propertyValue = $summaryItem->{'val-string'};
+            switch ($propertyName) {
+                case 'title':
+                    $docProps->setTitle(trim($propertyValue));
+
+                    break;
+                case 'comments':
+                    $docProps->setDescription(trim($propertyValue));
+
+                    break;
+                case 'keywords':
+                    $docProps->setKeywords(trim($propertyValue));
+
+                    break;
+                case 'category':
+                    $docProps->setCategory(trim($propertyValue));
+
+                    break;
+                case 'manager':
+                    $docProps->setManager(trim($propertyValue));
+
+                    break;
+                case 'author':
+                    $docProps->setCreator(trim($propertyValue));
+                    $docProps->setLastModifiedBy(trim($propertyValue));
+
+                    break;
+                case 'company':
+                    $docProps->setCompany(trim($propertyValue));
+
+                    break;
+            }
+        }
+    }
+
+    private function docPropertiesDC(SimpleXMLElement $officePropertyDC): void
+    {
+        $docProps = $this->spreadsheet->getProperties();
+        foreach ($officePropertyDC as $propertyName => $propertyValue) {
+            $propertyValue = trim((string) $propertyValue);
+            switch ($propertyName) {
+                case 'title':
+                    $docProps->setTitle($propertyValue);
+
+                    break;
+                case 'subject':
+                    $docProps->setSubject($propertyValue);
+
+                    break;
+                case 'creator':
+                    $docProps->setCreator($propertyValue);
+                    $docProps->setLastModifiedBy($propertyValue);
+
+                    break;
+                case 'date':
+                    $creationDate = strtotime($propertyValue);
+                    $docProps->setCreated($creationDate);
+                    $docProps->setModified($creationDate);
+
+                    break;
+                case 'description':
+                    $docProps->setDescription($propertyValue);
+
+                    break;
+            }
+        }
+    }
+
+    private function docPropertiesMeta(SimpleXMLElement $officePropertyMeta, array $namespacesMeta): void
+    {
+        $docProps = $this->spreadsheet->getProperties();
+        foreach ($officePropertyMeta as $propertyName => $propertyValue) {
+            $attributes = $propertyValue->attributes($namespacesMeta['meta']);
+            $propertyValue = trim((string) $propertyValue);
+            switch ($propertyName) {
+                case 'keyword':
+                    $docProps->setKeywords($propertyValue);
+
+                    break;
+                case 'initial-creator':
+                    $docProps->setCreator($propertyValue);
+                    $docProps->setLastModifiedBy($propertyValue);
+
+                    break;
+                case 'creation-date':
+                    $creationDate = strtotime($propertyValue);
+                    $docProps->setCreated($creationDate);
+                    $docProps->setModified($creationDate);
+
+                    break;
+                case 'user-defined':
+                    [, $attrName] = explode(':', $attributes['name']);
+                    switch ($attrName) {
+                        case 'publisher':
+                            $docProps->setCompany($propertyValue);
+
+                            break;
+                        case 'category':
+                            $docProps->setCategory($propertyValue);
+
+                            break;
+                        case 'manager':
+                            $docProps->setManager($propertyValue);
+
+                            break;
+                    }
+
+                    break;
+            }
+        }
+    }
+
+    private function docProperties(SimpleXMLElement $xml, SimpleXMLElement $gnmXML, array $namespacesMeta): void
+    {
+        if (isset($namespacesMeta['office'])) {
+            $officeXML = $xml->children($namespacesMeta['office']);
+            $officeDocXML = $officeXML->{'document-meta'};
+            $officeDocMetaXML = $officeDocXML->meta;
+
+            foreach ($officeDocMetaXML as $officePropertyData) {
+                $officePropertyDC = [];
+                if (isset($namespacesMeta['dc'])) {
+                    $officePropertyDC = $officePropertyData->children($namespacesMeta['dc']);
+                }
+                $this->docPropertiesDC($officePropertyDC);
+
+                $officePropertyMeta = [];
+                if (isset($namespacesMeta['meta'])) {
+                    $officePropertyMeta = $officePropertyData->children($namespacesMeta['meta']);
+                }
+                $this->docPropertiesMeta($officePropertyMeta, $namespacesMeta);
+            }
+        } elseif (isset($gnmXML->Summary)) {
+            $this->docPropertiesOld($gnmXML);
+        }
+    }
+
+    private function sheetMargin(string $key, float $marginSize): void
+    {
+        switch ($key) {
+            case 'top':
+                $this->spreadsheet->getActiveSheet()->getPageMargins()->setTop($marginSize);
+
+                break;
+            case 'bottom':
+                $this->spreadsheet->getActiveSheet()->getPageMargins()->setBottom($marginSize);
+
+                break;
+            case 'left':
+                $this->spreadsheet->getActiveSheet()->getPageMargins()->setLeft($marginSize);
+
+                break;
+            case 'right':
+                $this->spreadsheet->getActiveSheet()->getPageMargins()->setRight($marginSize);
+
+                break;
+            case 'header':
+                $this->spreadsheet->getActiveSheet()->getPageMargins()->setHeader($marginSize);
+
+                break;
+            case 'footer':
+                $this->spreadsheet->getActiveSheet()->getPageMargins()->setFooter($marginSize);
+
+                break;
+        }
+    }
+
+    private function sheetMargins(SimpleXMLElement $sheet): void
+    {
+        if (!$this->readDataOnly && isset($sheet->PrintInformation, $sheet->PrintInformation->Margins)) {
+            foreach ($sheet->PrintInformation->Margins->children($this->gnm, true) as $key => $margin) {
+                $marginAttributes = $margin->attributes();
+                $marginSize = 72 / 100; //    Default
+                switch ($marginAttributes['PrefUnit']) {
+                    case 'mm':
+                        $marginSize = (int) ($marginAttributes['Points']) / 100;
+
+                        break;
+                }
+                $this->sheetMargin($key, (float) $marginSize);
+            }
+        }
+    }
+
+    private function processComments(SimpleXMLElement $sheet): void
+    {
+        if ((!$this->readDataOnly) && (isset($sheet->Objects))) {
+            foreach ($sheet->Objects->children($this->gnm, true) as $key => $comment) {
+                $commentAttributes = $comment->attributes();
+                //    Only comment objects are handled at the moment
+                if ($commentAttributes->Text) {
+                    $this->spreadsheet->getActiveSheet()->getComment((string) $commentAttributes->ObjectBound)->setAuthor((string) $commentAttributes->Author)->setText($this->parseRichText((string) $commentAttributes->Text));
+                }
+            }
+        }
+    }
+
     /**
      * Loads Spreadsheet from file.
      *
@@ -173,6 +472,7 @@ class Gnumeric extends BaseReader
     {
         // Create new Spreadsheet
         $spreadsheet = new Spreadsheet();
+        $spreadsheet->removeSheetByIndex(0);
 
         // Load into this instance
         return $this->loadIntoExisting($pFilename, $spreadsheet);
@@ -180,143 +480,21 @@ class Gnumeric extends BaseReader
 
     /**
      * Loads from file into Spreadsheet instance.
-     *
-     * @param string $pFilename
-     *
-     * @return Spreadsheet
      */
-    public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
+    public function loadIntoExisting(string $pFilename, Spreadsheet $spreadsheet): Spreadsheet
     {
+        $this->spreadsheet = $spreadsheet;
         File::assertFile($pFilename);
 
         $gFileData = $this->gzfileGetContents($pFilename);
 
-        $xml = simplexml_load_string($this->securityScanner->scan($gFileData), 'SimpleXMLElement', Settings::getLibXmlLoaderOptions());
+        $xml2 = simplexml_load_string($this->securityScanner->scan($gFileData), 'SimpleXMLElement', Settings::getLibXmlLoaderOptions());
+        $xml = ($xml2 !== false) ? $xml2 : new SimpleXMLElement('<?xml version="1.0" encoding="UTF-8"?><root></root>');
         $namespacesMeta = $xml->getNamespaces(true);
+        $this->gnm = array_key_exists('gmr', $namespacesMeta) ? 'gmr' : 'gnm';
 
-        $gnmXML = $xml->children($namespacesMeta['gnm']);
-
-        $docProps = $spreadsheet->getProperties();
-        //    Document Properties are held differently, depending on the version of Gnumeric
-        if (isset($namespacesMeta['office'])) {
-            $officeXML = $xml->children($namespacesMeta['office']);
-            $officeDocXML = $officeXML->{'document-meta'};
-            $officeDocMetaXML = $officeDocXML->meta;
-
-            foreach ($officeDocMetaXML as $officePropertyData) {
-                $officePropertyDC = [];
-                if (isset($namespacesMeta['dc'])) {
-                    $officePropertyDC = $officePropertyData->children($namespacesMeta['dc']);
-                }
-                foreach ($officePropertyDC as $propertyName => $propertyValue) {
-                    $propertyValue = (string) $propertyValue;
-                    switch ($propertyName) {
-                        case 'title':
-                            $docProps->setTitle(trim($propertyValue));
-
-                            break;
-                        case 'subject':
-                            $docProps->setSubject(trim($propertyValue));
-
-                            break;
-                        case 'creator':
-                            $docProps->setCreator(trim($propertyValue));
-                            $docProps->setLastModifiedBy(trim($propertyValue));
-
-                            break;
-                        case 'date':
-                            $creationDate = strtotime(trim($propertyValue));
-                            $docProps->setCreated($creationDate);
-                            $docProps->setModified($creationDate);
-
-                            break;
-                        case 'description':
-                            $docProps->setDescription(trim($propertyValue));
-
-                            break;
-                    }
-                }
-                $officePropertyMeta = [];
-                if (isset($namespacesMeta['meta'])) {
-                    $officePropertyMeta = $officePropertyData->children($namespacesMeta['meta']);
-                }
-                foreach ($officePropertyMeta as $propertyName => $propertyValue) {
-                    $attributes = $propertyValue->attributes($namespacesMeta['meta']);
-                    $propertyValue = (string) $propertyValue;
-                    switch ($propertyName) {
-                        case 'keyword':
-                            $docProps->setKeywords(trim($propertyValue));
-
-                            break;
-                        case 'initial-creator':
-                            $docProps->setCreator(trim($propertyValue));
-                            $docProps->setLastModifiedBy(trim($propertyValue));
-
-                            break;
-                        case 'creation-date':
-                            $creationDate = strtotime(trim($propertyValue));
-                            $docProps->setCreated($creationDate);
-                            $docProps->setModified($creationDate);
-
-                            break;
-                        case 'user-defined':
-                            [, $attrName] = explode(':', $attributes['name']);
-                            switch ($attrName) {
-                                case 'publisher':
-                                    $docProps->setCompany(trim($propertyValue));
-
-                                    break;
-                                case 'category':
-                                    $docProps->setCategory(trim($propertyValue));
-
-                                    break;
-                                case 'manager':
-                                    $docProps->setManager(trim($propertyValue));
-
-                                    break;
-                            }
-
-                            break;
-                    }
-                }
-            }
-        } elseif (isset($gnmXML->Summary)) {
-            foreach ($gnmXML->Summary->Item as $summaryItem) {
-                $propertyName = $summaryItem->name;
-                $propertyValue = $summaryItem->{'val-string'};
-                switch ($propertyName) {
-                    case 'title':
-                        $docProps->setTitle(trim($propertyValue));
-
-                        break;
-                    case 'comments':
-                        $docProps->setDescription(trim($propertyValue));
-
-                        break;
-                    case 'keywords':
-                        $docProps->setKeywords(trim($propertyValue));
-
-                        break;
-                    case 'category':
-                        $docProps->setCategory(trim($propertyValue));
-
-                        break;
-                    case 'manager':
-                        $docProps->setManager(trim($propertyValue));
-
-                        break;
-                    case 'author':
-                        $docProps->setCreator(trim($propertyValue));
-                        $docProps->setLastModifiedBy(trim($propertyValue));
-
-                        break;
-                    case 'company':
-                        $docProps->setCompany(trim($propertyValue));
-
-                        break;
-                }
-            }
-        }
+        $gnmXML = $xml->children($namespacesMeta[$this->gnm]);
+        $this->docProperties($xml, $gnmXML, $namespacesMeta);
 
         $worksheetID = 0;
         foreach ($gnmXML->Sheets->Sheet as $sheet) {
@@ -328,53 +506,14 @@ class Gnumeric extends BaseReader
             $maxRow = $maxCol = 0;
 
             // Create new Worksheet
-            $spreadsheet->createSheet();
-            $spreadsheet->setActiveSheetIndex($worksheetID);
+            $this->spreadsheet->createSheet();
+            $this->spreadsheet->setActiveSheetIndex($worksheetID);
             //    Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in formula
             //        cells... during the load, all formulae should be correct, and we're simply bringing the worksheet
             //        name in line with the formula, not the reverse
-            $spreadsheet->getActiveSheet()->setTitle($worksheetName, false, false);
+            $this->spreadsheet->getActiveSheet()->setTitle($worksheetName, false, false);
 
-            if ((!$this->readDataOnly) && (isset($sheet->PrintInformation))) {
-                if (isset($sheet->PrintInformation->Margins)) {
-                    foreach ($sheet->PrintInformation->Margins->children('gnm', true) as $key => $margin) {
-                        $marginAttributes = $margin->attributes();
-                        $marginSize = 72 / 100; //    Default
-                        switch ($marginAttributes['PrefUnit']) {
-                            case 'mm':
-                                $marginSize = (int) ($marginAttributes['Points']) / 100;
-
-                                break;
-                        }
-                        switch ($key) {
-                            case 'top':
-                                $spreadsheet->getActiveSheet()->getPageMargins()->setTop($marginSize);
-
-                                break;
-                            case 'bottom':
-                                $spreadsheet->getActiveSheet()->getPageMargins()->setBottom($marginSize);
-
-                                break;
-                            case 'left':
-                                $spreadsheet->getActiveSheet()->getPageMargins()->setLeft($marginSize);
-
-                                break;
-                            case 'right':
-                                $spreadsheet->getActiveSheet()->getPageMargins()->setRight($marginSize);
-
-                                break;
-                            case 'header':
-                                $spreadsheet->getActiveSheet()->getPageMargins()->setHeader($marginSize);
-
-                                break;
-                            case 'footer':
-                                $spreadsheet->getActiveSheet()->getPageMargins()->setFooter($marginSize);
-
-                                break;
-                        }
-                    }
-                }
-            }
+            $this->sheetMargins($sheet);
 
             foreach ($sheet->Cells->Cell as $cell) {
                 $cellAttributes = $cell->attributes();
@@ -420,48 +559,19 @@ class Gnumeric extends BaseReader
                     }
                     $type = DataType::TYPE_FORMULA;
                 } else {
-                    switch ($ValueType) {
-                        case '10':        //    NULL
-                            $type = DataType::TYPE_NULL;
-
-                            break;
-                        case '20':        //    Boolean
-                            $type = DataType::TYPE_BOOL;
-                            $cell = $cell == 'TRUE';
-
-                            break;
-                        case '30':        //    Integer
-                            $cell = (int) $cell;
-                            // Excel 2007+ doesn't differentiate between integer and float, so set the value and dropthru to the next (numeric) case
-                            // no break
-                        case '40':        //    Float
-                            $type = DataType::TYPE_NUMERIC;
-
-                            break;
-                        case '50':        //    Error
-                            $type = DataType::TYPE_ERROR;
-
-                            break;
-                        case '60':        //    String
-                            $type = DataType::TYPE_STRING;
-
-                            break;
-                        case '70':        //    Cell Range
-                        case '80':        //    Array
+                    $vtype = (string) $ValueType;
+                    if (array_key_exists($vtype, self::$mappings['dataType'])) {
+                        $type = self::$mappings['dataType'][$vtype];
+                    }
+                    if ($vtype == '20') {        //    Boolean
+                        $cell = $cell == 'TRUE';
                     }
                 }
-                $spreadsheet->getActiveSheet()->getCell($column . $row)->setValueExplicit($cell, $type);
+                $this->spreadsheet->getActiveSheet()->getCell($column . $row)->setValueExplicit((string) $cell, $type);
             }
 
-            if ((!$this->readDataOnly) && (isset($sheet->Objects))) {
-                foreach ($sheet->Objects->children('gnm', true) as $key => $comment) {
-                    $commentAttributes = $comment->attributes();
-                    //    Only comment objects are handled at the moment
-                    if ($commentAttributes->Text) {
-                        $spreadsheet->getActiveSheet()->getComment((string) $commentAttributes->ObjectBound)->setAuthor((string) $commentAttributes->Author)->setText($this->parseRichText((string) $commentAttributes->Text));
-                    }
-                }
-            }
+            $this->processComments($sheet);
+
             foreach ($sheet->Styles->StyleRegion as $styleRegion) {
                 $styleAttributes = $styleRegion->attributes();
                 if (($styleAttributes['startRow'] <= $maxRow) &&
@@ -471,306 +581,197 @@ class Gnumeric extends BaseReader
 
                     $endColumn = ($styleAttributes['endCol'] > $maxCol) ? $maxCol : (int) $styleAttributes['endCol'];
                     $endColumn = Coordinate::stringFromColumnIndex($endColumn + 1);
-                    $endRow = ($styleAttributes['endRow'] > $maxRow) ? $maxRow : $styleAttributes['endRow'];
-                    ++$endRow;
+                    $endRow = 1 + (($styleAttributes['endRow'] > $maxRow) ? $maxRow : $styleAttributes['endRow']);
                     $cellRange = $startColumn . $startRow . ':' . $endColumn . $endRow;
 
                     $styleAttributes = $styleRegion->Style->attributes();
 
+                    $styleArray = [];
                     //    We still set the number format mask for date/time values, even if readDataOnly is true
-                    if ((!$this->readDataOnly) ||
-                        (Date::isDateTimeFormatCode((string) $styleAttributes['Format']))) {
-                        $styleArray = [];
-                        $styleArray['numberFormat']['formatCode'] = (string) $styleAttributes['Format'];
+                    $formatCode = (string) $styleAttributes['Format'];
+                    if (Date::isDateTimeFormatCode($formatCode)) {
+                        $styleArray['numberFormat']['formatCode'] = $formatCode;
+                    }
+                    if (!$this->readDataOnly) {
                         //    If readDataOnly is false, we set all formatting information
-                        if (!$this->readDataOnly) {
-                            switch ($styleAttributes['HAlign']) {
-                                case '1':
-                                    $styleArray['alignment']['horizontal'] = Alignment::HORIZONTAL_GENERAL;
+                        $styleArray['numberFormat']['formatCode'] = $formatCode;
 
-                                    break;
-                                case '2':
-                                    $styleArray['alignment']['horizontal'] = Alignment::HORIZONTAL_LEFT;
+                        self::addStyle2($styleArray, 'alignment', 'horizontal', $styleAttributes['HAlign']);
+                        self::addStyle2($styleArray, 'alignment', 'vertical', $styleAttributes['VAlign']);
+                        $styleArray['alignment']['wrapText'] = $styleAttributes['WrapText'] == '1';
+                        $styleArray['alignment']['textRotation'] = $this->calcRotation($styleAttributes);
+                        $styleArray['alignment']['shrinkToFit'] = $styleAttributes['ShrinkToFit'] == '1';
+                        $styleArray['alignment']['indent'] = ((int) ($styleAttributes['Indent']) > 0) ? $styleAttributes['indent'] : 0;
 
-                                    break;
-                                case '4':
-                                    $styleArray['alignment']['horizontal'] = Alignment::HORIZONTAL_RIGHT;
+                        $this->addColors($styleArray, $styleAttributes);
 
-                                    break;
-                                case '8':
-                                    $styleArray['alignment']['horizontal'] = Alignment::HORIZONTAL_CENTER;
+                        $fontAttributes = $styleRegion->Style->Font->attributes();
+                        $styleArray['font']['name'] = (string) $styleRegion->Style->Font;
+                        $styleArray['font']['size'] = (int) ($fontAttributes['Unit']);
+                        $styleArray['font']['bold'] = $fontAttributes['Bold'] == '1';
+                        $styleArray['font']['italic'] = $fontAttributes['Italic'] == '1';
+                        $styleArray['font']['strikethrough'] = $fontAttributes['StrikeThrough'] == '1';
+                        self::addStyle2($styleArray, 'font', 'underline', $fontAttributes['Underline']);
 
-                                    break;
-                                case '16':
-                                case '64':
-                                    $styleArray['alignment']['horizontal'] = Alignment::HORIZONTAL_CENTER_CONTINUOUS;
+                        switch ($fontAttributes['Script']) {
+                            case '1':
+                                $styleArray['font']['superscript'] = true;
 
-                                    break;
-                                case '32':
-                                    $styleArray['alignment']['horizontal'] = Alignment::HORIZONTAL_JUSTIFY;
+                                break;
+                            case '-1':
+                                $styleArray['font']['subscript'] = true;
 
-                                    break;
-                            }
-
-                            switch ($styleAttributes['VAlign']) {
-                                case '1':
-                                    $styleArray['alignment']['vertical'] = Alignment::VERTICAL_TOP;
-
-                                    break;
-                                case '2':
-                                    $styleArray['alignment']['vertical'] = Alignment::VERTICAL_BOTTOM;
-
-                                    break;
-                                case '4':
-                                    $styleArray['alignment']['vertical'] = Alignment::VERTICAL_CENTER;
-
-                                    break;
-                                case '8':
-                                    $styleArray['alignment']['vertical'] = Alignment::VERTICAL_JUSTIFY;
-
-                                    break;
-                            }
-
-                            $styleArray['alignment']['wrapText'] = $styleAttributes['WrapText'] == '1';
-                            $styleArray['alignment']['shrinkToFit'] = $styleAttributes['ShrinkToFit'] == '1';
-                            $styleArray['alignment']['indent'] = ((int) ($styleAttributes['Indent']) > 0) ? $styleAttributes['indent'] : 0;
-
-                            $RGB = self::parseGnumericColour($styleAttributes['Fore']);
-                            $styleArray['font']['color']['rgb'] = $RGB;
-                            $RGB = self::parseGnumericColour($styleAttributes['Back']);
-                            $shade = $styleAttributes['Shade'];
-                            if (($RGB != '000000') || ($shade != '0')) {
-                                $styleArray['fill']['color']['rgb'] = $styleArray['fill']['startColor']['rgb'] = $RGB;
-                                $RGB2 = self::parseGnumericColour($styleAttributes['PatternColor']);
-                                $styleArray['fill']['endColor']['rgb'] = $RGB2;
-                                switch ($shade) {
-                                    case '1':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_SOLID;
-
-                                        break;
-                                    case '2':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_GRADIENT_LINEAR;
-
-                                        break;
-                                    case '3':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_GRADIENT_PATH;
-
-                                        break;
-                                    case '4':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_DARKDOWN;
-
-                                        break;
-                                    case '5':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_DARKGRAY;
-
-                                        break;
-                                    case '6':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_DARKGRID;
-
-                                        break;
-                                    case '7':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_DARKHORIZONTAL;
-
-                                        break;
-                                    case '8':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_DARKTRELLIS;
-
-                                        break;
-                                    case '9':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_DARKUP;
-
-                                        break;
-                                    case '10':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_DARKVERTICAL;
-
-                                        break;
-                                    case '11':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_GRAY0625;
-
-                                        break;
-                                    case '12':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_GRAY125;
-
-                                        break;
-                                    case '13':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_LIGHTDOWN;
-
-                                        break;
-                                    case '14':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_LIGHTGRAY;
-
-                                        break;
-                                    case '15':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_LIGHTGRID;
-
-                                        break;
-                                    case '16':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_LIGHTHORIZONTAL;
-
-                                        break;
-                                    case '17':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_LIGHTTRELLIS;
-
-                                        break;
-                                    case '18':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_LIGHTUP;
-
-                                        break;
-                                    case '19':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_LIGHTVERTICAL;
-
-                                        break;
-                                    case '20':
-                                        $styleArray['fill']['fillType'] = Fill::FILL_PATTERN_MEDIUMGRAY;
-
-                                        break;
-                                }
-                            }
-
-                            $fontAttributes = $styleRegion->Style->Font->attributes();
-                            $styleArray['font']['name'] = (string) $styleRegion->Style->Font;
-                            $styleArray['font']['size'] = (int) ($fontAttributes['Unit']);
-                            $styleArray['font']['bold'] = $fontAttributes['Bold'] == '1';
-                            $styleArray['font']['italic'] = $fontAttributes['Italic'] == '1';
-                            $styleArray['font']['strikethrough'] = $fontAttributes['StrikeThrough'] == '1';
-                            switch ($fontAttributes['Underline']) {
-                                case '1':
-                                    $styleArray['font']['underline'] = Font::UNDERLINE_SINGLE;
-
-                                    break;
-                                case '2':
-                                    $styleArray['font']['underline'] = Font::UNDERLINE_DOUBLE;
-
-                                    break;
-                                case '3':
-                                    $styleArray['font']['underline'] = Font::UNDERLINE_SINGLEACCOUNTING;
-
-                                    break;
-                                case '4':
-                                    $styleArray['font']['underline'] = Font::UNDERLINE_DOUBLEACCOUNTING;
-
-                                    break;
-                                default:
-                                    $styleArray['font']['underline'] = Font::UNDERLINE_NONE;
-
-                                    break;
-                            }
-                            switch ($fontAttributes['Script']) {
-                                case '1':
-                                    $styleArray['font']['superscript'] = true;
-
-                                    break;
-                                case '-1':
-                                    $styleArray['font']['subscript'] = true;
-
-                                    break;
-                            }
-
-                            if (isset($styleRegion->Style->StyleBorder)) {
-                                if (isset($styleRegion->Style->StyleBorder->Top)) {
-                                    $styleArray['borders']['top'] = self::parseBorderAttributes($styleRegion->Style->StyleBorder->Top->attributes());
-                                }
-                                if (isset($styleRegion->Style->StyleBorder->Bottom)) {
-                                    $styleArray['borders']['bottom'] = self::parseBorderAttributes($styleRegion->Style->StyleBorder->Bottom->attributes());
-                                }
-                                if (isset($styleRegion->Style->StyleBorder->Left)) {
-                                    $styleArray['borders']['left'] = self::parseBorderAttributes($styleRegion->Style->StyleBorder->Left->attributes());
-                                }
-                                if (isset($styleRegion->Style->StyleBorder->Right)) {
-                                    $styleArray['borders']['right'] = self::parseBorderAttributes($styleRegion->Style->StyleBorder->Right->attributes());
-                                }
-                                if ((isset($styleRegion->Style->StyleBorder->Diagonal)) && (isset($styleRegion->Style->StyleBorder->{'Rev-Diagonal'}))) {
-                                    $styleArray['borders']['diagonal'] = self::parseBorderAttributes($styleRegion->Style->StyleBorder->Diagonal->attributes());
-                                    $styleArray['borders']['diagonalDirection'] = Borders::DIAGONAL_BOTH;
-                                } elseif (isset($styleRegion->Style->StyleBorder->Diagonal)) {
-                                    $styleArray['borders']['diagonal'] = self::parseBorderAttributes($styleRegion->Style->StyleBorder->Diagonal->attributes());
-                                    $styleArray['borders']['diagonalDirection'] = Borders::DIAGONAL_UP;
-                                } elseif (isset($styleRegion->Style->StyleBorder->{'Rev-Diagonal'})) {
-                                    $styleArray['borders']['diagonal'] = self::parseBorderAttributes($styleRegion->Style->StyleBorder->{'Rev-Diagonal'}->attributes());
-                                    $styleArray['borders']['diagonalDirection'] = Borders::DIAGONAL_DOWN;
-                                }
-                            }
-                            if (isset($styleRegion->Style->HyperLink)) {
-                                //    TO DO
-                                $hyperlink = $styleRegion->Style->HyperLink->attributes();
-                            }
+                                break;
                         }
-                        $spreadsheet->getActiveSheet()->getStyle($cellRange)->applyFromArray($styleArray);
-                    }
-                }
-            }
 
-            if ((!$this->readDataOnly) && (isset($sheet->Cols))) {
-                //    Column Widths
-                $columnAttributes = $sheet->Cols->attributes();
-                $defaultWidth = $columnAttributes['DefaultSizePts'] / 5.4;
-                $c = 0;
-                foreach ($sheet->Cols->ColInfo as $columnOverride) {
-                    $columnAttributes = $columnOverride->attributes();
-                    $column = $columnAttributes['No'];
-                    $columnWidth = $columnAttributes['Unit'] / 5.4;
-                    $hidden = (isset($columnAttributes['Hidden'])) && ($columnAttributes['Hidden'] == '1');
-                    $columnCount = (isset($columnAttributes['Count'])) ? $columnAttributes['Count'] : 1;
-                    while ($c < $column) {
-                        $spreadsheet->getActiveSheet()->getColumnDimension(Coordinate::stringFromColumnIndex($c + 1))->setWidth($defaultWidth);
-                        ++$c;
-                    }
-                    while (($c < ($column + $columnCount)) && ($c <= $maxCol)) {
-                        $spreadsheet->getActiveSheet()->getColumnDimension(Coordinate::stringFromColumnIndex($c + 1))->setWidth($columnWidth);
-                        if ($hidden) {
-                            $spreadsheet->getActiveSheet()->getColumnDimension(Coordinate::stringFromColumnIndex($c + 1))->setVisible(false);
+                        if (isset($styleRegion->Style->StyleBorder)) {
+                            $srssb = $styleRegion->Style->StyleBorder;
+                            $this->addBorderStyle($srssb, $styleArray, 'top');
+                            $this->addBorderStyle($srssb, $styleArray, 'bottom');
+                            $this->addBorderStyle($srssb, $styleArray, 'left');
+                            $this->addBorderStyle($srssb, $styleArray, 'right');
+                            $this->addBorderDiagonal($srssb, $styleArray);
                         }
-                        ++$c;
-                    }
-                }
-                while ($c <= $maxCol) {
-                    $spreadsheet->getActiveSheet()->getColumnDimension(Coordinate::stringFromColumnIndex($c + 1))->setWidth($defaultWidth);
-                    ++$c;
-                }
-            }
-
-            if ((!$this->readDataOnly) && (isset($sheet->Rows))) {
-                //    Row Heights
-                $rowAttributes = $sheet->Rows->attributes();
-                $defaultHeight = $rowAttributes['DefaultSizePts'];
-                $r = 0;
-
-                foreach ($sheet->Rows->RowInfo as $rowOverride) {
-                    $rowAttributes = $rowOverride->attributes();
-                    $row = $rowAttributes['No'];
-                    $rowHeight = $rowAttributes['Unit'];
-                    $hidden = (isset($rowAttributes['Hidden'])) && ($rowAttributes['Hidden'] == '1');
-                    $rowCount = (isset($rowAttributes['Count'])) ? $rowAttributes['Count'] : 1;
-                    while ($r < $row) {
-                        ++$r;
-                        $spreadsheet->getActiveSheet()->getRowDimension($r)->setRowHeight($defaultHeight);
-                    }
-                    while (($r < ($row + $rowCount)) && ($r < $maxRow)) {
-                        ++$r;
-                        $spreadsheet->getActiveSheet()->getRowDimension($r)->setRowHeight($rowHeight);
-                        if ($hidden) {
-                            $spreadsheet->getActiveSheet()->getRowDimension($r)->setVisible(false);
+                        if (isset($styleRegion->Style->HyperLink)) {
+                            //    TO DO
+                            $hyperlink = $styleRegion->Style->HyperLink->attributes();
                         }
                     }
-                }
-                while ($r < $maxRow) {
-                    ++$r;
-                    $spreadsheet->getActiveSheet()->getRowDimension($r)->setRowHeight($defaultHeight);
+                    $this->spreadsheet->getActiveSheet()->getStyle($cellRange)->applyFromArray($styleArray);
                 }
             }
 
-            //    Handle Merged Cells in this worksheet
-            if (isset($sheet->MergedRegions)) {
-                foreach ($sheet->MergedRegions->Merge as $mergeCells) {
-                    if (strpos($mergeCells, ':') !== false) {
-                        $spreadsheet->getActiveSheet()->mergeCells($mergeCells);
-                    }
-                }
-            }
+            $this->processColumnWidths($sheet, $maxCol);
+            $this->processRowHeights($sheet, $maxRow);
+            $this->processMergedCells($sheet);
 
             ++$worksheetID;
         }
 
+        $this->processDefinedNames($gnmXML);
+
+        // Return
+        return $this->spreadsheet;
+    }
+
+    private function addBorderDiagonal(SimpleXMLElement $srssb, array &$styleArray): void
+    {
+        if (isset($srssb->Diagonal, $srssb->{'Rev-Diagonal'})) {
+            $styleArray['borders']['diagonal'] = self::parseBorderAttributes($srssb->Diagonal->attributes());
+            $styleArray['borders']['diagonalDirection'] = Borders::DIAGONAL_BOTH;
+        } elseif (isset($srssb->Diagonal)) {
+            $styleArray['borders']['diagonal'] = self::parseBorderAttributes($srssb->Diagonal->attributes());
+            $styleArray['borders']['diagonalDirection'] = Borders::DIAGONAL_UP;
+        } elseif (isset($srssb->{'Rev-Diagonal'})) {
+            $styleArray['borders']['diagonal'] = self::parseBorderAttributes($srssb->{'Rev-Diagonal'}->attributes());
+            $styleArray['borders']['diagonalDirection'] = Borders::DIAGONAL_DOWN;
+        }
+    }
+
+    private function addBorderStyle(SimpleXMLElement $srssb, array &$styleArray, string $direction): void
+    {
+        $ucDirection = ucfirst($direction);
+        if (isset($srssb->$ucDirection)) {
+            $styleArray['borders'][$direction] = self::parseBorderAttributes($srssb->$ucDirection->attributes());
+        }
+    }
+
+    private function processMergedCells(SimpleXMLElement $sheet): void
+    {
+        //    Handle Merged Cells in this worksheet
+        if (isset($sheet->MergedRegions)) {
+            foreach ($sheet->MergedRegions->Merge as $mergeCells) {
+                if (strpos($mergeCells, ':') !== false) {
+                    $this->spreadsheet->getActiveSheet()->mergeCells($mergeCells);
+                }
+            }
+        }
+    }
+
+    private function processColumnLoop(int $c, int $maxCol, SimpleXMLElement $columnOverride, float $defaultWidth): int
+    {
+        $columnAttributes = $columnOverride->attributes();
+        $column = $columnAttributes['No'];
+        $columnWidth = ((float) $columnAttributes['Unit']) / 5.4;
+        $hidden = (isset($columnAttributes['Hidden'])) && ((string) $columnAttributes['Hidden'] == '1');
+        $columnCount = (isset($columnAttributes['Count'])) ? $columnAttributes['Count'] : 1;
+        while ($c < $column) {
+            $this->spreadsheet->getActiveSheet()->getColumnDimension(Coordinate::stringFromColumnIndex($c + 1))->setWidth($defaultWidth);
+            ++$c;
+        }
+        while (($c < ($column + $columnCount)) && ($c <= $maxCol)) {
+            $this->spreadsheet->getActiveSheet()->getColumnDimension(Coordinate::stringFromColumnIndex($c + 1))->setWidth($columnWidth);
+            if ($hidden) {
+                $this->spreadsheet->getActiveSheet()->getColumnDimension(Coordinate::stringFromColumnIndex($c + 1))->setVisible(false);
+            }
+            ++$c;
+        }
+
+        return $c;
+    }
+
+    private function processColumnWidths(SimpleXMLElement $sheet, int $maxCol): void
+    {
+        if ((!$this->readDataOnly) && (isset($sheet->Cols))) {
+            //    Column Widths
+            $columnAttributes = $sheet->Cols->attributes();
+            $defaultWidth = $columnAttributes['DefaultSizePts'] / 5.4;
+            $c = 0;
+            foreach ($sheet->Cols->ColInfo as $columnOverride) {
+                $c = $this->processColumnLoop($c, $maxCol, $columnOverride, $defaultWidth);
+            }
+            while ($c <= $maxCol) {
+                $this->spreadsheet->getActiveSheet()->getColumnDimension(Coordinate::stringFromColumnIndex($c + 1))->setWidth($defaultWidth);
+                ++$c;
+            }
+        }
+    }
+
+    private function processRowLoop(int $r, int $maxRow, SimpleXMLElement $rowOverride, float $defaultHeight): int
+    {
+        $rowAttributes = $rowOverride->attributes();
+        $row = $rowAttributes['No'];
+        $rowHeight = (float) $rowAttributes['Unit'];
+        $hidden = (isset($rowAttributes['Hidden'])) && ((string) $rowAttributes['Hidden'] == '1');
+        $rowCount = (isset($rowAttributes['Count'])) ? $rowAttributes['Count'] : 1;
+        while ($r < $row) {
+            ++$r;
+            $this->spreadsheet->getActiveSheet()->getRowDimension($r)->setRowHeight($defaultHeight);
+        }
+        while (($r < ($row + $rowCount)) && ($r < $maxRow)) {
+            ++$r;
+            $this->spreadsheet->getActiveSheet()->getRowDimension($r)->setRowHeight($rowHeight);
+            if ($hidden) {
+                $this->spreadsheet->getActiveSheet()->getRowDimension($r)->setVisible(false);
+            }
+        }
+
+        return $r;
+    }
+
+    private function processRowHeights(SimpleXMLElement $sheet, int $maxRow): void
+    {
+        if ((!$this->readDataOnly) && (isset($sheet->Rows))) {
+            //    Row Heights
+            $rowAttributes = $sheet->Rows->attributes();
+            $defaultHeight = (float) $rowAttributes['DefaultSizePts'];
+            $r = 0;
+
+            foreach ($sheet->Rows->RowInfo as $rowOverride) {
+                $r = $this->processRowLoop($r, $maxRow, $rowOverride, $defaultHeight);
+            }
+            // never executed, I can't figure out any circumstances
+            // under which it would be executed, and, even if
+            // such exist, I'm not convinced this is needed.
+            //while ($r < $maxRow) {
+            //    ++$r;
+            //    $this->spreadsheet->getActiveSheet()->getRowDimension($r)->setRowHeight($defaultHeight);
+            //}
+        }
+    }
+
+    private function processDefinedNames(SimpleXMLElement $gnmXML): void
+    {
         //    Loop through definedNames (global named ranges)
         if (isset($gnmXML->Names)) {
             foreach ($gnmXML->Names->Name as $namedRange) {
@@ -782,15 +783,37 @@ class Gnumeric extends BaseReader
 
                 $range = Worksheet::extractSheetTitle($range, true);
                 $range[0] = trim($range[0], "'");
-                if ($worksheet = $spreadsheet->getSheetByName($range[0])) {
+                if ($worksheet = $this->spreadsheet->getSheetByName($range[0])) {
                     $extractedRange = str_replace('$', '', $range[1]);
-                    $spreadsheet->addNamedRange(new NamedRange($name, $worksheet, $extractedRange));
+                    $this->spreadsheet->addNamedRange(new NamedRange($name, $worksheet, $extractedRange));
                 }
             }
         }
+    }
 
-        // Return
-        return $spreadsheet;
+    private function calcRotation(SimpleXMLElement $styleAttributes): int
+    {
+        $rotation = (int) $styleAttributes->Rotation;
+        if ($rotation >= 270 && $rotation <= 360) {
+            $rotation -= 360;
+        }
+        $rotation = (abs($rotation) > 90) ? 0 : $rotation;
+
+        return $rotation;
+    }
+
+    private static function addStyle(array &$styleArray, string $key, string $value): void
+    {
+        if (array_key_exists($value, self::$mappings[$key])) {
+            $styleArray[$key] = self::$mappings[$key][$value];
+        }
+    }
+
+    private static function addStyle2(array &$styleArray, string $key1, string $key, string $value): void
+    {
+        if (array_key_exists($value, self::$mappings[$key])) {
+            $styleArray[$key1][$key] = self::$mappings[$key][$value];
+        }
     }
 
     private static function parseBorderAttributes($borderAttributes)
@@ -800,64 +823,7 @@ class Gnumeric extends BaseReader
             $styleArray['color']['rgb'] = self::parseGnumericColour($borderAttributes['Color']);
         }
 
-        switch ($borderAttributes['Style']) {
-            case '0':
-                $styleArray['borderStyle'] = Border::BORDER_NONE;
-
-                break;
-            case '1':
-                $styleArray['borderStyle'] = Border::BORDER_THIN;
-
-                break;
-            case '2':
-                $styleArray['borderStyle'] = Border::BORDER_MEDIUM;
-
-                break;
-            case '3':
-                $styleArray['borderStyle'] = Border::BORDER_SLANTDASHDOT;
-
-                break;
-            case '4':
-                $styleArray['borderStyle'] = Border::BORDER_DASHED;
-
-                break;
-            case '5':
-                $styleArray['borderStyle'] = Border::BORDER_THICK;
-
-                break;
-            case '6':
-                $styleArray['borderStyle'] = Border::BORDER_DOUBLE;
-
-                break;
-            case '7':
-                $styleArray['borderStyle'] = Border::BORDER_DOTTED;
-
-                break;
-            case '8':
-                $styleArray['borderStyle'] = Border::BORDER_MEDIUMDASHED;
-
-                break;
-            case '9':
-                $styleArray['borderStyle'] = Border::BORDER_DASHDOT;
-
-                break;
-            case '10':
-                $styleArray['borderStyle'] = Border::BORDER_MEDIUMDASHDOT;
-
-                break;
-            case '11':
-                $styleArray['borderStyle'] = Border::BORDER_DASHDOTDOT;
-
-                break;
-            case '12':
-                $styleArray['borderStyle'] = Border::BORDER_MEDIUMDASHDOTDOT;
-
-                break;
-            case '13':
-                $styleArray['borderStyle'] = Border::BORDER_MEDIUMDASHDOTDOT;
-
-                break;
-        }
+        self::addStyle($styleArray, 'borderStyle', $borderAttributes['Style']);
 
         return $styleArray;
     }
@@ -879,4 +845,23 @@ class Gnumeric extends BaseReader
 
         return $gnmR . $gnmG . $gnmB;
     }
+
+    private function addColors(array &$styleArray, SimpleXMLElement $styleAttributes): void
+    {
+        $RGB = self::parseGnumericColour($styleAttributes['Fore']);
+        $styleArray['font']['color']['rgb'] = $RGB;
+        $RGB = self::parseGnumericColour($styleAttributes['Back']);
+        $shade = (string) $styleAttributes['Shade'];
+        if (($RGB != '000000') || ($shade != '0')) {
+            $RGB2 = self::parseGnumericColour($styleAttributes['PatternColor']);
+            if ($shade == '1') {
+                $styleArray['fill']['startColor']['rgb'] = $RGB;
+                $styleArray['fill']['endColor']['rgb'] = $RGB2;
+            } else {
+                $styleArray['fill']['endColor']['rgb'] = $RGB;
+                $styleArray['fill']['startColor']['rgb'] = $RGB2;
+            }
+            self::addStyle2($styleArray, 'fill', 'fillType', $shade);
+        }
+    }
 }
diff --git a/tests/PhpSpreadsheetTests/IOFactoryTest.php b/tests/PhpSpreadsheetTests/IOFactoryTest.php
index 983ba35e..906375bd 100644
--- a/tests/PhpSpreadsheetTests/IOFactoryTest.php
+++ b/tests/PhpSpreadsheetTests/IOFactoryTest.php
@@ -123,6 +123,7 @@ class IOFactoryTest extends TestCase
         return [
             ['samples/templates/26template.xlsx', 'Xlsx', Reader\Xlsx::class],
             ['samples/templates/GnumericTest.gnumeric', 'Gnumeric', Reader\Gnumeric::class],
+            ['samples/templates/old.gnumeric', 'Gnumeric', Reader\Gnumeric::class],
             ['samples/templates/30template.xls', 'Xls', Reader\Xls::class],
             ['samples/templates/OOCalcTest.ods', 'Ods', Reader\Ods::class],
             ['samples/templates/SylkTest.slk', 'Slk', Reader\Slk::class],
diff --git a/tests/PhpSpreadsheetTests/Reader/Gnumeric/GnumericFilter.php b/tests/PhpSpreadsheetTests/Reader/Gnumeric/GnumericFilter.php
new file mode 100644
index 00000000..0904e2d4
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Reader/Gnumeric/GnumericFilter.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Gnumeric;
+
+use PhpOffice\PhpSpreadsheet\Reader\IReadFilter;
+
+/**  Define a Read Filter class implementing IReadFilter  */
+class GnumericFilter implements IReadFilter
+{
+    public function readCell($column, $row, $worksheetName = '')
+    {
+        return $row !== 4;
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Reader/Gnumeric/GnumericInfoTest.php b/tests/PhpSpreadsheetTests/Reader/Gnumeric/GnumericInfoTest.php
new file mode 100644
index 00000000..9ec16128
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Reader/Gnumeric/GnumericInfoTest.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Gnumeric;
+
+use PhpOffice\PhpSpreadsheet\Reader\Gnumeric;
+use PHPUnit\Framework\TestCase;
+
+class GnumericInfoTest extends TestCase
+{
+    public function testListNames(): void
+    {
+        $filename = __DIR__
+            . '/../../../..'
+            . '/samples/templates/GnumericTest.gnumeric';
+        $reader = new Gnumeric();
+        $names = $reader->listWorksheetNames($filename);
+        self::assertCount(2, $names);
+        self::assertEquals('Sample Data', $names[0]);
+        self::assertEquals('Report Data', $names[1]);
+    }
+
+    public function testListInfo(): void
+    {
+        $filename = __DIR__
+            . '/../../../..'
+            . '/samples/templates/GnumericTest.gnumeric';
+        $reader = new Gnumeric();
+        $info = $reader->listWorksheetInfo($filename);
+        $expected = [
+            [
+                'worksheetName' => 'Sample Data',
+                'lastColumnLetter' => 'N',
+                'lastColumnIndex' => 13,
+                'totalRows' => 31,
+                'totalColumns' => 14,
+            ],
+            [
+                'worksheetName' => 'Report Data',
+                'lastColumnLetter' => 'K',
+                'lastColumnIndex' => 10,
+                'totalRows' => 65535,
+                'totalColumns' => 11,
+            ],
+        ];
+        self::assertEquals($expected, $info);
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Reader/Gnumeric/GnumericLoadTest.php b/tests/PhpSpreadsheetTests/Reader/Gnumeric/GnumericLoadTest.php
new file mode 100644
index 00000000..e24178e5
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Reader/Gnumeric/GnumericLoadTest.php
@@ -0,0 +1,162 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Gnumeric;
+
+use PhpOffice\PhpSpreadsheet\Reader\Gnumeric;
+use PhpOffice\PhpSpreadsheet\Style\Border;
+use PhpOffice\PhpSpreadsheet\Style\Borders;
+use PhpOffice\PhpSpreadsheet\Style\Color;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+use PhpOffice\PhpSpreadsheet\Style\Font;
+use PHPUnit\Framework\TestCase;
+
+class GnumericLoadTest extends TestCase
+{
+    public function testLoad(): void
+    {
+        $filename = __DIR__
+            . '/../../../..'
+            . '/samples/templates/GnumericTest.gnumeric';
+        $reader = new Gnumeric();
+        $spreadsheet = $reader->load($filename);
+        self::assertEquals(2, $spreadsheet->getSheetCount());
+
+        $sheet = $spreadsheet->getSheet(1);
+        self::assertEquals('Report Data', $sheet->getTitle());
+        self::assertEquals('BCD', $sheet->getCell('A4')->getValue());
+        $props = $spreadsheet->getProperties();
+        self::assertEquals('Mark Baker', $props->getCreator());
+
+        $sheet = $spreadsheet->getSheet(0);
+        self::assertEquals('Sample Data', $sheet->getTitle());
+        self::assertEquals('Test String 1', $sheet->getCell('A1')->getValue());
+        self::assertEquals('FFFF0000', $sheet->getCell('A1')->getStyle()->getFont()->getColor()->getARGB());
+        self::assertEquals(Font::UNDERLINE_SINGLE, $sheet->getCell('A3')->getStyle()->getFont()->getUnderline());
+        self::assertEquals('Test with (") in string', $sheet->getCell('A4')->getValue());
+
+        self::assertEquals(22269, $sheet->getCell('A10')->getValue());
+        self::assertEquals('dd/mm/yyyy', $sheet->getCell('A10')->getStyle()->getNumberFormat()->getFormatCode());
+        self::assertEquals('19/12/1960', $sheet->getCell('A10')->getFormattedValue());
+        self::assertEquals(1.5, $sheet->getCell('A11')->getValue());
+        self::assertEquals('# ?0/??0', $sheet->getCell('A11')->getStyle()->getNumberFormat()->getFormatCode());
+        // Same pattern, same value, different display in Gnumeric vs Excel
+        //self::assertEquals('1 1/2', $sheet->getCell('A11')->getFormattedValue());
+
+        self::assertEquals('=B1+C1', $sheet->getCell('H1')->getValue());
+        self::assertEquals('=E2&F2', $sheet->getCell('J2')->getValue());
+        self::assertEquals('=sum(C1:C4)', $sheet->getCell('I5')->getValue());
+
+        self::assertTrue($sheet->getCell('E1')->getStyle()->getFont()->getBold());
+        self::assertTrue($sheet->getCell('E1')->getStyle()->getFont()->getItalic());
+
+        self::assertFalse($sheet->getCell('E2')->getStyle()->getFont()->getBold());
+        self::assertFalse($sheet->getCell('E2')->getStyle()->getFont()->getItalic());
+        self::assertEquals(Font::UNDERLINE_NONE, $sheet->getCell('E2')->getStyle()->getFont()->getUnderline());
+        self::assertTrue($sheet->getCell('E3')->getStyle()->getFont()->getBold());
+        self::assertFalse($sheet->getCell('E3')->getStyle()->getFont()->getItalic());
+        self::assertEquals(Font::UNDERLINE_NONE, $sheet->getCell('E3')->getStyle()->getFont()->getUnderline());
+        self::assertFalse($sheet->getCell('E4')->getStyle()->getFont()->getBold());
+        self::assertTrue($sheet->getCell('E4')->getStyle()->getFont()->getItalic());
+        self::assertEquals(Font::UNDERLINE_NONE, $sheet->getCell('E4')->getStyle()->getFont()->getUnderline());
+
+        self::assertTrue($sheet->getCell('F1')->getStyle()->getFont()->getBold());
+        self::assertFalse($sheet->getCell('F1')->getStyle()->getFont()->getItalic());
+        self::assertEquals(Font::UNDERLINE_NONE, $sheet->getCell('F1')->getStyle()->getFont()->getUnderline());
+        self::assertFalse($sheet->getCell('F2')->getStyle()->getFont()->getBold());
+        self::assertFalse($sheet->getCell('F2')->getStyle()->getFont()->getItalic());
+        self::assertEquals(Font::UNDERLINE_NONE, $sheet->getCell('F2')->getStyle()->getFont()->getUnderline());
+        self::assertTrue($sheet->getCell('F3')->getStyle()->getFont()->getBold());
+        self::assertTrue($sheet->getCell('F3')->getStyle()->getFont()->getItalic());
+        self::assertEquals(Font::UNDERLINE_NONE, $sheet->getCell('F3')->getStyle()->getFont()->getUnderline());
+        self::assertFalse($sheet->getCell('F4')->getStyle()->getFont()->getBold());
+        self::assertFalse($sheet->getCell('F4')->getStyle()->getFont()->getItalic());
+        self::assertEquals(Font::UNDERLINE_NONE, $sheet->getCell('F4')->getStyle()->getFont()->getUnderline());
+
+        self::assertEquals(Border::BORDER_MEDIUM, $sheet->getCell('C10')->getStyle()->getBorders()->getTop()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C10')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C10')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C10')->getStyle()->getBorders()->getLeft()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C12')->getStyle()->getBorders()->getTop()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C12')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertEquals(Border::BORDER_MEDIUM, $sheet->getCell('C12')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C12')->getStyle()->getBorders()->getLeft()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C14')->getStyle()->getBorders()->getTop()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C14')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C14')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+        self::assertEquals(Border::BORDER_MEDIUM, $sheet->getCell('C14')->getStyle()->getBorders()->getLeft()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C16')->getStyle()->getBorders()->getTop()->getBorderStyle());
+        self::assertEquals(Border::BORDER_MEDIUM, $sheet->getCell('C16')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C16')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C16')->getStyle()->getBorders()->getLeft()->getBorderStyle());
+        self::assertEquals(Border::BORDER_THICK, $sheet->getCell('C18')->getStyle()->getBorders()->getTop()->getBorderStyle());
+        self::assertEquals(Color::COLOR_RED, $sheet->getCell('C18')->getStyle()->getBorders()->getTop()->getColor()->getARGB());
+        self::assertEquals(Border::BORDER_THICK, $sheet->getCell('C18')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertEquals(Color::COLOR_YELLOW, $sheet->getCell('C18')->getStyle()->getBorders()->getRight()->getColor()->getARGB());
+        self::assertEquals(Border::BORDER_THICK, $sheet->getCell('C18')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C18')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C18')->getStyle()->getBorders()->getLeft()->getBorderStyle());
+
+        self::assertEquals(Fill::FILL_PATTERN_DARKHORIZONTAL, $sheet->getCell('K19')->getStyle()->getFill()->getFillType());
+        self::assertEquals('FF00CCFF', $sheet->getCell('K19')->getStyle()->getFill()->getEndColor()->getARGB());
+        self::assertEquals(Color::COLOR_BLUE, $sheet->getCell('K19')->getStyle()->getFill()->getStartColor()->getARGB());
+        self::assertEquals(Fill::FILL_PATTERN_GRAY0625, $sheet->getCell('L19')->getStyle()->getFill()->getFillType());
+        self::assertEquals(Color::COLOR_RED, $sheet->getCell('L19')->getStyle()->getFill()->getEndColor()->getARGB());
+        self::assertEquals(Color::COLOR_YELLOW, $sheet->getCell('L19')->getStyle()->getFill()->getStartColor()->getARGB());
+        self::assertEquals(Fill::FILL_SOLID, $sheet->getCell('K3')->getStyle()->getFill()->getFillType());
+        self::assertEquals(Color::COLOR_RED, $sheet->getCell('K3')->getStyle()->getFill()->getStartColor()->getARGB());
+
+        self::assertEquals(45, $sheet->getCell('E22')->getStyle()->getAlignment()->getTextRotation());
+        self::assertEquals(-90, $sheet->getCell('G22')->getStyle()->getAlignment()->getTextRotation());
+        self::assertEquals(Border::BORDER_DOUBLE, $sheet->getCell('N13')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+
+        self::assertEquals(Borders::DIAGONAL_BOTH, $sheet->getCell('E18')->getStyle()->getBorders()->getDiagonalDirection());
+        self::assertEquals(Borders::DIAGONAL_DOWN, $sheet->getCell('I18')->getStyle()->getBorders()->getDiagonalDirection());
+        self::assertEquals(Borders::DIAGONAL_UP, $sheet->getCell('J18')->getStyle()->getBorders()->getDiagonalDirection());
+        self::assertEquals(Font::UNDERLINE_DOUBLE, $sheet->getCell('A24')->getStyle()->getFont()->getUnderline());
+        self::assertTrue($sheet->getCell('B23')->getStyle()->getFont()->getSubScript());
+        self::assertTrue($sheet->getCell('B24')->getStyle()->getFont()->getSuperScript());
+        self::assertFalse($sheet->getRowDimension(30)->getVisible());
+    }
+
+    public function testLoadFilter(): void
+    {
+        $filename = __DIR__
+            . '/../../../..'
+            . '/samples/templates/GnumericTest.gnumeric';
+        $reader = new Gnumeric();
+        $filter = new GnumericFilter();
+        $reader->setReadFilter($filter);
+        $spreadsheet = $reader->load($filename);
+        self::assertEquals(2, $spreadsheet->getSheetCount());
+        $sheet = $spreadsheet->getSheet(1);
+        self::assertEquals('Report Data', $sheet->getTitle());
+        self::assertEquals('', $sheet->getCell('A4')->getValue());
+        $props = $spreadsheet->getProperties();
+        self::assertEquals('Mark Baker', $props->getCreator());
+    }
+
+    public function testLoadOld(): void
+    {
+        $filename = __DIR__
+            . '/../../../..'
+            . '/samples/templates/old.gnumeric';
+        $reader = new Gnumeric();
+        $spreadsheet = $reader->load($filename);
+        $props = $spreadsheet->getProperties();
+        self::assertEquals('David Gilbert', $props->getCreator());
+    }
+
+    public function testLoadSelectedSheets(): void
+    {
+        $filename = __DIR__
+            . '/../../../..'
+            . '/samples/templates/GnumericTest.gnumeric';
+        $reader = new Gnumeric();
+        $reader->setLoadSheetsOnly(['Unknown Sheet', 'Report Data']);
+        $spreadsheet = $reader->load($filename);
+        self::assertEquals(1, $spreadsheet->getSheetCount());
+        $sheet = $spreadsheet->getSheet(0);
+        self::assertEquals('Report Data', $sheet->getTitle());
+        self::assertEquals('Third Heading', $sheet->getCell('C2')->getValue());
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Reader/Gnumeric/GnumericStylesTest.php b/tests/PhpSpreadsheetTests/Reader/Gnumeric/GnumericStylesTest.php
new file mode 100644
index 00000000..fd8d7800
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Reader/Gnumeric/GnumericStylesTest.php
@@ -0,0 +1,269 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Gnumeric;
+
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\Reader\Gnumeric;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PhpOffice\PhpSpreadsheet\Style\Border;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+use PhpOffice\PhpSpreadsheet\Style\Font;
+use PHPUnit\Framework\TestCase;
+
+class GnumericStylesTest extends TestCase
+{
+    /**
+     * @dataProvider providerBorderStyle
+     */
+    public function testBorderStyle(string $style, string $expectedResult): void
+    {
+        $styles = Gnumeric::gnumericMappings();
+        $borders = $styles['borderStyle'];
+        self::assertEquals($expectedResult, $borders[$style]);
+    }
+
+    public function testBorderStyleCoverage(): void
+    {
+        $styles = Gnumeric::gnumericMappings();
+        $expected = $styles['borderStyle'];
+        $covered = [];
+        foreach ($expected as $key => $val) {
+            $covered[$key] = 0;
+        }
+        $tests = $this->providerBorderStyle();
+        foreach ($tests as $test) {
+            $covered[$test[0]] = 1;
+        }
+        foreach ($covered as $key => $val) {
+            self::assertEquals(1, $val, "Borderstyle $key not tested");
+        }
+    }
+
+    /**
+     * @dataProvider providerfillType
+     */
+    public function testFillType(string $style, string $expectedResult): void
+    {
+        $styles = Gnumeric::gnumericMappings();
+        $borders = $styles['fillType'];
+        self::assertEquals($expectedResult, $borders[$style]);
+    }
+
+    public function testFillTypeCoverage(): void
+    {
+        $styles = Gnumeric::gnumericMappings();
+        $expected = $styles['fillType'];
+        $covered = [];
+        foreach ($expected as $key => $val) {
+            $covered[$key] = 0;
+        }
+        $tests = $this->providerfillType();
+        foreach ($tests as $test) {
+            $covered[$test[0]] = 1;
+        }
+        foreach ($covered as $key => $val) {
+            self::assertEquals(1, $val, "fillType $key not tested");
+        }
+    }
+
+    /**
+     * @dataProvider providerHorizontal
+     */
+    public function testHorizontal(string $style, string $expectedResult): void
+    {
+        $styles = Gnumeric::gnumericMappings();
+        $borders = $styles['horizontal'];
+        self::assertEquals($expectedResult, $borders[$style]);
+    }
+
+    public function testHorizontalCoverage(): void
+    {
+        $styles = Gnumeric::gnumericMappings();
+        $expected = $styles['horizontal'];
+        $covered = [];
+        foreach ($expected as $key => $val) {
+            $covered[$key] = 0;
+        }
+        $tests = $this->providerHorizontal();
+        foreach ($tests as $test) {
+            $covered[$test[0]] = 1;
+        }
+        foreach ($covered as $key => $val) {
+            self::assertEquals(1, $val, "horizontal $key not tested");
+        }
+    }
+
+    /**
+     * @dataProvider providerunderline
+     */
+    public function testUnderline(string $style, string $expectedResult): void
+    {
+        $styles = Gnumeric::gnumericMappings();
+        $borders = $styles['underline'];
+        self::assertEquals($expectedResult, $borders[$style]);
+    }
+
+    public function testUnderlineCoverage(): void
+    {
+        $styles = Gnumeric::gnumericMappings();
+        $expected = $styles['underline'];
+        $covered = [];
+        foreach ($expected as $key => $val) {
+            $covered[$key] = 0;
+        }
+        $tests = $this->providerUnderline();
+        foreach ($tests as $test) {
+            $covered[$test[0]] = 1;
+        }
+        foreach ($covered as $key => $val) {
+            self::assertEquals(1, $val, "underline $key not tested");
+        }
+    }
+
+    /**
+     * @dataProvider providerVertical
+     */
+    public function testVertical(string $style, string $expectedResult): void
+    {
+        $styles = Gnumeric::gnumericMappings();
+        $borders = $styles['vertical'];
+        self::assertEquals($expectedResult, $borders[$style]);
+    }
+
+    public function testVerticalCoverage(): void
+    {
+        $styles = Gnumeric::gnumericMappings();
+        $expected = $styles['vertical'];
+        $covered = [];
+        foreach ($expected as $key => $val) {
+            $covered[$key] = 0;
+        }
+        $tests = $this->providerVertical();
+        foreach ($tests as $test) {
+            $covered[$test[0]] = 1;
+        }
+        foreach ($covered as $key => $val) {
+            self::assertEquals(1, $val, "vertical $key not tested");
+        }
+    }
+
+    /**
+     * @dataProvider providerDataType
+     */
+    public function testDataType(string $style, string $expectedResult): void
+    {
+        $styles = Gnumeric::gnumericMappings();
+        $borders = $styles['dataType'];
+        self::assertEquals($expectedResult, $borders[$style]);
+    }
+
+    public function testDataTypeCoverage(): void
+    {
+        $styles = Gnumeric::gnumericMappings();
+        $expected = $styles['dataType'];
+        self::assertArrayNotHasKey('70', $expected);
+        self::assertArrayNotHasKey('80', $expected);
+        $covered = [];
+        foreach ($expected as $key => $val) {
+            $covered[$key] = 0;
+        }
+        $tests = $this->providerDataType();
+        foreach ($tests as $test) {
+            $covered[$test[0]] = 1;
+        }
+        foreach ($covered as $key => $val) {
+            self::assertEquals(1, $val, "dataType $key not tested");
+        }
+    }
+
+    public function providerBorderStyle(): array
+    {
+        return [
+            ['0', Border::BORDER_NONE],
+            ['1', Border::BORDER_THIN],
+            ['2', Border::BORDER_MEDIUM],
+            ['3', Border::BORDER_SLANTDASHDOT],
+            ['4', Border::BORDER_DASHED],
+            ['5', Border::BORDER_THICK],
+            ['6', Border::BORDER_DOUBLE],
+            ['7', Border::BORDER_DOTTED],
+            ['8', Border::BORDER_MEDIUMDASHED],
+            ['9', Border::BORDER_DASHDOT],
+            ['10', Border::BORDER_MEDIUMDASHDOT],
+            ['11', Border::BORDER_DASHDOTDOT],
+            ['12', Border::BORDER_MEDIUMDASHDOTDOT],
+            ['13', Border::BORDER_MEDIUMDASHDOTDOT],
+        ];
+    }
+
+    public function providerFillType(): array
+    {
+        return [
+            ['1', Fill::FILL_SOLID],
+            ['2', Fill::FILL_PATTERN_DARKGRAY],
+            ['3', Fill::FILL_PATTERN_MEDIUMGRAY],
+            ['4', Fill::FILL_PATTERN_LIGHTGRAY],
+            ['5', Fill::FILL_PATTERN_GRAY125],
+            ['6', Fill::FILL_PATTERN_GRAY0625],
+            ['7', Fill::FILL_PATTERN_DARKHORIZONTAL],
+            ['8', Fill::FILL_PATTERN_DARKVERTICAL],
+            ['9', Fill::FILL_PATTERN_DARKDOWN],
+            ['10', Fill::FILL_PATTERN_DARKUP],
+            ['11', Fill::FILL_PATTERN_DARKGRID],
+            ['12', Fill::FILL_PATTERN_DARKTRELLIS],
+            ['13', Fill::FILL_PATTERN_LIGHTHORIZONTAL],
+            ['14', Fill::FILL_PATTERN_LIGHTVERTICAL],
+            ['15', Fill::FILL_PATTERN_LIGHTUP],
+            ['16', Fill::FILL_PATTERN_LIGHTDOWN],
+            ['17', Fill::FILL_PATTERN_LIGHTGRID],
+            ['18', Fill::FILL_PATTERN_LIGHTTRELLIS],
+        ];
+    }
+
+    public function providerHorizontal(): array
+    {
+        return [
+            ['1', Alignment::HORIZONTAL_GENERAL],
+            ['2', Alignment::HORIZONTAL_LEFT],
+            ['4', Alignment::HORIZONTAL_RIGHT],
+            ['8', Alignment::HORIZONTAL_CENTER],
+            ['16', Alignment::HORIZONTAL_CENTER_CONTINUOUS],
+            ['32', Alignment::HORIZONTAL_JUSTIFY],
+            ['64', Alignment::HORIZONTAL_CENTER_CONTINUOUS],
+        ];
+    }
+
+    public function providerUnderline(): array
+    {
+        return [
+            ['1', Font::UNDERLINE_SINGLE],
+            ['2', Font::UNDERLINE_DOUBLE],
+            ['3', Font::UNDERLINE_SINGLEACCOUNTING],
+            ['4', Font::UNDERLINE_DOUBLEACCOUNTING],
+        ];
+    }
+
+    public function providerVertical(): array
+    {
+        return [
+            ['1', Alignment::VERTICAL_TOP],
+            ['2', Alignment::VERTICAL_BOTTOM],
+            ['4', Alignment::VERTICAL_CENTER],
+            ['8', Alignment::VERTICAL_JUSTIFY],
+        ];
+    }
+
+    public function providerDataType(): array
+    {
+        return [
+            ['10', DataType::TYPE_NULL],
+            ['20', DataType::TYPE_BOOL],
+            ['30', DataType::TYPE_NUMERIC], // Integer doesn't exist in Excel
+            ['40', DataType::TYPE_NUMERIC], // Float
+            ['50', DataType::TYPE_ERROR],
+            ['60', DataType::TYPE_STRING],
+            //'70':        //    Cell Range
+            //'80':        //    Array
+        ];
+    }
+}

From 262896086a9e60e2cb99cd15e13d1cf94a2ba025 Mon Sep 17 00:00:00 2001
From: oleibman <eclipsechasers2@yahoo.com>
Date: Fri, 19 Jun 2020 11:35:44 -0700
Subject: [PATCH 028/153] Improve Coverage for Sylk (#1514)

* Improve Coverage for Sylk

I believe that both BaseReader and Sylk Reader are now 100% covered.

Documentation available for this format is sparse.
It was always incomplete, and in some cases inaccurate.
My goal was to use PhpSpreadsheet to load the test file,
save it as Xlsx, and visually compare the two, then add a test
loaded with assertions. Cell values and calculated values,
and border styles were generally handled pretty well without changes.
Other types of styling were not handled so well. I added a few cells
to exercise some previously uncovered code.

Sylk files must be ASCII. I have deprecated the use of the
setEncoding and getEncoding functions, which had no test cases.
---
 samples/templates/SylkTest.slk               |   3 +-
 src/PhpSpreadsheet/Reader/Slk.php            | 605 +++++++++++--------
 tests/PhpSpreadsheetTests/Reader/CsvTest.php |   4 +
 tests/PhpSpreadsheetTests/Reader/SlkTest.php | 134 ++++
 4 files changed, 493 insertions(+), 253 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Reader/SlkTest.php

diff --git a/samples/templates/SylkTest.slk b/samples/templates/SylkTest.slk
index d5dd5bbe..95770d04 100644
--- a/samples/templates/SylkTest.slk
+++ b/samples/templates/SylkTest.slk
@@ -52,7 +52,7 @@ P;EArial;M200
 P;EArial;M200;SI
 P;EArial;M200;SBI
 P;EArial;M200;SBU
-P;EArial;M200;SBIU
+P;EArial;M220;SBIU
 P;EArial;M200
 P;EArial;M200;SI
 F;P0;DG0G8;M255
@@ -115,6 +115,7 @@ F;P19;FG0G;X4
 C;Y7;X2;K2.34
 C;X3;KFALSE
 C;Y8;X2;K3.45
+C;Y9;X2;K2.34;EMEDIAN(R[-3]C:R[-1]C)
 F;Y9;X1
 F;X2
 F;X3
diff --git a/src/PhpSpreadsheet/Reader/Slk.php b/src/PhpSpreadsheet/Reader/Slk.php
index f40eba74..0e147376 100644
--- a/src/PhpSpreadsheet/Reader/Slk.php
+++ b/src/PhpSpreadsheet/Reader/Slk.php
@@ -2,8 +2,10 @@
 
 namespace PhpOffice\PhpSpreadsheet\Reader;
 
+use InvalidArgumentException;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\Reader\Exception as ReaderException;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Style\Border;
@@ -38,6 +40,20 @@ class Slk extends BaseReader
      */
     private $format = 0;
 
+    /**
+     * Fonts.
+     *
+     * @var array
+     */
+    private $fonts = [];
+
+    /**
+     * Font Count.
+     *
+     * @var int
+     */
+    private $fontcount = 0;
+
     /**
      * Create a new SYLK Reader instance.
      */
@@ -55,10 +71,9 @@ class Slk extends BaseReader
      */
     public function canRead($pFilename)
     {
-        // Check if file exists
         try {
             $this->openFile($pFilename);
-        } catch (Exception $e) {
+        } catch (InvalidArgumentException $e) {
             return false;
         }
 
@@ -78,12 +93,24 @@ class Slk extends BaseReader
         return $hasDelimiter && $hasId;
     }
 
+    private function canReadOrBust(string $pFilename): void
+    {
+        if (!$this->canRead($pFilename)) {
+            throw new ReaderException($pFilename . ' is an Invalid SYLK file.');
+        }
+        $this->openFile($pFilename);
+    }
+
     /**
      * Set input encoding.
      *
+     * @deprecated no use is made of this property
+     *
      * @param string $pValue Input encoding, eg: 'ANSI'
      *
      * @return $this
+     *
+     * @codeCoverageIgnore
      */
     public function setInputEncoding($pValue)
     {
@@ -95,7 +122,11 @@ class Slk extends BaseReader
     /**
      * Get input encoding.
      *
+     * @deprecated no use is made of this property
+     *
      * @return string
+     *
+     * @codeCoverageIgnore
      */
     public function getInputEncoding()
     {
@@ -112,22 +143,16 @@ class Slk extends BaseReader
     public function listWorksheetInfo($pFilename)
     {
         // Open file
-        if (!$this->canRead($pFilename)) {
-            throw new Exception($pFilename . ' is an Invalid Spreadsheet file.');
-        }
-        $this->openFile($pFilename);
+        $this->canReadOrBust($pFilename);
         $fileHandle = $this->fileHandle;
         rewind($fileHandle);
 
         $worksheetInfo = [];
-        $worksheetInfo[0]['worksheetName'] = 'Worksheet';
-        $worksheetInfo[0]['lastColumnLetter'] = 'A';
-        $worksheetInfo[0]['lastColumnIndex'] = 0;
-        $worksheetInfo[0]['totalRows'] = 0;
-        $worksheetInfo[0]['totalColumns'] = 0;
+        $worksheetInfo[0]['worksheetName'] = basename($pFilename, '.slk');
 
         // loop through one row (line) at a time in the file
         $rowIndex = 0;
+        $columnIndex = 0;
         while (($rowData = fgets($fileHandle)) !== false) {
             $columnIndex = 0;
 
@@ -139,28 +164,26 @@ class Slk extends BaseReader
             $rowData = explode("\t", str_replace('¤', ';', str_replace(';', "\t", str_replace(';;', '¤', rtrim($rowData)))));
 
             $dataType = array_shift($rowData);
-            if ($dataType == 'C') {
-                //  Read cell value data
+            if ($dataType == 'B') {
                 foreach ($rowData as $rowDatum) {
                     switch ($rowDatum[0]) {
-                        case 'C':
                         case 'X':
                             $columnIndex = substr($rowDatum, 1) - 1;
 
                             break;
-                        case 'R':
                         case 'Y':
                             $rowIndex = substr($rowDatum, 1);
 
                             break;
                     }
-
-                    $worksheetInfo[0]['totalRows'] = max($worksheetInfo[0]['totalRows'], $rowIndex);
-                    $worksheetInfo[0]['lastColumnIndex'] = max($worksheetInfo[0]['lastColumnIndex'], $columnIndex);
                 }
+
+                break;
             }
         }
 
+        $worksheetInfo[0]['lastColumnIndex'] = $columnIndex;
+        $worksheetInfo[0]['totalRows'] = $rowIndex;
         $worksheetInfo[0]['lastColumnLetter'] = Coordinate::stringFromColumnIndex($worksheetInfo[0]['lastColumnIndex'] + 1);
         $worksheetInfo[0]['totalColumns'] = $worksheetInfo[0]['lastColumnIndex'] + 1;
 
@@ -186,6 +209,294 @@ class Slk extends BaseReader
         return $this->loadIntoExisting($pFilename, $spreadsheet);
     }
 
+    private $colorArray = [
+        'FF00FFFF', // 0 - cyan
+        'FF000000', // 1 - black
+        'FFFFFFFF', // 2 - white
+        'FFFF0000', // 3 - red
+        'FF00FF00', // 4 - green
+        'FF0000FF', // 5 - blue
+        'FFFFFF00', // 6 - yellow
+        'FFFF00FF', // 7 - magenta
+    ];
+
+    private $fontStyleMappings = [
+        'B' => 'bold',
+        'I' => 'italic',
+        'U' => 'underline',
+    ];
+
+    private function processFormula(string $rowDatum, bool &$hasCalculatedValue, string &$cellDataFormula, string $row, string $column): void
+    {
+        $cellDataFormula = '=' . substr($rowDatum, 1);
+        //    Convert R1C1 style references to A1 style references (but only when not quoted)
+        $temp = explode('"', $cellDataFormula);
+        $key = false;
+        foreach ($temp as &$value) {
+            //    Only count/replace in alternate array entries
+            if ($key = !$key) {
+                preg_match_all('/(R(\[?-?\d*\]?))(C(\[?-?\d*\]?))/', $value, $cellReferences, PREG_SET_ORDER + PREG_OFFSET_CAPTURE);
+                //    Reverse the matches array, otherwise all our offsets will become incorrect if we modify our way
+                //        through the formula from left to right. Reversing means that we work right to left.through
+                //        the formula
+                $cellReferences = array_reverse($cellReferences);
+                //    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) {
+                    $rowReference = $cellReference[2][0];
+                    //    Empty R reference is the current row
+                    if ($rowReference == '') {
+                        $rowReference = $row;
+                    }
+                    //    Bracketed R references are relative to the current row
+                    if ($rowReference[0] == '[') {
+                        $rowReference = $row + trim($rowReference, '[]');
+                    }
+                    $columnReference = $cellReference[4][0];
+                    //    Empty C reference is the current column
+                    if ($columnReference == '') {
+                        $columnReference = $column;
+                    }
+                    //    Bracketed C references are relative to the current column
+                    if ($columnReference[0] == '[') {
+                        $columnReference = $column + trim($columnReference, '[]');
+                    }
+                    $A1CellReference = Coordinate::stringFromColumnIndex($columnReference) . $rowReference;
+
+                    $value = substr_replace($value, $A1CellReference, $cellReference[0][1], strlen($cellReference[0][0]));
+                }
+            }
+        }
+        unset($value);
+        //    Then rebuild the formula string
+        $cellDataFormula = implode('"', $temp);
+        $hasCalculatedValue = true;
+    }
+
+    private function processCRecord(array $rowData, Spreadsheet &$spreadsheet, string &$row, string &$column): void
+    {
+        //    Read cell value data
+        $hasCalculatedValue = false;
+        $cellDataFormula = $cellData = '';
+        foreach ($rowData as $rowDatum) {
+            switch ($rowDatum[0]) {
+                case 'C':
+                case 'X':
+                    $column = substr($rowDatum, 1);
+
+                    break;
+                case 'R':
+                case 'Y':
+                    $row = substr($rowDatum, 1);
+
+                    break;
+                case 'K':
+                    $cellData = substr($rowDatum, 1);
+
+                    break;
+                case 'E':
+                    $this->processFormula($rowDatum, $hasCalculatedValue, $cellDataFormula, $row, $column);
+
+                    break;
+            }
+        }
+        $columnLetter = Coordinate::stringFromColumnIndex((int) $column);
+        $cellData = Calculation::unwrapResult($cellData);
+
+        // Set cell value
+        $this->processCFinal($spreadsheet, $hasCalculatedValue, $cellDataFormula, $cellData, "$columnLetter$row");
+    }
+
+    private function processCFinal(Spreadsheet &$spreadsheet, bool $hasCalculatedValue, string $cellDataFormula, string $cellData, string $coordinate): void
+    {
+        // Set cell value
+        $spreadsheet->getActiveSheet()->getCell($coordinate)->setValue(($hasCalculatedValue) ? $cellDataFormula : $cellData);
+        if ($hasCalculatedValue) {
+            $cellData = Calculation::unwrapResult($cellData);
+            $spreadsheet->getActiveSheet()->getCell($coordinate)->setCalculatedValue($cellData);
+        }
+    }
+
+    private function processFRecord(array $rowData, Spreadsheet &$spreadsheet, string &$row, string &$column): void
+    {
+        //    Read cell formatting
+        $formatStyle = $columnWidth = '';
+        $startCol = $endCol = '';
+        $fontStyle = '';
+        $styleData = [];
+        foreach ($rowData as $rowDatum) {
+            switch ($rowDatum[0]) {
+                case 'C':
+                case 'X':
+                    $column = substr($rowDatum, 1);
+
+                    break;
+                case 'R':
+                case 'Y':
+                    $row = substr($rowDatum, 1);
+
+                    break;
+                case 'P':
+                    $formatStyle = $rowDatum;
+
+                    break;
+                case 'W':
+                    [$startCol, $endCol, $columnWidth] = explode(' ', substr($rowDatum, 1));
+
+                    break;
+                case 'S':
+                    $this->styleSettings($rowDatum, $styleData, $fontStyle);
+
+                    break;
+            }
+        }
+        $this->addFormats($spreadsheet, $formatStyle, $row, $column);
+        $this->addFonts($spreadsheet, $fontStyle, $row, $column);
+        $this->addStyle($spreadsheet, $styleData, $row, $column);
+        $this->addWidth($spreadsheet, $columnWidth, $startCol, $endCol);
+    }
+
+    private $styleSettingsFont = ['D' => 'bold', 'I' => 'italic'];
+
+    private $styleSettingsBorder = [
+        'B' => 'bottom',
+        'L' => 'left',
+        'R' => 'right',
+        'T' => 'top',
+    ];
+
+    private function styleSettings(string $rowDatum, array &$styleData, string &$fontStyle): void
+    {
+        $styleSettings = substr($rowDatum, 1);
+        $iMax = strlen($styleSettings);
+        for ($i = 0; $i < $iMax; ++$i) {
+            $char = $styleSettings[$i];
+            if (array_key_exists($char, $this->styleSettingsFont)) {
+                $styleData['font'][$this->styleSettingsFont[$char]] = true;
+            } elseif (array_key_exists($char, $this->styleSettingsBorder)) {
+                $styleData['borders'][$this->styleSettingsBorder[$char]]['borderStyle'] = Border::BORDER_THIN;
+            } elseif ($char == 'S') {
+                $styleData['fill']['fillType'] = \PhpOffice\PhpSpreadsheet\Style\Fill::FILL_PATTERN_GRAY125;
+            } elseif ($char == 'M') {
+                if (preg_match('/M([1-9]\\d*)/', $styleSettings, $matches)) {
+                    $fontStyle = $matches[1];
+                }
+            }
+        }
+    }
+
+    private function addFormats(Spreadsheet &$spreadsheet, string $formatStyle, string $row, string $column): void
+    {
+        if ($formatStyle && $column > '' && $row > '') {
+            $columnLetter = Coordinate::stringFromColumnIndex((int) $column);
+            if (isset($this->formats[$formatStyle])) {
+                $spreadsheet->getActiveSheet()->getStyle($columnLetter . $row)->applyFromArray($this->formats[$formatStyle]);
+            }
+        }
+    }
+
+    private function addFonts(Spreadsheet &$spreadsheet, string $fontStyle, string $row, string $column): void
+    {
+        if ($fontStyle && $column > '' && $row > '') {
+            $columnLetter = Coordinate::stringFromColumnIndex((int) $column);
+            if (isset($this->fonts[$fontStyle])) {
+                $spreadsheet->getActiveSheet()->getStyle($columnLetter . $row)->applyFromArray($this->fonts[$fontStyle]);
+            }
+        }
+    }
+
+    private function addStyle(Spreadsheet &$spreadsheet, array $styleData, string $row, string $column): void
+    {
+        if ((!empty($styleData)) && $column > '' && $row > '') {
+            $columnLetter = Coordinate::stringFromColumnIndex($column);
+            $spreadsheet->getActiveSheet()->getStyle($columnLetter . $row)->applyFromArray($styleData);
+        }
+    }
+
+    private function addWidth(Spreadsheet $spreadsheet, string $columnWidth, string $startCol, string $endCol): void
+    {
+        if ($columnWidth > '') {
+            if ($startCol == $endCol) {
+                $startCol = Coordinate::stringFromColumnIndex((int) $startCol);
+                $spreadsheet->getActiveSheet()->getColumnDimension($startCol)->setWidth($columnWidth);
+            } else {
+                $startCol = Coordinate::stringFromColumnIndex($startCol);
+                $endCol = Coordinate::stringFromColumnIndex($endCol);
+                $spreadsheet->getActiveSheet()->getColumnDimension($startCol)->setWidth((float) $columnWidth);
+                do {
+                    $spreadsheet->getActiveSheet()->getColumnDimension(++$startCol)->setWidth($columnWidth);
+                } while ($startCol != $endCol);
+            }
+        }
+    }
+
+    private function processPRecord(array $rowData, Spreadsheet &$spreadsheet): void
+    {
+        //    Read shared styles
+        $formatArray = [];
+        $fromFormats = ['\-', '\ '];
+        $toFormats = ['-', ' '];
+        foreach ($rowData as $rowDatum) {
+            switch ($rowDatum[0]) {
+                case 'P':
+                    $formatArray['numberFormat']['formatCode'] = str_replace($fromFormats, $toFormats, substr($rowDatum, 1));
+
+                    break;
+                case 'E':
+                case 'F':
+                    $formatArray['font']['name'] = substr($rowDatum, 1);
+
+                    break;
+                case 'M':
+                    $formatArray['font']['size'] = substr($rowDatum, 1) / 20;
+
+                    break;
+                case 'L':
+                    $this->processPColors($rowDatum, $formatArray);
+
+                    break;
+                case 'S':
+                    $this->processPFontStyles($rowDatum, $formatArray);
+
+                    break;
+            }
+        }
+        $this->processPFinal($spreadsheet, $formatArray);
+    }
+
+    private function processPColors(string $rowDatum, array &$formatArray): void
+    {
+        if (preg_match('/L([1-9]\\d*)/', $rowDatum, $matches)) {
+            $fontColor = $matches[1] % 8;
+            $formatArray['font']['color']['argb'] = $this->colorArray[$fontColor];
+        }
+    }
+
+    private function processPFontStyles(string $rowDatum, array &$formatArray): void
+    {
+        $styleSettings = substr($rowDatum, 1);
+        $iMax = strlen($styleSettings);
+        for ($i = 0; $i < $iMax; ++$i) {
+            if (array_key_exists($styleSettings[$i], $this->fontStyleMappings)) {
+                $formatArray['font'][$this->fontStyleMappings[$styleSettings[$i]]] = true;
+            }
+        }
+    }
+
+    private function processPFinal(Spreadsheet &$spreadsheet, array $formatArray): void
+    {
+        if (array_key_exists('numberFormat', $formatArray)) {
+            $this->formats['P' . $this->format] = $formatArray;
+            ++$this->format;
+        } elseif (array_key_exists('font', $formatArray)) {
+            ++$this->fontcount;
+            $this->fonts[$this->fontcount] = $formatArray;
+            if ($this->fontcount === 1) {
+                $spreadsheet->getDefaultStyle()->applyFromArray($formatArray);
+            }
+        }
+    }
+
     /**
      * Loads PhpSpreadsheet from file into PhpSpreadsheet instance.
      *
@@ -196,10 +507,7 @@ class Slk extends BaseReader
     public function loadIntoExisting($pFilename, Spreadsheet $spreadsheet)
     {
         // Open file
-        if (!$this->canRead($pFilename)) {
-            throw new Exception($pFilename . ' is an Invalid Spreadsheet file.');
-        }
-        $this->openFile($pFilename);
+        $this->canReadOrBust($pFilename);
         $fileHandle = $this->fileHandle;
         rewind($fileHandle);
 
@@ -208,251 +516,32 @@ class Slk extends BaseReader
             $spreadsheet->createSheet();
         }
         $spreadsheet->setActiveSheetIndex($this->sheetIndex);
-
-        $fromFormats = ['\-', '\ '];
-        $toFormats = ['-', ' '];
+        $spreadsheet->getActiveSheet()->setTitle(basename($pFilename, '.slk'));
 
         // Loop through file
         $column = $row = '';
 
         // loop through one row (line) at a time in the file
-        while (($rowData = fgets($fileHandle)) !== false) {
+        while (($rowDataTxt = fgets($fileHandle)) !== false) {
             // convert SYLK encoded $rowData to UTF-8
-            $rowData = StringHelper::SYLKtoUTF8($rowData);
+            $rowDataTxt = StringHelper::SYLKtoUTF8($rowDataTxt);
 
             // explode each row at semicolons while taking into account that literal semicolon (;)
             // is escaped like this (;;)
-            $rowData = explode("\t", str_replace('¤', ';', str_replace(';', "\t", str_replace(';;', '¤', rtrim($rowData)))));
+            $rowData = explode("\t", str_replace('¤', ';', str_replace(';', "\t", str_replace(';;', '¤', rtrim($rowDataTxt)))));
 
             $dataType = array_shift($rowData);
-            //    Read shared styles
             if ($dataType == 'P') {
-                $formatArray = [];
-                foreach ($rowData as $rowDatum) {
-                    switch ($rowDatum[0]) {
-                        case 'P':
-                            $formatArray['numberFormat']['formatCode'] = str_replace($fromFormats, $toFormats, substr($rowDatum, 1));
-
-                            break;
-                        case 'E':
-                        case 'F':
-                            $formatArray['font']['name'] = substr($rowDatum, 1);
-
-                            break;
-                        case 'L':
-                            $formatArray['font']['size'] = substr($rowDatum, 1);
-
-                            break;
-                        case 'S':
-                            $styleSettings = substr($rowDatum, 1);
-                            $iMax = strlen($styleSettings);
-                            for ($i = 0; $i < $iMax; ++$i) {
-                                switch ($styleSettings[$i]) {
-                                    case 'I':
-                                        $formatArray['font']['italic'] = true;
-
-                                        break;
-                                    case 'D':
-                                        $formatArray['font']['bold'] = true;
-
-                                        break;
-                                    case 'T':
-                                        $formatArray['borders']['top']['borderStyle'] = Border::BORDER_THIN;
-
-                                        break;
-                                    case 'B':
-                                        $formatArray['borders']['bottom']['borderStyle'] = Border::BORDER_THIN;
-
-                                        break;
-                                    case 'L':
-                                        $formatArray['borders']['left']['borderStyle'] = Border::BORDER_THIN;
-
-                                        break;
-                                    case 'R':
-                                        $formatArray['borders']['right']['borderStyle'] = Border::BORDER_THIN;
-
-                                        break;
-                                }
-                            }
-
-                            break;
-                    }
-                }
-                $this->formats['P' . $this->format++] = $formatArray;
-            //    Read cell value data
+                //    Read shared styles
+                $this->processPRecord($rowData, $spreadsheet);
             } elseif ($dataType == 'C') {
-                $hasCalculatedValue = false;
-                $cellData = $cellDataFormula = '';
-                foreach ($rowData as $rowDatum) {
-                    switch ($rowDatum[0]) {
-                        case 'C':
-                        case 'X':
-                            $column = substr($rowDatum, 1);
-
-                            break;
-                        case 'R':
-                        case 'Y':
-                            $row = substr($rowDatum, 1);
-
-                            break;
-                        case 'K':
-                            $cellData = substr($rowDatum, 1);
-
-                            break;
-                        case 'E':
-                            $cellDataFormula = '=' . substr($rowDatum, 1);
-                            //    Convert R1C1 style references to A1 style references (but only when not quoted)
-                            $temp = explode('"', $cellDataFormula);
-                            $key = false;
-                            foreach ($temp as &$value) {
-                                //    Only count/replace in alternate array entries
-                                if ($key = !$key) {
-                                    preg_match_all('/(R(\[?-?\d*\]?))(C(\[?-?\d*\]?))/', $value, $cellReferences, PREG_SET_ORDER + PREG_OFFSET_CAPTURE);
-                                    //    Reverse the matches array, otherwise all our offsets will become incorrect if we modify our way
-                                    //        through the formula from left to right. Reversing means that we work right to left.through
-                                    //        the formula
-                                    $cellReferences = array_reverse($cellReferences);
-                                    //    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) {
-                                        $rowReference = $cellReference[2][0];
-                                        //    Empty R reference is the current row
-                                        if ($rowReference == '') {
-                                            $rowReference = $row;
-                                        }
-                                        //    Bracketed R references are relative to the current row
-                                        if ($rowReference[0] == '[') {
-                                            $rowReference = $row + trim($rowReference, '[]');
-                                        }
-                                        $columnReference = $cellReference[4][0];
-                                        //    Empty C reference is the current column
-                                        if ($columnReference == '') {
-                                            $columnReference = $column;
-                                        }
-                                        //    Bracketed C references are relative to the current column
-                                        if ($columnReference[0] == '[') {
-                                            $columnReference = $column + trim($columnReference, '[]');
-                                        }
-                                        $A1CellReference = Coordinate::stringFromColumnIndex($columnReference) . $rowReference;
-
-                                        $value = substr_replace($value, $A1CellReference, $cellReference[0][1], strlen($cellReference[0][0]));
-                                    }
-                                }
-                            }
-                            unset($value);
-                            //    Then rebuild the formula string
-                            $cellDataFormula = implode('"', $temp);
-                            $hasCalculatedValue = true;
-
-                            break;
-                    }
-                }
-                $columnLetter = Coordinate::stringFromColumnIndex($column);
-                $cellData = Calculation::unwrapResult($cellData);
-
-                // Set cell value
-                $spreadsheet->getActiveSheet()->getCell($columnLetter . $row)->setValue(($hasCalculatedValue) ? $cellDataFormula : $cellData);
-                if ($hasCalculatedValue) {
-                    $cellData = Calculation::unwrapResult($cellData);
-                    $spreadsheet->getActiveSheet()->getCell($columnLetter . $row)->setCalculatedValue($cellData);
-                }
-                //    Read cell formatting
+                //    Read cell value data
+                $this->processCRecord($rowData, $spreadsheet, $row, $column);
             } elseif ($dataType == 'F') {
-                $formatStyle = $columnWidth = $styleSettings = '';
-                $styleData = [];
-                foreach ($rowData as $rowDatum) {
-                    switch ($rowDatum[0]) {
-                        case 'C':
-                        case 'X':
-                            $column = substr($rowDatum, 1);
-
-                            break;
-                        case 'R':
-                        case 'Y':
-                            $row = substr($rowDatum, 1);
-
-                            break;
-                        case 'P':
-                            $formatStyle = $rowDatum;
-
-                            break;
-                        case 'W':
-                            [$startCol, $endCol, $columnWidth] = explode(' ', substr($rowDatum, 1));
-
-                            break;
-                        case 'S':
-                            $styleSettings = substr($rowDatum, 1);
-                            $iMax = strlen($styleSettings);
-                            for ($i = 0; $i < $iMax; ++$i) {
-                                switch ($styleSettings[$i]) {
-                                    case 'I':
-                                        $styleData['font']['italic'] = true;
-
-                                        break;
-                                    case 'D':
-                                        $styleData['font']['bold'] = true;
-
-                                        break;
-                                    case 'T':
-                                        $styleData['borders']['top']['borderStyle'] = Border::BORDER_THIN;
-
-                                        break;
-                                    case 'B':
-                                        $styleData['borders']['bottom']['borderStyle'] = Border::BORDER_THIN;
-
-                                        break;
-                                    case 'L':
-                                        $styleData['borders']['left']['borderStyle'] = Border::BORDER_THIN;
-
-                                        break;
-                                    case 'R':
-                                        $styleData['borders']['right']['borderStyle'] = Border::BORDER_THIN;
-
-                                        break;
-                                }
-                            }
-
-                            break;
-                    }
-                }
-                if (($formatStyle > '') && ($column > '') && ($row > '')) {
-                    $columnLetter = Coordinate::stringFromColumnIndex($column);
-                    if (isset($this->formats[$formatStyle])) {
-                        $spreadsheet->getActiveSheet()->getStyle($columnLetter . $row)->applyFromArray($this->formats[$formatStyle]);
-                    }
-                }
-                if ((!empty($styleData)) && ($column > '') && ($row > '')) {
-                    $columnLetter = Coordinate::stringFromColumnIndex($column);
-                    $spreadsheet->getActiveSheet()->getStyle($columnLetter . $row)->applyFromArray($styleData);
-                }
-                if ($columnWidth > '') {
-                    if ($startCol == $endCol) {
-                        $startCol = Coordinate::stringFromColumnIndex($startCol);
-                        $spreadsheet->getActiveSheet()->getColumnDimension($startCol)->setWidth($columnWidth);
-                    } else {
-                        $startCol = Coordinate::stringFromColumnIndex($startCol);
-                        $endCol = Coordinate::stringFromColumnIndex($endCol);
-                        $spreadsheet->getActiveSheet()->getColumnDimension($startCol)->setWidth($columnWidth);
-                        do {
-                            $spreadsheet->getActiveSheet()->getColumnDimension(++$startCol)->setWidth($columnWidth);
-                        } while ($startCol != $endCol);
-                    }
-                }
+                //    Read cell formatting
+                $this->processFRecord($rowData, $spreadsheet, $row, $column);
             } else {
-                foreach ($rowData as $rowDatum) {
-                    switch ($rowDatum[0]) {
-                        case 'C':
-                        case 'X':
-                            $column = substr($rowDatum, 1);
-
-                            break;
-                        case 'R':
-                        case 'Y':
-                            $row = substr($rowDatum, 1);
-
-                            break;
-                    }
-                }
+                $this->columnRowFromRowData($rowData, $column, $row);
             }
         }
 
@@ -463,6 +552,18 @@ class Slk extends BaseReader
         return $spreadsheet;
     }
 
+    private function columnRowFromRowData(array $rowData, string &$column, string &$row): void
+    {
+        foreach ($rowData as $rowDatum) {
+            $char0 = $rowDatum[0];
+            if ($char0 === 'X' || $char0 == 'C') {
+                $column = substr($rowDatum, 1);
+            } elseif ($char0 === 'Y' || $char0 == 'R') {
+                $row = substr($rowDatum, 1);
+            }
+        }
+    }
+
     /**
      * Get sheet index.
      *
diff --git a/tests/PhpSpreadsheetTests/Reader/CsvTest.php b/tests/PhpSpreadsheetTests/Reader/CsvTest.php
index e4ccd931..e11e0ff7 100644
--- a/tests/PhpSpreadsheetTests/Reader/CsvTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/CsvTest.php
@@ -255,6 +255,10 @@ EOF;
         self::assertEquals('\'', $reader->getEnclosure());
         $reader->setEnclosure('');
         self::assertEquals('"', $reader->getEnclosure());
+        // following tests from BaseReader
+        self::assertTrue($reader->getReadEmptyCells());
+        self::assertFalse($reader->getIncludeCharts());
+        self::assertNull($reader->getLoadSheetsOnly());
     }
 
     public function testReadEmptyFileName(): void
diff --git a/tests/PhpSpreadsheetTests/Reader/SlkTest.php b/tests/PhpSpreadsheetTests/Reader/SlkTest.php
new file mode 100644
index 00000000..4c7cc513
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Reader/SlkTest.php
@@ -0,0 +1,134 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader;
+
+use PhpOffice\PhpSpreadsheet\Reader\Exception as ReaderException;
+use PhpOffice\PhpSpreadsheet\Reader\Slk;
+use PhpOffice\PhpSpreadsheet\Style\Border;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+use PhpOffice\PhpSpreadsheet\Style\Font;
+
+class SlkTest extends \PHPUnit\Framework\TestCase
+{
+    private static $testbook = __DIR__ . '/../../../samples/templates/SylkTest.slk';
+
+    public function testInfo(): void
+    {
+        $reader = new Slk();
+        $workSheetInfo = $reader->listWorkSheetInfo(self::$testbook);
+        $info0 = $workSheetInfo[0];
+        self::assertEquals('SylkTest', $info0['worksheetName']);
+        self::assertEquals('J', $info0['lastColumnLetter']);
+        self::assertEquals(9, $info0['lastColumnIndex']);
+        self::assertEquals(18, $info0['totalRows']);
+        self::assertEquals(10, $info0['totalColumns']);
+    }
+
+    public function testBadFileName(): void
+    {
+        $this->expectException(ReaderException::class);
+        $reader = new Slk();
+        self::assertNull($reader->setLoadSheetsOnly(null)->getLoadSheetsOnly());
+        $reader->listWorkSheetInfo(self::$testbook . 'xxx');
+    }
+
+    public function testBadFileName2(): void
+    {
+        $reader = new Slk();
+        self::assertFalse($reader->canRead(self::$testbook . 'xxx'));
+    }
+
+    public function testNotSylkFile(): void
+    {
+        $this->expectException(ReaderException::class);
+        $reader = new Slk();
+        $reader->listWorkSheetInfo(__FILE__);
+    }
+
+    public function testLoadSlk(): void
+    {
+        $reader = new Slk();
+        $spreadsheet = $reader->load(self::$testbook);
+        $sheet = $spreadsheet->getActiveSheet();
+        self::assertEquals('SylkTest', $sheet->getTitle());
+
+        self::assertEquals('FFFF0000', $sheet->getCell('A1')->getStyle()->getFont()->getColor()->getARGB());
+        self::assertEquals(Fill::FILL_PATTERN_GRAY125, $sheet->getCell('A2')->getStyle()->getFill()->getFillType());
+        self::assertEquals(Font::UNDERLINE_SINGLE, $sheet->getCell('A4')->getStyle()->getFont()->getUnderline());
+        self::assertEquals('Test with (;) in string', $sheet->getCell('A4')->getValue());
+
+        self::assertEquals(22269, $sheet->getCell('A10')->getValue());
+        self::assertEquals('dd/mm/yyyy', $sheet->getCell('A10')->getStyle()->getNumberFormat()->getFormatCode());
+        self::assertEquals('19/12/1960', $sheet->getCell('A10')->getFormattedValue());
+        self::assertEquals(1.5, $sheet->getCell('A11')->getValue());
+        self::assertEquals('# ?/?', $sheet->getCell('A11')->getStyle()->getNumberFormat()->getFormatCode());
+        self::assertEquals('1 1/2', $sheet->getCell('A11')->getFormattedValue());
+
+        self::assertEquals('=B1+C1', $sheet->getCell('H1')->getValue());
+        self::assertEquals('=E2&F2', $sheet->getCell('J2')->getValue());
+        self::assertEquals('=SUM(C1:C4)', $sheet->getCell('I5')->getValue());
+        self::assertEquals('=MEDIAN(B6:B8)', $sheet->getCell('B9')->getValue());
+
+        self::assertEquals(11, $sheet->getCell('E1')->getStyle()->getFont()->getSize());
+        self::assertTrue($sheet->getCell('E1')->getStyle()->getFont()->getBold());
+        self::assertTrue($sheet->getCell('E1')->getStyle()->getFont()->getItalic());
+        self::assertEquals(Font::UNDERLINE_SINGLE, $sheet->getCell('E1')->getStyle()->getFont()->getUnderline());
+        self::assertFalse($sheet->getCell('E2')->getStyle()->getFont()->getBold());
+        self::assertFalse($sheet->getCell('E2')->getStyle()->getFont()->getItalic());
+        self::assertEquals(Font::UNDERLINE_NONE, $sheet->getCell('E2')->getStyle()->getFont()->getUnderline());
+        self::assertTrue($sheet->getCell('E3')->getStyle()->getFont()->getBold());
+        self::assertFalse($sheet->getCell('E3')->getStyle()->getFont()->getItalic());
+        self::assertEquals(Font::UNDERLINE_NONE, $sheet->getCell('E3')->getStyle()->getFont()->getUnderline());
+        self::assertFalse($sheet->getCell('E4')->getStyle()->getFont()->getBold());
+        self::assertTrue($sheet->getCell('E4')->getStyle()->getFont()->getItalic());
+        self::assertEquals(Font::UNDERLINE_NONE, $sheet->getCell('E4')->getStyle()->getFont()->getUnderline());
+
+        self::assertTrue($sheet->getCell('F1')->getStyle()->getFont()->getBold());
+        self::assertFalse($sheet->getCell('F1')->getStyle()->getFont()->getItalic());
+        self::assertEquals(Font::UNDERLINE_SINGLE, $sheet->getCell('F1')->getStyle()->getFont()->getUnderline());
+        self::assertFalse($sheet->getCell('F2')->getStyle()->getFont()->getBold());
+        self::assertFalse($sheet->getCell('F2')->getStyle()->getFont()->getItalic());
+        self::assertEquals(Font::UNDERLINE_NONE, $sheet->getCell('F2')->getStyle()->getFont()->getUnderline());
+        self::assertTrue($sheet->getCell('F3')->getStyle()->getFont()->getBold());
+        self::assertTrue($sheet->getCell('F3')->getStyle()->getFont()->getItalic());
+        self::assertEquals(Font::UNDERLINE_NONE, $sheet->getCell('F3')->getStyle()->getFont()->getUnderline());
+        self::assertFalse($sheet->getCell('F4')->getStyle()->getFont()->getBold());
+        self::assertFalse($sheet->getCell('F4')->getStyle()->getFont()->getItalic());
+        self::assertEquals(Font::UNDERLINE_NONE, $sheet->getCell('F4')->getStyle()->getFont()->getUnderline());
+
+        self::assertEquals(Border::BORDER_THIN, $sheet->getCell('C10')->getStyle()->getBorders()->getTop()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C10')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C10')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C10')->getStyle()->getBorders()->getLeft()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C12')->getStyle()->getBorders()->getTop()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C12')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertEquals(Border::BORDER_THIN, $sheet->getCell('C12')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C12')->getStyle()->getBorders()->getLeft()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C14')->getStyle()->getBorders()->getTop()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C14')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C14')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+        self::assertEquals(Border::BORDER_THIN, $sheet->getCell('C14')->getStyle()->getBorders()->getLeft()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C16')->getStyle()->getBorders()->getTop()->getBorderStyle());
+        self::assertEquals(Border::BORDER_THIN, $sheet->getCell('C16')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C16')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C16')->getStyle()->getBorders()->getLeft()->getBorderStyle());
+        self::assertEquals(Border::BORDER_THIN, $sheet->getCell('C18')->getStyle()->getBorders()->getTop()->getBorderStyle());
+        self::assertEquals(Border::BORDER_THIN, $sheet->getCell('C18')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertEquals(Border::BORDER_THIN, $sheet->getCell('C18')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+        self::assertEquals(Border::BORDER_THIN, $sheet->getCell('C18')->getStyle()->getBorders()->getLeft()->getBorderStyle());
+        // Have not yet figured out how C6/C7 are centred
+    }
+
+    public function testSheetIndex(): void
+    {
+        $reader = new Slk();
+        $sheetIndex = 2;
+        $reader->setSheetIndex($sheetIndex);
+        self::assertEquals($sheetIndex, $reader->getSheetIndex());
+        $spreadsheet = $reader->load(self::$testbook);
+        $sheet = $spreadsheet->setActiveSheetIndex($sheetIndex);
+        self::assertEquals('SylkTest', $sheet->getTitle());
+
+        self::assertEquals('FFFF0000', $sheet->getCell('A1')->getStyle()->getFont()->getColor()->getARGB());
+    }
+}

From 35c04964cf63a06561a5aeb199853f4b8e59b135 Mon Sep 17 00:00:00 2001
From: tyomitch <tyomitch@gmail.com>
Date: Fri, 19 Jun 2020 20:38:06 +0200
Subject: [PATCH 029/153] #1504: Using non-UTC timezone corrupts dates imported
 from XML spreadsheet (#1506)

---
 src/PhpSpreadsheet/Reader/Xml.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpSpreadsheet/Reader/Xml.php b/src/PhpSpreadsheet/Reader/Xml.php
index 15fb34ad..f9ad5475 100644
--- a/src/PhpSpreadsheet/Reader/Xml.php
+++ b/src/PhpSpreadsheet/Reader/Xml.php
@@ -516,7 +516,7 @@ class Xml extends BaseReader
                                         break;
                                     case 'DateTime':
                                         $type = DataType::TYPE_NUMERIC;
-                                        $cellValue = Date::PHPToExcel(strtotime($cellValue));
+                                        $cellValue = Date::PHPToExcel(strtotime($cellValue . ' UTC'));
 
                                         break;
                                     case 'Error':

From d8b4c3b26e4905efb4cc89b44abf3c3541c4cc72 Mon Sep 17 00:00:00 2001
From: oleibman <eclipsechasers2@yahoo.com>
Date: Fri, 19 Jun 2020 11:40:28 -0700
Subject: [PATCH 030/153] Fix for #1533 (#1534)

Code assumes that formula whose result starts with # indicates error.
Change to check entire result against error list in Functions.
---
 src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php  |  2 +-
 .../Writer/Xlsx/StartsWithHashTest.php        | 62 +++++++++++++++++++
 2 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 tests/PhpSpreadsheetTests/Writer/Xlsx/StartsWithHashTest.php

diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php b/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
index d101bb40..be064256 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
@@ -1112,7 +1112,7 @@ class Worksheet extends WriterPart
     {
         $calculatedValue = $this->getParentWriter()->getPreCalculateFormulas() ? $pCell->getCalculatedValue() : $cellValue;
         if (is_string($calculatedValue)) {
-            if (substr($calculatedValue, 0, 1) === '#') {
+            if (\PhpOffice\PhpSpreadsheet\Calculation\Functions::isError($calculatedValue)) {
                 $this->writeCellError($objWriter, 'e', $cellValue, $calculatedValue);
 
                 return;
diff --git a/tests/PhpSpreadsheetTests/Writer/Xlsx/StartsWithHashTest.php b/tests/PhpSpreadsheetTests/Writer/Xlsx/StartsWithHashTest.php
new file mode 100644
index 00000000..d4fe5b22
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Writer/Xlsx/StartsWithHashTest.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Writer\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx as Reader;
+use PhpOffice\PhpSpreadsheet\Settings;
+use PhpOffice\PhpSpreadsheet\Shared\File;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx as Writer;
+use PHPUnit\Framework\TestCase;
+use ZipArchive;
+
+class StartsWithHashTest extends TestCase
+{
+    public function testStartWithHash(): void
+    {
+        $outputFilename = tempnam(File::sysGetTempDir(), 'phpspreadsheet-test');
+        Settings::setLibXmlLoaderOptions(null);
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->setCellValueExplicit('A1', '#define M', DataType::TYPE_STRING);
+        $sheet->setCellValue('A2', '=A1');
+        $sheet->setCellValue('A3', '=UNKNOWNFUNC()');
+
+        $writer = new Writer($spreadsheet);
+        $writer->save($outputFilename);
+
+        $reader = new Reader();
+        $sheet = $reader->load($outputFilename);
+        unlink($outputFilename);
+
+        self::assertSame('#define M', $sheet->getActiveSheet()->getCell('A1')->getValue());
+        self::assertSame('#define M', $sheet->getActiveSheet()->getCell('A2')->getCalculatedValue());
+        self::assertSame('f', $sheet->getActiveSheet()->getCell('A3')->getDataType());
+        self::assertSame('#NAME?', $sheet->getActiveSheet()->getCell('A3')->getCalculatedValue());
+        self::assertSame('f', $sheet->getActiveSheet()->getCell('A3')->getDataType());
+    }
+
+    public function testStartWithHashReadRaw(): void
+    {
+        // Make sure raw data indicates A3 is an error, but A2 isn't.
+        $outputFilename = tempnam(File::sysGetTempDir(), 'phpspreadsheet-test');
+        Settings::setLibXmlLoaderOptions(null);
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->setCellValueExplicit('A1', '#define M', DataType::TYPE_STRING);
+        $sheet->setCellValue('A2', '=A1');
+        $sheet->setCellValue('A3', '=UNKNOWNFUNC()');
+
+        $writer = new Writer($spreadsheet);
+        $writer->save($outputFilename);
+        $zip = new ZipArchive();
+        $zip->open($outputFilename);
+        $resultSheet1Raw = $zip->getFromName('xl/worksheets/sheet1.xml');
+        $zip->close();
+        unlink($outputFilename);
+
+        self::assertStringContainsString('<c r="A3" t="e">', $resultSheet1Raw);
+        self::assertStringContainsString('<c r="A2" t="str">', $resultSheet1Raw);
+    }
+}

From 73c336ac96cbdbf7a3cd092849603a1ef6894c2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arne=20J=C3=B8rgensen?= <arne@arnested.dk>
Date: Fri, 19 Jun 2020 20:51:46 +0200
Subject: [PATCH 031/153] Fix exact MATCH on ranges with empty cells (#1520)

Fixes a bug when doing exact match on ranges with empty cells.

```php
<?php

require 'vendor/autoload.php';

use PhpOffice\PhpSpreadsheet\Spreadsheet;

$spreadsheet = new Spreadsheet();
$sheet = $spreadsheet->getActiveSheet();

// Row: 1, null, 4, null, 8.
$sheet->getCell('A1')->setValue(1);
$sheet->getCell('A3')->setValue(4);
$sheet->getCell('A5')->setValue(8);

$sheet->getCell('B1')->setValue('=MATCH(4, A1:A5, 1)');

// Should echo 3, but echos '#N/A'.
echo $sheet->getCell('B1')->getCalculatedValue() . PHP_EOL;

// Row: 1, null, 4, null, null.
$sheet->getCell('C1')->setValue(1);
$sheet->getCell('C3')->setValue(4);

$sheet->getCell('D1')->setValue('=MATCH(5, C1:C5, 1)');

// Should echo 3, but echos '#N/A'.
echo $sheet->getCell('D1')->getCalculatedValue() . PHP_EOL;
```
---
 CHANGELOG.md                                 |  1 +
 src/PhpSpreadsheet/Calculation/LookupRef.php | 16 ++++++++--------
 tests/data/Calculation/LookupRef/MATCH.php   | 14 ++++++++++++++
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37f4f3dc..fba9738f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 ### Fixed
 
 - Resolve evaluation of utf-8 named ranges in calculation engine [#1522](https://github.com/PHPOffice/PhpSpreadsheet/pull/1522)
+- Fix exact MATCH on ranges with empty cells [#1520](https://github.com/PHPOffice/PhpSpreadsheet/pull/1520)
 
 ## [1.13.0] - 2020-05-31
 
diff --git a/src/PhpSpreadsheet/Calculation/LookupRef.php b/src/PhpSpreadsheet/Calculation/LookupRef.php
index f8272404..09042e2c 100644
--- a/src/PhpSpreadsheet/Calculation/LookupRef.php
+++ b/src/PhpSpreadsheet/Calculation/LookupRef.php
@@ -485,6 +485,13 @@ class LookupRef
             return Functions::NA();
         }
 
+        if ($matchType == 1) {
+            // If match_type is 1 the list has to be processed from last to first
+
+            $lookupArray = array_reverse($lookupArray);
+            $keySet = array_reverse(array_keys($lookupArray));
+        }
+
         // Lookup_array should contain only number, text, or logical values, or empty (null) cells
         foreach ($lookupArray as $i => $lookupArrayValue) {
             //    check the type of the value
@@ -498,17 +505,10 @@ class LookupRef
                 $lookupArray[$i] = StringHelper::strToLower($lookupArrayValue);
             }
             if (($lookupArrayValue === null) && (($matchType == 1) || ($matchType == -1))) {
-                $lookupArray = array_slice($lookupArray, 0, $i - 1);
+                unset($lookupArray[$i]);
             }
         }
 
-        if ($matchType == 1) {
-            // If match_type is 1 the list has to be processed from last to first
-
-            $lookupArray = array_reverse($lookupArray);
-            $keySet = array_reverse(array_keys($lookupArray));
-        }
-
         // **
         // find the match
         // **
diff --git a/tests/data/Calculation/LookupRef/MATCH.php b/tests/data/Calculation/LookupRef/MATCH.php
index b39edb9f..d9f0a83d 100644
--- a/tests/data/Calculation/LookupRef/MATCH.php
+++ b/tests/data/Calculation/LookupRef/MATCH.php
@@ -97,6 +97,20 @@ return [
         -1,
     ],
 
+    // match on ranges with empty cells
+    [
+        3, // Expected
+        4, // Input
+        [1, null, 4, null, 8],
+        1,
+    ],
+    [
+        3, // Expected
+        5, // Input
+        [1, null, 4, null, null],
+        1,
+    ],
+
     // 0s are causing errors, because things like 0 == 'x' is true. Thanks PHP!
     [
         3,

From 1a44ef91095ea4923b63c29d16887923760f6d1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arne=20J=C3=B8rgensen?= <arne@arnested.dk>
Date: Fri, 19 Jun 2020 20:54:04 +0200
Subject: [PATCH 032/153] Fix MATCH when comparing different numeric types
 (#1521)

Let MATCH compare numerics of different type (e.g. integers and floats).

```php
<?php

require 'vendor/autoload.php';

use PhpOffice\PhpSpreadsheet\Spreadsheet;

$spreadsheet = new Spreadsheet();
$sheet = $spreadsheet->getActiveSheet();

// Row: 1, 2, 3, 4, 5. MATCH for 4.6.
$sheet->getCell('A1')->setValue(1);
$sheet->getCell('A2')->setValue(2);
$sheet->getCell('A3')->setValue(3);
$sheet->getCell('A4')->setValue(4);
$sheet->getCell('A5')->setValue(5);

$sheet->getCell('B1')->setValue('=MATCH(4.6, A1:A5, 1)');

// Should echo 4, but echos '#N/A'.
echo $sheet->getCell('B1')->getCalculatedValue() . PHP_EOL;

// Row: 1, 2, 3, 3.8, 5. MATCH for 4.
$sheet->getCell('C1')->setValue(1);
$sheet->getCell('C2')->setValue(2);
$sheet->getCell('C3')->setValue(3);
$sheet->getCell('C4')->setValue(3.8);
$sheet->getCell('C5')->setValue(5);

$sheet->getCell('D1')->setValue('=MATCH(4, C1:C5, 1)');

// Should echo 4, but echos 3.
echo $sheet->getCell('D1')->getCalculatedValue() . PHP_EOL;
```

Co-authored-by: Mark Baker <mark@lange.demon.co.uk>
---
 CHANGELOG.md                                 |  1 +
 src/PhpSpreadsheet/Calculation/LookupRef.php |  2 +-
 tests/data/Calculation/LookupRef/MATCH.php   | 13 +++++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fba9738f..aee16380 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 ### Fixed
 
 - Resolve evaluation of utf-8 named ranges in calculation engine [#1522](https://github.com/PHPOffice/PhpSpreadsheet/pull/1522)
+- Fix MATCH when comparing different numeric types [#1521](https://github.com/PHPOffice/PhpSpreadsheet/pull/1521)
 - Fix exact MATCH on ranges with empty cells [#1520](https://github.com/PHPOffice/PhpSpreadsheet/pull/1520)
 
 ## [1.13.0] - 2020-05-31
diff --git a/src/PhpSpreadsheet/Calculation/LookupRef.php b/src/PhpSpreadsheet/Calculation/LookupRef.php
index 09042e2c..904eb24b 100644
--- a/src/PhpSpreadsheet/Calculation/LookupRef.php
+++ b/src/PhpSpreadsheet/Calculation/LookupRef.php
@@ -515,7 +515,7 @@ class LookupRef
 
         if ($matchType === 0 || $matchType === 1) {
             foreach ($lookupArray as $i => $lookupArrayValue) {
-                $typeMatch = gettype($lookupValue) === gettype($lookupArrayValue);
+                $typeMatch = ((gettype($lookupValue) === gettype($lookupArrayValue)) || (is_numeric($lookupValue) && is_numeric($lookupArrayValue)));
                 $exactTypeMatch = $typeMatch && $lookupArrayValue === $lookupValue;
                 $nonOnlyNumericExactMatch = !$typeMatch && $lookupArrayValue === $lookupValue;
                 $exactMatch = $exactTypeMatch || $nonOnlyNumericExactMatch;
diff --git a/tests/data/Calculation/LookupRef/MATCH.php b/tests/data/Calculation/LookupRef/MATCH.php
index d9f0a83d..671056dd 100644
--- a/tests/data/Calculation/LookupRef/MATCH.php
+++ b/tests/data/Calculation/LookupRef/MATCH.php
@@ -179,6 +179,19 @@ return [
         [true, false, 'a', 'z', 222222, 2, 99999999],
         -1,
     ],
+    // when mixing numeric types
+    [
+        4, // Expected
+        4.6,
+        [1, 2, 3, 4, 5],
+        1,
+    ],
+    [
+        4, // Expected
+        4,
+        [1, 2, 3, 3.8, 5],
+        1,
+    ],
     // if element of same data type met and it is < than searched one #N/A - no further processing
     [
         '#N/A', // Expected

From 38441863971872e5d291d80223697c28bd5a95eb Mon Sep 17 00:00:00 2001
From: oleibman <eclipsechasers2@yahoo.com>
Date: Fri, 19 Jun 2020 11:57:20 -0700
Subject: [PATCH 033/153] Fix for Issue 1495 (#1500)

#1495 reports that ActiveSheet can change when calculation
involves jumping around between sheets.
Save index before calculation, restore after, add test.
---
 src/PhpSpreadsheet/Cell/Cell.php            |  2 ++
 tests/PhpSpreadsheetTests/Cell/CellTest.php | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/src/PhpSpreadsheet/Cell/Cell.php b/src/PhpSpreadsheet/Cell/Cell.php
index 0bca2fc0..74ed9268 100644
--- a/src/PhpSpreadsheet/Cell/Cell.php
+++ b/src/PhpSpreadsheet/Cell/Cell.php
@@ -251,9 +251,11 @@ class Cell
     {
         if ($this->dataType == DataType::TYPE_FORMULA) {
             try {
+                $index = $this->getWorksheet()->getParent()->getActiveSheetIndex();
                 $result = Calculation::getInstance(
                     $this->getWorksheet()->getParent()
                 )->calculateCellValue($this, $resetLog);
+                $this->getWorksheet()->getParent()->setActiveSheetIndex($index);
                 //    We don't yet handle array returns
                 if (is_array($result)) {
                     while (is_array($result)) {
diff --git a/tests/PhpSpreadsheetTests/Cell/CellTest.php b/tests/PhpSpreadsheetTests/Cell/CellTest.php
index 8c95e864..0d9ce337 100644
--- a/tests/PhpSpreadsheetTests/Cell/CellTest.php
+++ b/tests/PhpSpreadsheetTests/Cell/CellTest.php
@@ -46,4 +46,23 @@ class CellTest extends TestCase
     {
         return require 'tests/data/Cell/SetValueExplicitException.php';
     }
+
+    public function testNoChangeToActiveSheet(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet1 = $spreadsheet->getActiveSheet();
+        $sheet1->setTitle('Sheet 1');
+        $sheet3 = $spreadsheet->createSheet();
+        $sheet3->setTitle('Sheet 3');
+        $sheet1->setCellValue('C1', 123);
+        $sheet1->setCellValue('D1', 124);
+        $sheet3->setCellValue('A1', "='Sheet 1'!C1+'Sheet 1'!D1");
+        $sheet1->setCellValue('A1', "='Sheet 3'!A1");
+        $cell = 'A1';
+        $spreadsheet->setActiveSheetIndex(0);
+        self::assertEquals(0, $spreadsheet->getActiveSheetIndex());
+        $value = $spreadsheet->getActiveSheet()->getCell($cell)->getCalculatedValue();
+        self::assertEquals(0, $spreadsheet->getActiveSheetIndex());
+        self::assertEquals(247, $value);
+    }
 }

From 38fab4e6329df8ba857afa24fd686bc5369a116b Mon Sep 17 00:00:00 2001
From: oleibman <eclipsechasers2@yahoo.com>
Date: Fri, 19 Jun 2020 12:01:18 -0700
Subject: [PATCH 034/153] Fix for #1505 (#1525)

This problem is the same as #1238, which was resolved by #1239.
For that issue, the fix was to check in one place whether
$this->mapCellXfIndex[$xfIndex] was set before using it.
The sample spreadsheet supplied as a description for this
problem had exactly the same problem in 2 other places in the code.
In addition, there were 7 other places in the code where that
particular item was used unchecked. This fix corrects all 9 locations.
The spreadsheet supplied with the problem is used as the basis
for some new tests, which particularly test column dimensions
and styles, the problems involved in this case.
---
 src/PhpSpreadsheet/Reader/Xls.php            |  22 ++++++++------
 tests/PhpSpreadsheetTests/Reader/XlsTest.php |  30 +++++++++++++++++--
 tests/data/Reader/XLS/bug1505.xls            | Bin 0 -> 20992 bytes
 3 files changed, 41 insertions(+), 11 deletions(-)
 create mode 100644 tests/data/Reader/XLS/bug1505.xls

diff --git a/src/PhpSpreadsheet/Reader/Xls.php b/src/PhpSpreadsheet/Reader/Xls.php
index b206f8ac..3f383b9e 100644
--- a/src/PhpSpreadsheet/Reader/Xls.php
+++ b/src/PhpSpreadsheet/Reader/Xls.php
@@ -3622,7 +3622,9 @@ class Xls extends BaseReader
                 $this->phpSheet->getColumnDimensionByColumn($i)->setVisible(!$isHidden);
                 $this->phpSheet->getColumnDimensionByColumn($i)->setOutlineLevel($level);
                 $this->phpSheet->getColumnDimensionByColumn($i)->setCollapsed($isCollapsed);
-                $this->phpSheet->getColumnDimensionByColumn($i)->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+                if (isset($this->mapCellXfIndex[$xfIndex])) {
+                    $this->phpSheet->getColumnDimensionByColumn($i)->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+                }
             }
         }
     }
@@ -3731,7 +3733,7 @@ class Xls extends BaseReader
             $numValue = self::getIEEE754($rknum);
 
             $cell = $this->phpSheet->getCell($columnString . ($row + 1));
-            if (!$this->readDataOnly) {
+            if (!$this->readDataOnly && isset($this->mapCellXfIndex[$xfIndex])) {
                 // add style information
                 $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
             }
@@ -3866,7 +3868,7 @@ class Xls extends BaseReader
                 // offset: var; size: 4; RK value
                 $numValue = self::getIEEE754(self::getInt4d($recordData, $offset + 2));
                 $cell = $this->phpSheet->getCell($columnString . ($row + 1));
-                if (!$this->readDataOnly) {
+                if (!$this->readDataOnly && isset($this->mapCellXfIndex[$xfIndex])) {
                     // add style
                     $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
                 }
@@ -3910,7 +3912,7 @@ class Xls extends BaseReader
             $numValue = self::extractNumber(substr($recordData, 6, 8));
 
             $cell = $this->phpSheet->getCell($columnString . ($row + 1));
-            if (!$this->readDataOnly) {
+            if (!$this->readDataOnly && isset($this->mapCellXfIndex[$xfIndex])) {
                 // add cell style
                 $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
             }
@@ -4018,7 +4020,7 @@ class Xls extends BaseReader
             }
 
             $cell = $this->phpSheet->getCell($columnString . ($row + 1));
-            if (!$this->readDataOnly) {
+            if (!$this->readDataOnly && isset($this->mapCellXfIndex[$xfIndex])) {
                 // add cell style
                 $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
             }
@@ -4156,7 +4158,7 @@ class Xls extends BaseReader
                     break;
             }
 
-            if (!$this->readDataOnly) {
+            if (!$this->readDataOnly && isset($this->mapCellXfIndex[$xfIndex])) {
                 // add cell style
                 $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
             }
@@ -4194,7 +4196,9 @@ class Xls extends BaseReader
                 // Read cell?
                 if (($this->getReadFilter() !== null) && $this->getReadFilter()->readCell($columnString, $row + 1, $this->phpSheet->getTitle())) {
                     $xfIndex = self::getUInt2d($recordData, 4 + 2 * $i);
-                    $this->phpSheet->getCell($columnString . ($row + 1))->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+                    if (isset($this->mapCellXfIndex[$xfIndex])) {
+                        $this->phpSheet->getCell($columnString . ($row + 1))->setXfIndex($this->mapCellXfIndex[$xfIndex]);
+                    }
                 }
             }
         }
@@ -4245,7 +4249,7 @@ class Xls extends BaseReader
                 $cell = $this->phpSheet->getCell($columnString . ($row + 1));
                 $cell->setValueExplicit($value, DataType::TYPE_STRING);
 
-                if (!$this->readDataOnly) {
+                if (!$this->readDataOnly && isset($this->mapCellXfIndex[$xfIndex])) {
                     // add cell style
                     $cell->setXfIndex($this->mapCellXfIndex[$xfIndex]);
                 }
@@ -4277,7 +4281,7 @@ class Xls extends BaseReader
             $xfIndex = self::getUInt2d($recordData, 4);
 
             // add style information
-            if (!$this->readDataOnly && $this->readEmptyCells) {
+            if (!$this->readDataOnly && $this->readEmptyCells && isset($this->mapCellXfIndex[$xfIndex])) {
                 $this->phpSheet->getCell($columnString . ($row + 1))->setXfIndex($this->mapCellXfIndex[$xfIndex]);
             }
         }
diff --git a/tests/PhpSpreadsheetTests/Reader/XlsTest.php b/tests/PhpSpreadsheetTests/Reader/XlsTest.php
index 77ad91fa..da39f8b2 100644
--- a/tests/PhpSpreadsheetTests/Reader/XlsTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/XlsTest.php
@@ -3,9 +3,9 @@
 namespace PhpOffice\PhpSpreadsheetTests\Reader;
 
 use PhpOffice\PhpSpreadsheet\Reader\Xls;
-use PHPUnit\Framework\TestCase;
+use PhpOffice\PhpSpreadsheetTests\Functional\AbstractFunctional;
 
-class XlsTest extends TestCase
+class XlsTest extends AbstractFunctional
 {
     /**
      * Test load Xls file.
@@ -17,4 +17,30 @@ class XlsTest extends TestCase
         $spreadsheet = $reader->load($filename);
         self::assertEquals('Title', $spreadsheet->getSheet(0)->getCell('A1')->getValue());
     }
+
+    /**
+     * Test load Xls file with invalid xfIndex.
+     */
+    public function testLoadXlsBug1505(): void
+    {
+        $filename = 'tests/data/Reader/XLS/bug1505.xls';
+        $reader = new Xls();
+        $spreadsheet = $reader->load($filename);
+        $sheet = $spreadsheet->getActiveSheet();
+        $col = $sheet->getHighestColumn();
+        $row = $sheet->getHighestRow();
+
+        $newspreadsheet = $this->writeAndReload($spreadsheet, 'Xlsx');
+        $newsheet = $newspreadsheet->getActiveSheet();
+        $newcol = $newsheet->getHighestColumn();
+        $newrow = $newsheet->getHighestRow();
+
+        self::assertEquals($spreadsheet->getSheetCount(), $newspreadsheet->getSheetCount());
+        self::assertEquals($sheet->getTitle(), $newsheet->getTitle());
+        self::assertEquals($sheet->getColumnDimensions(), $newsheet->getColumnDimensions());
+        self::assertEquals($col, $newcol);
+        self::assertEquals($row, $newrow);
+        self::assertEquals($sheet->getCell('A1')->getFormattedValue(), $newsheet->getCell('A1')->getFormattedValue());
+        self::assertEquals($sheet->getCell("$col$row")->getFormattedValue(), $newsheet->getCell("$col$row")->getFormattedValue());
+    }
 }
diff --git a/tests/data/Reader/XLS/bug1505.xls b/tests/data/Reader/XLS/bug1505.xls
new file mode 100644
index 0000000000000000000000000000000000000000..3440ceb911192e86029bfd95eb2a8d7093765865
GIT binary patch
literal 20992
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
R^9N5K^9lXs<9{>-{u4<c`C|Y8

literal 0
HcmV?d00001


From a5a026805087fb8d7b9df984f37b5ed38c5c6e57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arne=20J=C3=B8rgensen?= <arne@arnested.dk>
Date: Fri, 19 Jun 2020 21:06:41 +0200
Subject: [PATCH 035/153] Fix HLOOKUP on single row (#1512)

Fixes a bug when doing a HLOOKUP on a single row.

```php
<?php

require 'vendor/autoload.php';

use PhpOffice\PhpSpreadsheet\Spreadsheet;

$spreadsheet = new Spreadsheet();
$sheet = $spreadsheet->getActiveSheet();

/**
 * Single row.
 */
$singleRow = "=HLOOKUP(10, {5, 10, 15}, 1, 0)";
$sheet->getCell('A1')->setValue($singleRow);

// Should echo 10, but echos '#N/A' and some PHP notices and warnings.
echo $sheet->getCell('A1')->getCalculatedValue() . PHP_EOL;

/**
 * Multiple rows.
 */
$multipleRows = "=HLOOKUP(10, {5, 10, 15; 20, 25, 30}, 1, 0)";
$sheet->getCell('A2')->setValue($multipleRows);

// Should echo: 10 and also does.
echo $sheet->getCell('A2')->getCalculatedValue() . PHP_EOL;
```

Co-authored-by: Mark Baker <mark@lange.demon.co.uk>
---
 CHANGELOG.md                                 |  1 +
 src/PhpSpreadsheet/Calculation/LookupRef.php |  2 +-
 tests/data/Calculation/LookupRef/HLOOKUP.php | 13 +++++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aee16380..11a8b2ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 ### Fixed
 
 - Resolve evaluation of utf-8 named ranges in calculation engine [#1522](https://github.com/PHPOffice/PhpSpreadsheet/pull/1522)
+- Fix HLOOKUP on single row [#1512](https://github.com/PHPOffice/PhpSpreadsheet/pull/1512)
 - Fix MATCH when comparing different numeric types [#1521](https://github.com/PHPOffice/PhpSpreadsheet/pull/1521)
 - Fix exact MATCH on ranges with empty cells [#1520](https://github.com/PHPOffice/PhpSpreadsheet/pull/1520)
 
diff --git a/src/PhpSpreadsheet/Calculation/LookupRef.php b/src/PhpSpreadsheet/Calculation/LookupRef.php
index 904eb24b..6e817006 100644
--- a/src/PhpSpreadsheet/Calculation/LookupRef.php
+++ b/src/PhpSpreadsheet/Calculation/LookupRef.php
@@ -807,7 +807,7 @@ class LookupRef
             return Functions::REF();
         }
         $f = array_keys($lookup_array);
-        $firstRow = array_pop($f);
+        $firstRow = reset($f);
         if ((!is_array($lookup_array[$firstRow])) || ($index_number > count($lookup_array))) {
             return Functions::REF();
         }
diff --git a/tests/data/Calculation/LookupRef/HLOOKUP.php b/tests/data/Calculation/LookupRef/HLOOKUP.php
index 644ddeba..b880f247 100644
--- a/tests/data/Calculation/LookupRef/HLOOKUP.php
+++ b/tests/data/Calculation/LookupRef/HLOOKUP.php
@@ -275,6 +275,19 @@ return [
         2,
         true,
     ],
+    [
+        3,
+        3,
+        [
+            [
+                1,
+                2,
+                3,
+            ],
+        ],
+        1,
+        true,
+    ],
     [
         5,
         'x',

From b3d30f4cbc30c45eb83111ac9d23b05afe10cab3 Mon Sep 17 00:00:00 2001
From: oleibman <eclipsechasers2@yahoo.com>
Date: Fri, 19 Jun 2020 12:08:36 -0700
Subject: [PATCH 036/153] Xls Writer - Correct Timestamp Bug, Improve Coverage
 (#1493)

* Xls Writer - Correct Timestamp Bug, Improve Coverage

I believe that Xls Writer is 100% covered now.

The Xls Writer sets its timestamp incorrectly. The problem is actually
in Shared/Ole::localDateToOLE, which converts its timestamp using
gmmktime; mktime is correct. If I save a file at 3:00 p.m. in San Francisco,
this bug means the time is actually recorded as 3:00 p.m. UTC.
A consequence of this is that if you use Phpspreadsheet to read the
file and save it as a new Xls, the creation timestamp goes further
and further back in time with each generation (or further forward
if east of Greenwich). One of the tests added confirms that
the creation timestamp is consistent with the start and end times
of the test.

The major change in coverage is adding tests to save GIF and BMP
images, which aren't supported in Xls, but are converted to PNG
in the PhpSpreadsheet code.
---
 samples/images/bmp.bmp                        | Bin 0 -> 30186 bytes
 samples/images/gif.gif                        | Bin 0 -> 1578 bytes
 src/PhpSpreadsheet/Shared/OLE.php             |   9 +-
 src/PhpSpreadsheet/Writer/Xls.php             | 339 ++++++++----------
 .../Writer/Xls/XlsGifBmpTest.php              |  84 +++++
 5 files changed, 235 insertions(+), 197 deletions(-)
 create mode 100644 samples/images/bmp.bmp
 create mode 100644 samples/images/gif.gif
 create mode 100644 tests/PhpSpreadsheetTests/Writer/Xls/XlsGifBmpTest.php

diff --git a/samples/images/bmp.bmp b/samples/images/bmp.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..01fee85ebcd7ca3dda1783f0d0b2c59494e34ac6
GIT binary patch
literal 30186
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
EA4~Nmpa1{>

literal 0
HcmV?d00001

diff --git a/samples/images/gif.gif b/samples/images/gif.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4cf06035b8a0e830eafd83733c77eee7bcb06d0b
GIT binary patch
literal 1578
zcmXYwdr;8F5yzJpThh!p0w!r<Vq?i4z-bhA#t}13v|0h9=@2=v_%^zNuiCL%WNLB|
zAE<~T)npC6Ld1BY)d)({Nm8oBfa`=Lo=-5-rp7Tu+GvEz=xl$sy?<`*cINiGpYQiF
zvc?WipIHsdp&S0U5P$#}KmZgBfI%<>hQSCJ1q)yiEP-XP0#?BRI0Q%F7@UAp@Bkjc
z6L<zM;1vQuKnMhZAqWJG-UdZb0%cGEjShf-2!y~064lTE8bm{A7>%G&w15`T5?V$p
zXcZlxLv)0W(Fr<559kp+p=b1hUNHa$#6TDrgJ4ipKt)tSWmG|pbVOq#0TD2PM6$>L
z86-nwn2eB7vOpHe5?LlIWR)C{Lvlop$q6|n59E<Nk!SKkUMT<tq(Bsyf>2OWAVpFl
zWl|xH5Jbe0ff$%UA|h;n4YDCN%tqKKTVRW9i7m4gw#p9JAv<En?1Y`N2lmLG*fV=!
zuN;5_av%=OK{zNYup%q5GOMsg^dqxTfCN}TA~VE*7!*TdSd55Ku^<-3l2{fiVpSZ7
zLvbXI#fdl-58_cgiD&U5UL}A8lt2<#f=EzN5JgcEWl<5;`$34@h>%3OqGA*U18PtW
zsbMvuM%98^R7+}Et*BLXpbpiMI#ws@R6VFi^`xHFi+a@n8c+jiU=5<-ezPcOk=qgS
zXzu?u|9|eIZQz{;V*u{Lp!-+%{{+M;bU*ZD=HcCqC9w%9Q$9Jo=fv8+iQ}p=kG$Qq
z;m0_y?UN(br#3x3di|4G@4eGpnKaQ)X?}0-={JVH(o&UmwC2oP!<T&1)_io|r@Ka$
z{OGB1b?<&womrVOwWV(V#PWh%cynC64+m1yes(7Px<CKN+~b$z!DHX%r6#UxZ%sKj
zGt`dQzb1!{b)J2sV9feGEyFs`ZeG@_SLvQ_6WjNnEN<zYmAiOGuUYZ)Yrk3YUFPY&
z{im-kt4PUjdM#^Kc~SME>7~{89!TQ+x6@KnKYVGy#>!<GmlM`Cbq&hC^~<*YuOIlw
z)b#J?e3iEPi<~QuFCYJP^Nx~Li?)my-_h^LPp03S+>>$Rr;SIo-=<4{e(~msGhgPu
zu=9fn-!E$4cWqkLt3`K`|5knW)6K6fzKeJEZFY}m+es^GV~ReX25qf7R=DJX&u7B;
zmAeb#x1W4^ReD_M=C!@)LVW2DDvB!Bb^PYvJ4zq&MG5PBHNN@O2GiWIX=D7>+<^tp
z))Y;ArO(aTiRJNeg>hxuzq1LpH8$(3(JxP}Kll33>jeYH%v+J$UfE~qob!drF<IO5
zX7n`d7}<Zz#Q~5rY}Lnk%O{+gGrDzBjXYEM^0D}mQP02gR$g4!yKyC{Nhf!2OU^F3
zTK3$bq=Hh&-1fzqM?XlP`}3hs{3@>a87eN^uyt9_byvOUc)^%y54fa^ozJIK?mhHs
z{&2f%Kz;GdioFA7n@wd`9_y(1Q_rROyXW4#@b&1V&X$B-@o~5{=C5N<C#>EwV)k`U
z@f`^zt=mr3)U7Ej{(H`aEj=AIjgQt%-t)qpH4EPF&9U<<M~=F7=vevA+WhHN5AQAR
zJY3$V_kj=Jk6-)iga6uAce#4i%9Lv#z34N_V#dviJ#zdP*-b-6^&8f3wdtQL@6NL`
zo}JQp;)f5{4_%QpVDf^$jJ;a;NaK*iL1_~X=PylbxcG7Ht?dJs)-RcyoUri^4P$Rr
z)n#W6xmVHpQpVuhXLIrv-VT%I9=v^S%I|L6K0jma;I0d^-&ojnv0&f9u1gD!-{`u$
g_|)L;w%?v#*xg=q?O^wn-*?~W{?aY!*B74q520xV=Kufz

literal 0
HcmV?d00001

diff --git a/src/PhpSpreadsheet/Shared/OLE.php b/src/PhpSpreadsheet/Shared/OLE.php
index 32b56e18..25d698a5 100644
--- a/src/PhpSpreadsheet/Shared/OLE.php
+++ b/src/PhpSpreadsheet/Shared/OLE.php
@@ -505,7 +505,7 @@ class OLE
         // days from 1-1-1601 until the beggining of UNIX era
         $days = 134774;
         // calculate seconds
-        $big_date = $days * 24 * 3600 + gmmktime(date('H', $date), date('i', $date), date('s', $date), date('m', $date), date('d', $date), date('Y', $date));
+        $big_date = $days * 24 * 3600 + mktime((int) date('H', $date), (int) date('i', $date), (int) date('s', $date), (int) date('m', $date), (int) date('d', $date), (int) date('Y', $date));
         // multiply just to make MS happy
         $big_date *= 10000000;
 
@@ -558,10 +558,9 @@ class OLE
         // translate to seconds since 1970:
         $unixTimestamp = floor(65536.0 * 65536.0 * $timestampHigh + $timestampLow - $days * 24 * 3600 + 0.5);
 
-        if ((int) $unixTimestamp == $unixTimestamp) {
-            return (int) $unixTimestamp;
-        }
+        $iTimestamp = (int) $unixTimestamp;
 
-        return $unixTimestamp >= 0.0 ? PHP_INT_MAX : PHP_INT_MIN;
+        // Overflow conditions can't happen on 64-bit system
+        return ($iTimestamp == $unixTimestamp) ? $iTimestamp : ($unixTimestamp >= 0.0 ? PHP_INT_MAX : PHP_INT_MIN);
     }
 }
diff --git a/src/PhpSpreadsheet/Writer/Xls.php b/src/PhpSpreadsheet/Writer/Xls.php
index cf87d5be..4f4b256a 100644
--- a/src/PhpSpreadsheet/Writer/Xls.php
+++ b/src/PhpSpreadsheet/Writer/Xls.php
@@ -23,7 +23,6 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Worksheet\BaseDrawing;
 use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
 use PhpOffice\PhpSpreadsheet\Worksheet\MemoryDrawing;
-use RuntimeException;
 
 class Xls extends BaseWriter
 {
@@ -389,13 +388,94 @@ class Xls extends BaseWriter
         }
     }
 
-    /**
-     * Build the Escher object corresponding to the MSODRAWINGGROUP record.
-     */
-    private function buildWorkbookEscher(): void
+    private function processMemoryDrawing(BstoreContainer &$bstoreContainer, BaseDrawing $drawing, string $renderingFunctionx): void
     {
-        $escher = null;
+        switch ($renderingFunctionx) {
+            case MemoryDrawing::RENDERING_JPEG:
+                $blipType = BSE::BLIPTYPE_JPEG;
+                $renderingFunction = 'imagejpeg';
 
+                break;
+            default:
+                $blipType = BSE::BLIPTYPE_PNG;
+                $renderingFunction = 'imagepng';
+
+                break;
+        }
+
+        ob_start();
+        call_user_func($renderingFunction, $drawing->getImageResource());
+        $blipData = ob_get_contents();
+        ob_end_clean();
+
+        $blip = new Blip();
+        $blip->setData($blipData);
+
+        $BSE = new BSE();
+        $BSE->setBlipType($blipType);
+        $BSE->setBlip($blip);
+
+        $bstoreContainer->addBSE($BSE);
+    }
+
+    private function processDrawing(BstoreContainer &$bstoreContainer, BaseDrawing $drawing): void
+    {
+        $blipData = '';
+        $filename = $drawing->getPath();
+
+        [$imagesx, $imagesy, $imageFormat] = getimagesize($filename);
+
+        switch ($imageFormat) {
+            case 1: // GIF, not supported by BIFF8, we convert to PNG
+                $blipType = BSE::BLIPTYPE_PNG;
+                ob_start();
+                imagepng(imagecreatefromgif($filename));
+                $blipData = ob_get_contents();
+                ob_end_clean();
+
+                break;
+            case 2: // JPEG
+                $blipType = BSE::BLIPTYPE_JPEG;
+                $blipData = file_get_contents($filename);
+
+                break;
+            case 3: // PNG
+                $blipType = BSE::BLIPTYPE_PNG;
+                $blipData = file_get_contents($filename);
+
+                break;
+            case 6: // Windows DIB (BMP), we convert to PNG
+                $blipType = BSE::BLIPTYPE_PNG;
+                ob_start();
+                imagepng(SharedDrawing::imagecreatefrombmp($filename));
+                $blipData = ob_get_contents();
+                ob_end_clean();
+
+                break;
+        }
+        if ($blipData) {
+            $blip = new Blip();
+            $blip->setData($blipData);
+
+            $BSE = new BSE();
+            $BSE->setBlipType($blipType);
+            $BSE->setBlip($blip);
+
+            $bstoreContainer->addBSE($BSE);
+        }
+    }
+
+    private function processBaseDrawing(BstoreContainer &$bstoreContainer, BaseDrawing $drawing): void
+    {
+        if ($drawing instanceof Drawing) {
+            $this->processDrawing($bstoreContainer, $drawing);
+        } elseif ($drawing instanceof MemoryDrawing) {
+            $this->processMemoryDrawing($bstoreContainer, $drawing, $drawing->getRenderingFunction());
+        }
+    }
+
+    private function checkForDrawings(): bool
+    {
         // any drawings in this workbook?
         $found = false;
         foreach ($this->spreadsheet->getAllSheets() as $sheet) {
@@ -406,8 +486,16 @@ class Xls extends BaseWriter
             }
         }
 
+        return $found;
+    }
+
+    /**
+     * Build the Escher object corresponding to the MSODRAWINGGROUP record.
+     */
+    private function buildWorkbookEscher(): void
+    {
         // nothing to do if there are no drawings
-        if (!$found) {
+        if (!$this->checkForDrawings()) {
             return;
         }
 
@@ -429,17 +517,16 @@ class Xls extends BaseWriter
         foreach ($this->spreadsheet->getAllsheets() as $sheet) {
             $sheetCountShapes = 0; // count number of shapes (minus group shape), in sheet
 
-            if (count($sheet->getDrawingCollection()) > 0) {
-                ++$countDrawings;
+            $addCount = 0;
+            foreach ($sheet->getDrawingCollection() as $drawing) {
+                $addCount = 1;
+                ++$sheetCountShapes;
+                ++$totalCountShapes;
 
-                foreach ($sheet->getDrawingCollection() as $drawing) {
-                    ++$sheetCountShapes;
-                    ++$totalCountShapes;
-
-                    $spId = $sheetCountShapes | ($this->spreadsheet->getIndex($sheet) + 1) << 10;
-                    $spIdMax = max($spId, $spIdMax);
-                }
+                $spId = $sheetCountShapes | ($this->spreadsheet->getIndex($sheet) + 1) << 10;
+                $spIdMax = max($spId, $spIdMax);
             }
+            $countDrawings += $addCount;
         }
 
         $dggContainer->setSpIdMax($spIdMax + 1);
@@ -453,83 +540,7 @@ class Xls extends BaseWriter
         // the BSE's (all the images)
         foreach ($this->spreadsheet->getAllsheets() as $sheet) {
             foreach ($sheet->getDrawingCollection() as $drawing) {
-                if (!extension_loaded('gd')) {
-                    throw new RuntimeException('Saving images in xls requires gd extension');
-                }
-                if ($drawing instanceof Drawing) {
-                    $filename = $drawing->getPath();
-
-                    [$imagesx, $imagesy, $imageFormat] = getimagesize($filename);
-
-                    switch ($imageFormat) {
-                        case 1: // GIF, not supported by BIFF8, we convert to PNG
-                            $blipType = BSE::BLIPTYPE_PNG;
-                            ob_start();
-                            imagepng(imagecreatefromgif($filename));
-                            $blipData = ob_get_contents();
-                            ob_end_clean();
-
-                            break;
-                        case 2: // JPEG
-                            $blipType = BSE::BLIPTYPE_JPEG;
-                            $blipData = file_get_contents($filename);
-
-                            break;
-                        case 3: // PNG
-                            $blipType = BSE::BLIPTYPE_PNG;
-                            $blipData = file_get_contents($filename);
-
-                            break;
-                        case 6: // Windows DIB (BMP), we convert to PNG
-                            $blipType = BSE::BLIPTYPE_PNG;
-                            ob_start();
-                            imagepng(SharedDrawing::imagecreatefrombmp($filename));
-                            $blipData = ob_get_contents();
-                            ob_end_clean();
-
-                            break;
-                        default:
-                            continue 2;
-                    }
-
-                    $blip = new Blip();
-                    $blip->setData($blipData);
-
-                    $BSE = new BSE();
-                    $BSE->setBlipType($blipType);
-                    $BSE->setBlip($blip);
-
-                    $bstoreContainer->addBSE($BSE);
-                } elseif ($drawing instanceof MemoryDrawing) {
-                    switch ($drawing->getRenderingFunction()) {
-                        case MemoryDrawing::RENDERING_JPEG:
-                            $blipType = BSE::BLIPTYPE_JPEG;
-                            $renderingFunction = 'imagejpeg';
-
-                            break;
-                        case MemoryDrawing::RENDERING_GIF:
-                        case MemoryDrawing::RENDERING_PNG:
-                        case MemoryDrawing::RENDERING_DEFAULT:
-                            $blipType = BSE::BLIPTYPE_PNG;
-                            $renderingFunction = 'imagepng';
-
-                            break;
-                    }
-
-                    ob_start();
-                    call_user_func($renderingFunction, $drawing->getImageResource());
-                    $blipData = ob_get_contents();
-                    ob_end_clean();
-
-                    $blip = new Blip();
-                    $blip->setData($blipData);
-
-                    $BSE = new BSE();
-                    $BSE->setBlipType($blipType);
-                    $BSE->setBlip($blip);
-
-                    $bstoreContainer->addBSE($BSE);
-                }
+                $this->processBaseDrawing($bstoreContainer, $drawing);
             }
         }
 
@@ -578,8 +589,8 @@ class Xls extends BaseWriter
         ++$dataSection_NumProps;
 
         // GKPIDDSI_CATEGORY : Category
-        if ($this->spreadsheet->getProperties()->getCategory()) {
-            $dataProp = $this->spreadsheet->getProperties()->getCategory();
+        $dataProp = $this->spreadsheet->getProperties()->getCategory();
+        if ($dataProp) {
             $dataSection[] = [
                 'summary' => ['pack' => 'V', 'data' => 0x02],
                 'offset' => ['pack' => 'V'],
@@ -707,11 +718,7 @@ class Xls extends BaseWriter
 
                 $dataSection_Content_Offset += 4 + 4;
             } elseif ($dataProp['type']['data'] == 0x0B) { // Boolean
-                if ($dataProp['data']['data'] == false) {
-                    $dataSection_Content .= pack('V', 0x0000);
-                } else {
-                    $dataSection_Content .= pack('V', 0x0001);
-                }
+                $dataSection_Content .= pack('V', (int) $dataProp['data']['data']);
                 $dataSection_Content_Offset += 4 + 4;
             } elseif ($dataProp['type']['data'] == 0x1E) { // null-terminated string prepended by dword string length
                 // Null-terminated string
@@ -725,12 +732,12 @@ class Xls extends BaseWriter
                 $dataSection_Content .= $dataProp['data']['data'];
 
                 $dataSection_Content_Offset += 4 + 4 + strlen($dataProp['data']['data']);
-            } elseif ($dataProp['type']['data'] == 0x40) { // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
-                $dataSection_Content .= $dataProp['data']['data'];
+            // Condition below can never be true
+            //} elseif ($dataProp['type']['data'] == 0x40) { // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
+            //    $dataSection_Content .= $dataProp['data']['data'];
 
-                $dataSection_Content_Offset += 4 + 8;
+            //    $dataSection_Content_Offset += 4 + 8;
             } else {
-                // Data Type Not Used at the moment
                 $dataSection_Content .= $dataProp['data']['data'];
 
                 $dataSection_Content_Offset += 4 + $dataProp['data']['length'];
@@ -752,6 +759,32 @@ class Xls extends BaseWriter
         return $data;
     }
 
+    private function writeSummaryPropOle(int $dataProp, int &$dataSection_NumProps, array &$dataSection, int $sumdata, int $typdata): void
+    {
+        if ($dataProp) {
+            $dataSection[] = [
+                'summary' => ['pack' => 'V', 'data' => $sumdata],
+                'offset' => ['pack' => 'V'],
+                'type' => ['pack' => 'V', 'data' => $typdata], // null-terminated string prepended by dword string length
+                'data' => ['data' => OLE::localDateToOLE($dataProp)],
+            ];
+            ++$dataSection_NumProps;
+        }
+    }
+
+    private function writeSummaryProp(string $dataProp, int &$dataSection_NumProps, array &$dataSection, int $sumdata, int $typdata): void
+    {
+        if ($dataProp) {
+            $dataSection[] = [
+                'summary' => ['pack' => 'V', 'data' => $sumdata],
+                'offset' => ['pack' => 'V'],
+                'type' => ['pack' => 'V', 'data' => $typdata], // null-terminated string prepended by dword string length
+                'data' => ['data' => $dataProp, 'length' => strlen($dataProp)],
+            ];
+            ++$dataSection_NumProps;
+        }
+    }
+
     /**
      * Build the OLE Part for Summary Information.
      *
@@ -792,94 +825,16 @@ class Xls extends BaseWriter
         ];
         ++$dataSection_NumProps;
 
-        //    Title
-        if ($this->spreadsheet->getProperties()->getTitle()) {
-            $dataProp = $this->spreadsheet->getProperties()->getTitle();
-            $dataSection[] = [
-                'summary' => ['pack' => 'V', 'data' => 0x02],
-                'offset' => ['pack' => 'V'],
-                'type' => ['pack' => 'V', 'data' => 0x1E], // null-terminated string prepended by dword string length
-                'data' => ['data' => $dataProp, 'length' => strlen($dataProp)],
-            ];
-            ++$dataSection_NumProps;
-        }
-        //    Subject
-        if ($this->spreadsheet->getProperties()->getSubject()) {
-            $dataProp = $this->spreadsheet->getProperties()->getSubject();
-            $dataSection[] = [
-                'summary' => ['pack' => 'V', 'data' => 0x03],
-                'offset' => ['pack' => 'V'],
-                'type' => ['pack' => 'V', 'data' => 0x1E], // null-terminated string prepended by dword string length
-                'data' => ['data' => $dataProp, 'length' => strlen($dataProp)],
-            ];
-            ++$dataSection_NumProps;
-        }
-        //    Author (Creator)
-        if ($this->spreadsheet->getProperties()->getCreator()) {
-            $dataProp = $this->spreadsheet->getProperties()->getCreator();
-            $dataSection[] = [
-                'summary' => ['pack' => 'V', 'data' => 0x04],
-                'offset' => ['pack' => 'V'],
-                'type' => ['pack' => 'V', 'data' => 0x1E], // null-terminated string prepended by dword string length
-                'data' => ['data' => $dataProp, 'length' => strlen($dataProp)],
-            ];
-            ++$dataSection_NumProps;
-        }
-        //    Keywords
-        if ($this->spreadsheet->getProperties()->getKeywords()) {
-            $dataProp = $this->spreadsheet->getProperties()->getKeywords();
-            $dataSection[] = [
-                'summary' => ['pack' => 'V', 'data' => 0x05],
-                'offset' => ['pack' => 'V'],
-                'type' => ['pack' => 'V', 'data' => 0x1E], // null-terminated string prepended by dword string length
-                'data' => ['data' => $dataProp, 'length' => strlen($dataProp)],
-            ];
-            ++$dataSection_NumProps;
-        }
-        //    Comments (Description)
-        if ($this->spreadsheet->getProperties()->getDescription()) {
-            $dataProp = $this->spreadsheet->getProperties()->getDescription();
-            $dataSection[] = [
-                'summary' => ['pack' => 'V', 'data' => 0x06],
-                'offset' => ['pack' => 'V'],
-                'type' => ['pack' => 'V', 'data' => 0x1E], // null-terminated string prepended by dword string length
-                'data' => ['data' => $dataProp, 'length' => strlen($dataProp)],
-            ];
-            ++$dataSection_NumProps;
-        }
-        //    Last Saved By (LastModifiedBy)
-        if ($this->spreadsheet->getProperties()->getLastModifiedBy()) {
-            $dataProp = $this->spreadsheet->getProperties()->getLastModifiedBy();
-            $dataSection[] = [
-                'summary' => ['pack' => 'V', 'data' => 0x08],
-                'offset' => ['pack' => 'V'],
-                'type' => ['pack' => 'V', 'data' => 0x1E], // null-terminated string prepended by dword string length
-                'data' => ['data' => $dataProp, 'length' => strlen($dataProp)],
-            ];
-            ++$dataSection_NumProps;
-        }
-        //    Created Date/Time
-        if ($this->spreadsheet->getProperties()->getCreated()) {
-            $dataProp = $this->spreadsheet->getProperties()->getCreated();
-            $dataSection[] = [
-                'summary' => ['pack' => 'V', 'data' => 0x0C],
-                'offset' => ['pack' => 'V'],
-                'type' => ['pack' => 'V', 'data' => 0x40], // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
-                'data' => ['data' => OLE::localDateToOLE($dataProp)],
-            ];
-            ++$dataSection_NumProps;
-        }
-        //    Modified Date/Time
-        if ($this->spreadsheet->getProperties()->getModified()) {
-            $dataProp = $this->spreadsheet->getProperties()->getModified();
-            $dataSection[] = [
-                'summary' => ['pack' => 'V', 'data' => 0x0D],
-                'offset' => ['pack' => 'V'],
-                'type' => ['pack' => 'V', 'data' => 0x40], // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
-                'data' => ['data' => OLE::localDateToOLE($dataProp)],
-            ];
-            ++$dataSection_NumProps;
-        }
+        $props = $this->spreadsheet->getProperties();
+        $this->writeSummaryProp($props->getTitle(), $dataSection_NumProps, $dataSection, 0x02, 0x1e);
+        $this->writeSummaryProp($props->getSubject(), $dataSection_NumProps, $dataSection, 0x03, 0x1e);
+        $this->writeSummaryProp($props->getCreator(), $dataSection_NumProps, $dataSection, 0x04, 0x1e);
+        $this->writeSummaryProp($props->getKeywords(), $dataSection_NumProps, $dataSection, 0x05, 0x1e);
+        $this->writeSummaryProp($props->getDescription(), $dataSection_NumProps, $dataSection, 0x06, 0x1e);
+        $this->writeSummaryProp($props->getLastModifiedBy(), $dataSection_NumProps, $dataSection, 0x08, 0x1e);
+        $this->writeSummaryPropOle($props->getCreated(), $dataSection_NumProps, $dataSection, 0x0c, 0x40);
+        $this->writeSummaryPropOle($props->getModified(), $dataSection_NumProps, $dataSection, 0x0d, 0x40);
+
         //    Security
         $dataSection[] = [
             'summary' => ['pack' => 'V', 'data' => 0x13],
diff --git a/tests/PhpSpreadsheetTests/Writer/Xls/XlsGifBmpTest.php b/tests/PhpSpreadsheetTests/Writer/Xls/XlsGifBmpTest.php
new file mode 100644
index 00000000..ceba7e54
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Writer/Xls/XlsGifBmpTest.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Writer\Xls;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
+use PhpOffice\PhpSpreadsheet\Worksheet\MemoryDrawing;
+use PhpOffice\PhpSpreadsheetTests\Functional\AbstractFunctional;
+
+class XlsGifBmpTest extends AbstractFunctional
+{
+    private $filename = '';
+
+    protected function tearDown(): void
+    {
+        if ($this->filename) {
+            unlink($this->filename);
+        }
+        $this->filename = '';
+    }
+
+    public function testBmp(): void
+    {
+        $pgmstart = time();
+        $spreadsheet = new Spreadsheet();
+        $filstart = $spreadsheet->getProperties()->getModified();
+        self::assertLessThanOrEqual($filstart, $pgmstart);
+
+        // Add a drawing to the worksheet
+        $drawing = new Drawing();
+        $drawing->setName('Letters B, M, and P');
+        $drawing->setDescription('Handwritten B, M, and P');
+        $drawing->setPath(__DIR__ . '/../../../../samples/images/bmp.bmp');
+        $drawing->setHeight(36);
+        $drawing->setWorksheet($spreadsheet->getActiveSheet());
+        $drawing->setCoordinates('A1');
+
+        $reloadedSpreadsheet = $this->writeAndReload($spreadsheet, 'Xls');
+        $creationDatestamp = $reloadedSpreadsheet->getProperties()->getCreated();
+        $filstart = $creationDatestamp;
+        $pSheet = $reloadedSpreadsheet->getActiveSheet();
+        $drawings = $pSheet->getDrawingCollection();
+        self::assertCount(1, $drawings);
+        foreach ($pSheet->getDrawingCollection() as $drawing) {
+            // See if Scrutinizer approves this
+            $mimeType = ($drawing instanceof MemoryDrawing) ? $drawing->getMimeType() : 'notmemorydrawing';
+            self::assertEquals('image/png', $mimeType);
+        }
+        $pgmend = time();
+
+        self::assertLessThanOrEqual($pgmend, $pgmstart);
+        self::assertLessThanOrEqual($pgmend, $filstart);
+        self::assertLessThanOrEqual($filstart, $pgmstart);
+    }
+
+    public function testGif(): void
+    {
+        $spreadsheet = new Spreadsheet();
+
+        // Add a drawing to the worksheet
+        $drawing = new Drawing();
+        $drawing->setName('Letters G, I, and G');
+        $drawing->setDescription('Handwritten G, I, and F');
+        $drawing->setPath(__DIR__ . '/../../../../samples/images/gif.gif');
+        $drawing->setHeight(36);
+        $drawing->setWorksheet($spreadsheet->getActiveSheet());
+        $drawing->setCoordinates('A1');
+
+        $reloadedSpreadsheet = $this->writeAndReload($spreadsheet, 'Xls');
+        $pSheet = $reloadedSpreadsheet->getActiveSheet();
+        $drawings = $pSheet->getDrawingCollection();
+        self::assertCount(1, $drawings);
+        foreach ($pSheet->getDrawingCollection() as $drawing) {
+            $mimeType = ($drawing instanceof MemoryDrawing) ? $drawing->getMimeType() : 'notmemorydrawing';
+            self::assertEquals('image/png', $mimeType);
+        }
+    }
+
+    public function testInvalidTimestamp(): void
+    {
+        $this->expectException(\PhpOffice\PhpSpreadsheet\Reader\Exception::class);
+        \PhpOffice\PhpSpreadsheet\Shared\OLE::OLE2LocalDate(' ');
+    }
+}

From c04d0185d969814cf792180b49b0a156d249e041 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Fri, 19 Jun 2020 22:11:07 +0200
Subject: [PATCH 037/153] Updates to changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 11a8b2ff..1b89e71a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,12 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Fix HLOOKUP on single row [#1512](https://github.com/PHPOffice/PhpSpreadsheet/pull/1512)
 - Fix MATCH when comparing different numeric types [#1521](https://github.com/PHPOffice/PhpSpreadsheet/pull/1521)
 - Fix exact MATCH on ranges with empty cells [#1520](https://github.com/PHPOffice/PhpSpreadsheet/pull/1520)
+- Fix for Issue [#1516](https://github.com/PHPOffice/PhpSpreadsheet/issues/1516) (Cloning worksheet makes corrupted Xlsx) [#1530](https://github.com/PHPOffice/PhpSpreadsheet/pull/1530)
+- Fix For Issue [#1509](https://github.com/PHPOffice/PhpSpreadsheet/issues/1509) (Can not set empty enclosure for CSV) [#1518](https://github.com/PHPOffice/PhpSpreadsheet/pull/1518)
+- Fix for Issue [#1505](https://github.com/PHPOffice/PhpSpreadsheet/issues/1505) (TypeError : Argument 4 passed to PhpOffice\PhpSpreadsheet\Writer\Xlsx\Worksheet::writeAttributeIf() must be of the type string) [#1525](https://github.com/PHPOffice/PhpSpreadsheet/pull/1525)
+- Fix for Issue [#1495](https://github.com/PHPOffice/PhpSpreadsheet/issues/1495) (Sheet index being changed when multiple sheets are used in formula) [#1500]((https://github.com/PHPOffice/PhpSpreadsheet/pull/1500))
+- Fix for Issue [#1533](https://github.com/PHPOffice/PhpSpreadsheet/issues/1533) (A reference to a cell containing a string starting with "#" leads to errors in the generated xlsx.) [#1534]((https://github.com/PHPOffice/PhpSpreadsheet/pull/1534)
+- Xls Writer - Correct Timestamp Bug [#1493](https://github.com/PHPOffice/PhpSpreadsheet/pull/1493)
 
 ## [1.13.0] - 2020-05-31
 

From acd2ba01dfeac09e5e2b03d62c3175b36e05fe54 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Fri, 19 Jun 2020 22:38:31 +0200
Subject: [PATCH 038/153] Updates to changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b89e71a..061b1ff8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,7 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Fix For Issue [#1509](https://github.com/PHPOffice/PhpSpreadsheet/issues/1509) (Can not set empty enclosure for CSV) [#1518](https://github.com/PHPOffice/PhpSpreadsheet/pull/1518)
 - Fix for Issue [#1505](https://github.com/PHPOffice/PhpSpreadsheet/issues/1505) (TypeError : Argument 4 passed to PhpOffice\PhpSpreadsheet\Writer\Xlsx\Worksheet::writeAttributeIf() must be of the type string) [#1525](https://github.com/PHPOffice/PhpSpreadsheet/pull/1525)
 - Fix for Issue [#1495](https://github.com/PHPOffice/PhpSpreadsheet/issues/1495) (Sheet index being changed when multiple sheets are used in formula) [#1500]((https://github.com/PHPOffice/PhpSpreadsheet/pull/1500))
-- Fix for Issue [#1533](https://github.com/PHPOffice/PhpSpreadsheet/issues/1533) (A reference to a cell containing a string starting with "#" leads to errors in the generated xlsx.) [#1534]((https://github.com/PHPOffice/PhpSpreadsheet/pull/1534)
+- Fix for Issue [#1533](https://github.com/PHPOffice/PhpSpreadsheet/issues/1533) (A reference to a cell containing a string starting with "#" leads to errors in the generated xlsx.) [#1534](https://github.com/PHPOffice/PhpSpreadsheet/pull/1534)
 - Xls Writer - Correct Timestamp Bug [#1493](https://github.com/PHPOffice/PhpSpreadsheet/pull/1493)
 
 ## [1.13.0] - 2020-05-31

From ca506ba87f0cc06a127a25d694e6408c6acfe20b Mon Sep 17 00:00:00 2001
From: Christoph Ziegenberg <crossjoin@users.noreply.github.com>
Date: Sat, 20 Jun 2020 17:15:38 +0200
Subject: [PATCH 039/153] Corrected date time detection (#1492)

* Corrected date time detection

German and Swiss ZIP codes (special formats provided in German Excel versions) were detected as date time value, because the regular expression for date time formats falsely matched their formats ("\C\H\-00000" and "\D-00000").
---
 src/PhpSpreadsheet/Shared/Date.php     | 5 +++++
 tests/data/Shared/Date/FormatCodes.php | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/src/PhpSpreadsheet/Shared/Date.php b/src/PhpSpreadsheet/Shared/Date.php
index 9dc99292..cb37515d 100644
--- a/src/PhpSpreadsheet/Shared/Date.php
+++ b/src/PhpSpreadsheet/Shared/Date.php
@@ -387,6 +387,11 @@ class Date
         if ((substr($pFormatCode, 0, 1) == '_') || (substr($pFormatCode, 0, 2) == '0 ')) {
             return false;
         }
+        // Some "special formats" provided in German Excel versions were detected as date time value,
+        // so filter them out here - "\C\H\-00000" (Switzerland) and "\D-00000" (Germany).
+        if (\strpos($pFormatCode, '-00000') !== false) {
+            return false;
+        }
         // Try checking for any of the date formatting characters that don't appear within square braces
         if (preg_match('/(^|\])[^\[]*[' . self::$possibleDateFormatCharacters . ']/i', $pFormatCode)) {
             //    We might also have a format mask containing quoted strings...
diff --git a/tests/data/Shared/Date/FormatCodes.php b/tests/data/Shared/Date/FormatCodes.php
index 64810de3..b558874c 100644
--- a/tests/data/Shared/Date/FormatCodes.php
+++ b/tests/data/Shared/Date/FormatCodes.php
@@ -150,4 +150,12 @@ return [
         true,
         '"date " y-m-d',
     ],
+    [
+        false,
+        '\C\H\-00000',
+    ],
+    [
+        false,
+        '\D-00000',
+    ],
 ];

From 859bef1901d072d771efadf521e9d75f427cd852 Mon Sep 17 00:00:00 2001
From: Dawid Warmuz <warmuz.dawid@gmail.com>
Date: Sat, 20 Jun 2020 18:21:19 +0200
Subject: [PATCH 040/153] Add support for IFS() logical function (#1442)

* Add support for IFS() logical function

* Use Exception as false value in IFS logical function, so it never collides with string in spreadsheet
---
 docs/references/function-list-by-category.md  |  2 +-
 docs/references/function-list-by-name.md      |  2 +-
 .../Calculation/Calculation.php               |  2 +-
 src/PhpSpreadsheet/Calculation/Logical.php    | 35 +++++++++++++
 .../Calculation/functionlist.txt              |  1 +
 .../Calculation/Functions/Logical/IfsTest.php | 32 ++++++++++++
 tests/data/Calculation/Logical/IFS.php        | 50 +++++++++++++++++++
 7 files changed, 121 insertions(+), 3 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/Functions/Logical/IfsTest.php
 create mode 100644 tests/data/Calculation/Logical/IFS.php

diff --git a/docs/references/function-list-by-category.md b/docs/references/function-list-by-category.md
index 49bb66c0..3cc1c2b8 100644
--- a/docs/references/function-list-by-category.md
+++ b/docs/references/function-list-by-category.md
@@ -213,7 +213,7 @@ FALSE               | \PhpOffice\PhpSpreadsheet\Calculation\Logical::FALSE
 IF                  | \PhpOffice\PhpSpreadsheet\Calculation\Logical::statementIf
 IFERROR             | \PhpOffice\PhpSpreadsheet\Calculation\Logical::IFERROR
 IFNA                | \PhpOffice\PhpSpreadsheet\Calculation\Logical::IFNA
-IFS                 | **Not yet Implemented**
+IFS                 | \PhpOffice\PhpSpreadsheet\Calculation\Logical::IFS
 NOT                 | \PhpOffice\PhpSpreadsheet\Calculation\Logical::NOT
 OR                  | \PhpOffice\PhpSpreadsheet\Calculation\Logical::logicalOr
 SWITCH              | \PhpOffice\PhpSpreadsheet\Calculation\Logical::statementSwitch
diff --git a/docs/references/function-list-by-name.md b/docs/references/function-list-by-name.md
index f5493d03..c787ee00 100644
--- a/docs/references/function-list-by-name.md
+++ b/docs/references/function-list-by-name.md
@@ -212,7 +212,7 @@ Excel Function      | Category                       | PhpSpreadsheet Function
 IF                  | CATEGORY_LOGICAL               | \PhpOffice\PhpSpreadsheet\Calculation\Logical::statementIf
 IFERROR             | CATEGORY_LOGICAL               | \PhpOffice\PhpSpreadsheet\Calculation\Logical::IFERROR
 IFNA                | CATEGORY_LOGICAL               | \PhpOffice\PhpSpreadsheet\Calculation\Logical::IFNA
-IFS                 | CATEGORY_LOGICAL               | **Not yet Implemented**
+IFS                 | CATEGORY_LOGICAL               | \PhpOffice\PhpSpreadsheet\Calculation\Logical::IFS
 IMABS               | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMABS
 IMAGINARY           | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMAGINARY
 IMARGUMENT          | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMARGUMENT
diff --git a/src/PhpSpreadsheet/Calculation/Calculation.php b/src/PhpSpreadsheet/Calculation/Calculation.php
index 848f9068..e65cd425 100644
--- a/src/PhpSpreadsheet/Calculation/Calculation.php
+++ b/src/PhpSpreadsheet/Calculation/Calculation.php
@@ -1059,7 +1059,7 @@ class Calculation
         ],
         'IFS' => [
             'category' => Category::CATEGORY_LOGICAL,
-            'functionCall' => [Functions::class, 'DUMMY'],
+            'functionCall' => [Logical::class, 'IFS'],
             'argumentCount' => '2+',
         ],
         'IMABS' => [
diff --git a/src/PhpSpreadsheet/Calculation/Logical.php b/src/PhpSpreadsheet/Calculation/Logical.php
index a362a275..69c543ce 100644
--- a/src/PhpSpreadsheet/Calculation/Logical.php
+++ b/src/PhpSpreadsheet/Calculation/Logical.php
@@ -352,4 +352,39 @@ class Logical
 
         return self::statementIf(Functions::isNa($testValue), $napart, $testValue);
     }
+
+    /**
+     * IFS.
+     *
+     * Excel Function:
+     *         =IFS(testValue1;returnIfTrue1;testValue2;returnIfTrue2;...;testValue_n;returnIfTrue_n)
+     *
+     *         testValue1 ... testValue_n
+     *             Conditions to Evaluate
+     *         returnIfTrue1 ... returnIfTrue_n
+     *             Value returned if corresponding testValue (nth) was true
+     *
+     * @param mixed ...$arguments Statement arguments
+     *
+     * @return mixed|string The value of returnIfTrue_n, if testValue_n was true. #N/A if none of testValues was true
+     */
+    public static function IFS(...$arguments)
+    {
+        if (count($arguments) % 2 != 0) {
+            return Functions::NA();
+        }
+        // We use instance of Exception as a falseValue in order to prevent string collision with value in cell
+        $falseValueException = new Exception();
+        for ($i = 0; $i < count($arguments); $i += 2) {
+            $testValue = ($arguments[$i] === null) ? '' : Functions::flattenSingleValue($arguments[$i]);
+            $returnIfTrue = ($arguments[$i + 1] === null) ? '' : Functions::flattenSingleValue($arguments[$i + 1]);
+            $result = self::statementIf($testValue, $returnIfTrue, $falseValueException);
+
+            if ($result !== $falseValueException) {
+                return $result;
+            }
+        }
+
+        return Functions::NA();
+    }
 }
diff --git a/src/PhpSpreadsheet/Calculation/functionlist.txt b/src/PhpSpreadsheet/Calculation/functionlist.txt
index 2556ec90..e71d18f4 100644
--- a/src/PhpSpreadsheet/Calculation/functionlist.txt
+++ b/src/PhpSpreadsheet/Calculation/functionlist.txt
@@ -163,6 +163,7 @@ HYPERLINK
 HYPGEOMDIST
 IF
 IFERROR
+IFS
 IMABS
 IMAGINARY
 IMARGUMENT
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/IfsTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/IfsTest.php
new file mode 100644
index 00000000..15687cd6
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Logical/IfsTest.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Logical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Logical;
+use PHPUnit\Framework\TestCase;
+
+class IfsTest extends TestCase
+{
+    protected function setUp(): void
+    {
+        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
+    }
+
+    /**
+     * @dataProvider providerIFS
+     *
+     * @param mixed $expectedResult
+     * @param mixed $args
+     */
+    public function testIFS($expectedResult, ...$args): void
+    {
+        $result = Logical::IFS(...$args);
+        self::assertEquals($expectedResult, $result);
+    }
+
+    public function providerIFS()
+    {
+        return require 'tests/data/Calculation/Logical/IFS.php';
+    }
+}
diff --git a/tests/data/Calculation/Logical/IFS.php b/tests/data/Calculation/Logical/IFS.php
new file mode 100644
index 00000000..e2aca007
--- /dev/null
+++ b/tests/data/Calculation/Logical/IFS.php
@@ -0,0 +1,50 @@
+<?php
+
+return [
+    [
+        '#N/A',
+    ],
+    [
+        1,
+        true,
+        1,
+    ],
+    [
+        '#N/A',
+        false,
+        1,
+        true,
+    ],
+    [
+        'ABC',
+        true,
+        'ABC',
+    ],
+    [
+        '#N/A',
+        false,
+        false,
+        false,
+        1,
+        false,
+        'ABC',
+    ],
+    [
+        'ABC',
+        false,
+        false,
+        false,
+        1,
+        true,
+        'ABC',
+    ],
+    [
+        false,
+        true,
+        false,
+        false,
+        1,
+        true,
+        'ABC',
+    ],
+];

From d57cce9aa9a28428407b600b9fc9e1b9701288ec Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Sat, 20 Jun 2020 20:27:17 +0200
Subject: [PATCH 041/153] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 061b1ff8..02179db6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,9 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Fix for Issue [#1533](https://github.com/PHPOffice/PhpSpreadsheet/issues/1533) (A reference to a cell containing a string starting with "#" leads to errors in the generated xlsx.) [#1534](https://github.com/PHPOffice/PhpSpreadsheet/pull/1534)
 - Xls Writer - Correct Timestamp Bug [#1493](https://github.com/PHPOffice/PhpSpreadsheet/pull/1493)
 
+### Added
+- Add support for IFS() logical function [#1442](https://github.com/PHPOffice/PhpSpreadsheet/pull/1442)
+
 ## [1.13.0] - 2020-05-31
 
 ### Added

From 10a4a95d678d674a612c9126f912acab2013f294 Mon Sep 17 00:00:00 2001
From: Mark Baker <mark@lange.demon.co.uk>
Date: Sun, 21 Jun 2020 14:41:51 +0200
Subject: [PATCH 042/153] Handle Ranges formatted as 3-d ranges, as long as the
 references are both to the same worksheet (#1540)

---
 src/PhpSpreadsheet/Calculation/Calculation.php     | 14 +++++++++-----
 .../Calculation/Engine/RangeTest.php               | 11 +++++++++++
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/PhpSpreadsheet/Calculation/Calculation.php b/src/PhpSpreadsheet/Calculation/Calculation.php
index e65cd425..ed630354 100644
--- a/src/PhpSpreadsheet/Calculation/Calculation.php
+++ b/src/PhpSpreadsheet/Calculation/Calculation.php
@@ -3666,13 +3666,17 @@ class Calculation
                         if ($matches[2] == '') {
                             //    Otherwise, we 'inherit' the worksheet reference from the start cell reference
                             //    The start of the cell range reference should be the last entry in $output
-                            $startCellRef = $output[count($output) - 1]['value'];
-                            preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/i', $startCellRef, $startMatches);
-                            if ($startMatches[2] > '') {
-                                $val = $startMatches[2] . '!' . $val;
+                            $rangeStartCellRef = $output[count($output) - 1]['value'];
+                            preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/i', $rangeStartCellRef, $rangeStartMatches);
+                            if ($rangeStartMatches[2] > '') {
+                                $val = $rangeStartMatches[2] . '!' . $val;
                             }
                         } else {
-                            return $this->raiseFormulaError('3D Range references are not yet supported');
+                            $rangeStartCellRef = $output[count($output) - 1]['value'];
+                            preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '$/i', $rangeStartCellRef, $rangeStartMatches);
+                            if ($rangeStartMatches[2] !== $matches[2]) {
+                                return $this->raiseFormulaError('3D Range references are not yet supported');
+                            }
                         }
                     }
 
diff --git a/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php b/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php
index e2e6e11d..9dfa4bf0 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php
@@ -60,9 +60,20 @@ class RangeTest extends TestCase
             ['=COUNT(A1:C1,A3:C3,B1:C3)', 12],
             ['=SUM(A1:C1,A3:C3 B1:C3)', 23],
             ['=COUNT(A1:C1,A3:C3 B1:C3)', 5],
+            ['=SUM(Worksheet!A1:B3,Worksheet!A1:C2)', 48],
+            ['=SUM(Worksheet!A1:Worksheet!B3,Worksheet!A1:Worksheet!C2)', 48],
         ];
     }
 
+    public function test3dRangeEvaluation(): void
+    {
+        $workSheet = $this->spreadSheet->getActiveSheet();
+        $workSheet->setCellValue('E1', '=SUM(Worksheet!A1:Worksheet2!B3)');
+
+        $this->expectExceptionMessage('3D Range references are not yet supported');
+        $workSheet->getCell('E1')->getCalculatedValue();
+    }
+
     /**
      * @dataProvider providerNamedRangeEvaluation
      *

From 6080c4561d69caafb71c1799b0ea77e04ad856fe Mon Sep 17 00:00:00 2001
From: Owen Leibman <eclipsechasers2@yahoo.com>
Date: Thu, 25 Jun 2020 22:42:38 -0700
Subject: [PATCH 043/153] Improve Coverage for HTML Reader

Reader/Html is now covered except for 1 statement.
There is some coverage of RichText when you know in advance that the
html will expand into a single cell.
It is a tougher nut, one that I have not yet cracked,
to try to handle rich text while converting unkown html to multiple cells.
The original author left this as a TODO, and so for now must I.

It made sense to restructure some of the code. There are some changes.
- Issue #1532 is fixed (links are now saved when using rowspan).
- Colors can now be specified as html color name. To accomplish this,
  Helper/Html function colourNameLookup was changed from protected
  to public, and changed to static.
- Superfluous empty lines were eliminated in a number of places, e.g.
  <ul><li>A</li><li>B</li><li>C</li></ul>
  had formerly caused a wrapped cell to be created with 2 empty lines
  followed by A, B, and C on separate lines; it will now just have the
  3 A/B/C lines, which seems like a more sensible interpretation.
- Img alt tag, which had been cast to float, is now used as a string.

Private member "encoding" is not used. Functions getEncoding and setEncoding
have therefore been marked deprecated. In fact, I was unable to get
SecurityScanner to pass *any* html which is not UTF-8. There are
possibly ways of getting around this (in Reader/Html - I have no
intention of messing with Security Scanner), as can be seen in my
companion pull request for Excel2003 Xml Reader. Doing this would be
easier for ASCII-compatible character sets (like ISO-8859-1),
than for non-compatible charsets (like UTF-16). I am not
convinced that the effort is worth it, but am willing to investigate
further.

I added a number of tests, creating an Html directory, and moving
HtmlTest to that directory.
---
 samples/Basic/42_RichText.php                 |   2 +-
 src/PhpSpreadsheet/Helper/Html.php            |   4 +-
 src/PhpSpreadsheet/Reader/BaseReader.php      |  23 +-
 src/PhpSpreadsheet/Reader/Html.php            | 661 ++++++++++--------
 .../Reader/Html/HtmlBorderTest.php            | 110 +++
 .../Reader/Html/HtmlHelper.php                |  28 +
 .../Reader/Html/HtmlImageTest.php             |  84 +++
 .../Reader/Html/HtmlLoadStringTest.php        |  92 +++
 .../Reader/Html/HtmlTagsTest.php              | 236 +++++++
 .../Reader/{ => Html}/HtmlTest.php            | 251 ++-----
 tests/data/Reader/HTML/badhtml.html           |   1 +
 11 files changed, 978 insertions(+), 514 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Reader/Html/HtmlBorderTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Reader/Html/HtmlHelper.php
 create mode 100644 tests/PhpSpreadsheetTests/Reader/Html/HtmlImageTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Reader/Html/HtmlLoadStringTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Reader/Html/HtmlTagsTest.php
 rename tests/PhpSpreadsheetTests/Reader/{ => Html}/HtmlTest.php (53%)
 create mode 100644 tests/data/Reader/HTML/badhtml.html

diff --git a/samples/Basic/42_RichText.php b/samples/Basic/42_RichText.php
index 43b35a62..d5fa85b4 100644
--- a/samples/Basic/42_RichText.php
+++ b/samples/Basic/42_RichText.php
@@ -30,7 +30,7 @@ $html1 = '<font color="#0000ff">
 while this block uses an <u>underline</u>.
 </font>
 </p>
-<p align="right"><font size="9" color="red">
+<p align="right"><font size="9" color="red" face="Times New Roman, serif">
 I want to eat <ins><del>healthy food</del> <strong>pizza</strong></ins>.
 </font>
 ';
diff --git a/src/PhpSpreadsheet/Helper/Html.php b/src/PhpSpreadsheet/Helper/Html.php
index 252e14a5..6c4cbf9b 100644
--- a/src/PhpSpreadsheet/Helper/Html.php
+++ b/src/PhpSpreadsheet/Helper/Html.php
@@ -694,9 +694,9 @@ class Html
         return implode('', $values[0]);
     }
 
-    protected function colourNameLookup($rgb)
+    public static function colourNameLookup(string $rgb): string
     {
-        return self::$colourMap[$rgb];
+        return self::$colourMap[$rgb] ?? '';
     }
 
     protected function startFontTag($tag): void
diff --git a/src/PhpSpreadsheet/Reader/BaseReader.php b/src/PhpSpreadsheet/Reader/BaseReader.php
index 77a6421b..eb0e3ba2 100644
--- a/src/PhpSpreadsheet/Reader/BaseReader.php
+++ b/src/PhpSpreadsheet/Reader/BaseReader.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Reader;
 
+use PhpOffice\PhpSpreadsheet\Reader\Exception as ReaderException;
 use PhpOffice\PhpSpreadsheet\Reader\Security\XmlScanner;
 use PhpOffice\PhpSpreadsheet\Shared\File;
 
@@ -133,11 +134,7 @@ abstract class BaseReader implements IReader
 
     public function getSecurityScanner()
     {
-        if (property_exists($this, 'securityScanner')) {
-            return $this->securityScanner;
-        }
-
-        return null;
+        return $this->securityScanner;
     }
 
     /**
@@ -147,12 +144,18 @@ abstract class BaseReader implements IReader
      */
     protected function openFile($pFilename): void
     {
-        File::assertFile($pFilename);
+        if ($pFilename) {
+            File::assertFile($pFilename);
 
-        // Open file
-        $this->fileHandle = fopen($pFilename, 'rb');
-        if ($this->fileHandle === false) {
-            throw new Exception('Could not open file ' . $pFilename . ' for reading.');
+            // Open file
+            $fileHandle = fopen($pFilename, 'rb');
+        } else {
+            $fileHandle = false;
+        }
+        if ($fileHandle !== false) {
+            $this->fileHandle = $fileHandle;
+        } else {
+            throw new ReaderException('Could not open file ' . $pFilename . ' for reading.');
         }
     }
 }
diff --git a/src/PhpSpreadsheet/Reader/Html.php b/src/PhpSpreadsheet/Reader/Html.php
index 2fe85b6f..7cb14f49 100644
--- a/src/PhpSpreadsheet/Reader/Html.php
+++ b/src/PhpSpreadsheet/Reader/Html.php
@@ -16,6 +16,7 @@ use PhpOffice\PhpSpreadsheet\Style\Font;
 use PhpOffice\PhpSpreadsheet\Style\Style;
 use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use Throwable;
 
 /** PhpSpreadsheet root directory */
 class Html extends BaseReader
@@ -219,9 +220,13 @@ class Html extends BaseReader
     /**
      * Set input encoding.
      *
+     * @deprecated no use is made of this property
+     *
      * @param string $pValue Input encoding, eg: 'ANSI'
      *
      * @return $this
+     *
+     * @codeCoverageIgnore
      */
     public function setInputEncoding($pValue)
     {
@@ -233,7 +238,11 @@ class Html extends BaseReader
     /**
      * Get input encoding.
      *
+     * @deprecated no use is made of this property
+     *
      * @return string
+     *
+     * @codeCoverageIgnore
      */
     public function getInputEncoding()
     {
@@ -289,12 +298,319 @@ class Html extends BaseReader
         $cellContent = (string) '';
     }
 
-    /**
-     * @param int $row
-     * @param string $column
-     * @param string $cellContent
-     */
-    protected function processDomElement(DOMNode $element, Worksheet $sheet, &$row, &$column, &$cellContent): void
+    private function processDomElementBody(DOMNode $element, Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child): void
+    {
+        $attributeArray = [];
+        foreach ($child->attributes as $attribute) {
+            $attributeArray[$attribute->name] = $attribute->value;
+        }
+
+        if ($child->nodeName === 'body') {
+            $row = 1;
+            $column = 'A';
+            $cellContent = '';
+            $this->tableLevel = 0;
+            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+        } else {
+            $this->processDomElementTitle($element, $sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    private function processDomElementTitle(DOMNode $element, Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        if ($child->nodeName === 'title') {
+            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+            $sheet->setTitle($cellContent, true, false);
+            $cellContent = '';
+        } else {
+            $this->processDomElementSpanEtc($element, $sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    private static $spanEtc = ['span', 'div', 'font', 'i', 'em', 'strong', 'b'];
+
+    private function processDomElementSpanEtc(DOMNode $element, Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        if (in_array($child->nodeName, self::$spanEtc)) {
+            if (isset($attributeArray['class']) && $attributeArray['class'] === 'comment') {
+                $sheet->getComment($column . $row)
+                    ->getText()
+                    ->createTextRun($child->textContent);
+            }
+            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+
+            if (isset($this->formats[$child->nodeName])) {
+                $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
+            }
+        } else {
+            $this->processDomElementHr($element, $sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    private function processDomElementHr(DOMNode $element, Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        if ($child->nodeName === 'hr') {
+            $this->flushCell($sheet, $column, $row, $cellContent);
+            ++$row;
+            if (isset($this->formats[$child->nodeName])) {
+                $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
+            }
+            ++$row;
+        }
+        // fall through to br
+        $this->processDomElementBr($element, $sheet, $row, $column, $cellContent, $child, $attributeArray);
+    }
+
+    private function processDomElementBr(DOMNode $element, Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        if ($child->nodeName === 'br' || $child->nodeName === 'hr') {
+            if ($this->tableLevel > 0) {
+                //    If we're inside a table, replace with a \n and set the cell to wrap
+                $cellContent .= "\n";
+                $sheet->getStyle($column . $row)->getAlignment()->setWrapText(true);
+            } else {
+                //    Otherwise flush our existing content and move the row cursor on
+                $this->flushCell($sheet, $column, $row, $cellContent);
+                ++$row;
+            }
+        } else {
+            $this->processDomElementA($element, $sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    private function processDomElementA(DOMNode $element, Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        if ($child->nodeName === 'a') {
+            foreach ($attributeArray as $attributeName => $attributeValue) {
+                switch ($attributeName) {
+                    case 'href':
+                        $sheet->getCell($column . $row)->getHyperlink()->setUrl($attributeValue);
+                        if (isset($this->formats[$child->nodeName])) {
+                            $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
+                        }
+
+                        break;
+                    case 'class':
+                        if ($attributeValue === 'comment-indicator') {
+                            break; // Ignore - it's just a red square.
+                        }
+                }
+            }
+            // no idea why this should be needed
+            //$cellContent .= ' ';
+            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+        } else {
+            $this->processDomElementH1Etc($element, $sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    private static $h1Etc = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'ol', 'ul', 'p'];
+
+    private function processDomElementH1Etc(DOMNode $element, Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        if (in_array($child->nodeName, self::$h1Etc)) {
+            if ($this->tableLevel > 0) {
+                //    If we're inside a table, replace with a \n
+                $cellContent .= $cellContent ? "\n" : '';
+                $sheet->getStyle($column . $row)->getAlignment()->setWrapText(true);
+                $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+            } else {
+                if ($cellContent > '') {
+                    $this->flushCell($sheet, $column, $row, $cellContent);
+                    ++$row;
+                }
+                $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+                $this->flushCell($sheet, $column, $row, $cellContent);
+
+                if (isset($this->formats[$child->nodeName])) {
+                    $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
+                }
+
+                ++$row;
+                $column = 'A';
+            }
+        } else {
+            $this->processDomElementLi($element, $sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    private function processDomElementLi(DOMNode $element, Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        if ($child->nodeName === 'li') {
+            if ($this->tableLevel > 0) {
+                //    If we're inside a table, replace with a \n
+                $cellContent .= $cellContent ? "\n" : '';
+                $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+            } else {
+                if ($cellContent > '') {
+                    $this->flushCell($sheet, $column, $row, $cellContent);
+                }
+                ++$row;
+                $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+                $this->flushCell($sheet, $column, $row, $cellContent);
+                $column = 'A';
+            }
+        } else {
+            $this->processDomElementImg($element, $sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    private function processDomElementImg(DOMNode $element, Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        if ($child->nodeName === 'img') {
+            $this->insertImage($sheet, $column, $row, $attributeArray);
+        } else {
+            $this->processDomElementTable($element, $sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    private function processDomElementTable(DOMNode $element, Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        if ($child->nodeName === 'table') {
+            $this->flushCell($sheet, $column, $row, $cellContent);
+            $column = $this->setTableStartColumn($column);
+            if ($this->tableLevel > 1) {
+                --$row;
+            }
+            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+            $column = $this->releaseTableStartColumn();
+            if ($this->tableLevel > 1) {
+                ++$column;
+            } else {
+                ++$row;
+            }
+        } else {
+            $this->processDomElementTr($element, $sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    private function processDomElementTr(DOMNode $element, Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        if ($child->nodeName === 'tr') {
+            $column = $this->getTableStartColumn();
+            $cellContent = '';
+            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+
+            if (isset($attributeArray['height'])) {
+                $sheet->getRowDimension($row)->setRowHeight($attributeArray['height']);
+            }
+
+            ++$row;
+        } else {
+            $this->processDomElementThTdOther($element, $sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    private function processDomElementThTdOther(DOMNode $element, Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        if ($child->nodeName !== 'td' && $child->nodeName !== 'th') {
+            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+        } else {
+            $this->processDomElementThTd($element, $sheet, $row, $column, $cellContent, $child, $attributeArray);
+        }
+    }
+
+    private function processDomElementBgcolor(Worksheet $sheet, int $row, string $column, array $attributeArray): void
+    {
+        if (isset($attributeArray['bgcolor'])) {
+            $sheet->getStyle("$column$row")->applyFromArray(
+                [
+                    'fill' => [
+                        'fillType' => Fill::FILL_SOLID,
+                        'color' => ['rgb' => $this->getStyleColor($attributeArray['bgcolor'])],
+                    ],
+                ]
+            );
+        }
+    }
+
+    private function processDomElementWidth(Worksheet $sheet, string $column, array $attributeArray): void
+    {
+        if (isset($attributeArray['width'])) {
+            $sheet->getColumnDimension($column)->setWidth($attributeArray['width']);
+        }
+    }
+
+    private function processDomElementHeight(Worksheet $sheet, int $row, array $attributeArray): void
+    {
+        if (isset($attributeArray['height'])) {
+            $sheet->getRowDimension($row)->setRowHeight($attributeArray['height']);
+        }
+    }
+
+    private function processDomElementAlign(Worksheet $sheet, int $row, string $column, array $attributeArray): void
+    {
+        if (isset($attributeArray['align'])) {
+            $sheet->getStyle($column . $row)->getAlignment()->setHorizontal($attributeArray['align']);
+        }
+    }
+
+    private function processDomElementVAlign(Worksheet $sheet, int $row, string $column, array $attributeArray): void
+    {
+        if (isset($attributeArray['valign'])) {
+            $sheet->getStyle($column . $row)->getAlignment()->setVertical($attributeArray['valign']);
+        }
+    }
+
+    private function processDomElementDataFormat(Worksheet $sheet, int $row, string $column, array $attributeArray): void
+    {
+        if (isset($attributeArray['data-format'])) {
+            $sheet->getStyle($column . $row)->getNumberFormat()->setFormatCode($attributeArray['data-format']);
+        }
+    }
+
+    private function processDomElementThTd(DOMNode $element, Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    {
+        while (isset($this->rowspan[$column . $row])) {
+            ++$column;
+        }
+        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+
+        // apply inline style
+        $this->applyInlineStyle($sheet, $row, $column, $attributeArray);
+
+        $this->flushCell($sheet, $column, $row, $cellContent);
+
+        $this->processDomElementBgcolor($sheet, $row, $column, $attributeArray);
+        $this->processDomElementWidth($sheet, $column, $attributeArray);
+        $this->processDomElementHeight($sheet, $row, $attributeArray);
+        $this->processDomElementAlign($sheet, $row, $column, $attributeArray);
+        $this->processDomElementVAlign($sheet, $row, $column, $attributeArray);
+        $this->processDomElementDataFormat($sheet, $row, $column, $attributeArray);
+
+        if (isset($attributeArray['rowspan'], $attributeArray['colspan'])) {
+            //create merging rowspan and colspan
+            $columnTo = $column;
+            for ($i = 0; $i < (int) $attributeArray['colspan'] - 1; ++$i) {
+                ++$columnTo;
+            }
+            $range = $column . $row . ':' . $columnTo . ($row + (int) $attributeArray['rowspan'] - 1);
+            foreach (Coordinate::extractAllCellReferencesInRange($range) as $value) {
+                $this->rowspan[$value] = true;
+            }
+            $sheet->mergeCells($range);
+            $column = $columnTo;
+        } elseif (isset($attributeArray['rowspan'])) {
+            //create merging rowspan
+            $range = $column . $row . ':' . $column . ($row + (int) $attributeArray['rowspan'] - 1);
+            foreach (Coordinate::extractAllCellReferencesInRange($range) as $value) {
+                $this->rowspan[$value] = true;
+            }
+            $sheet->mergeCells($range);
+        } elseif (isset($attributeArray['colspan'])) {
+            //create merging colspan
+            $columnTo = $column;
+            for ($i = 0; $i < (int) $attributeArray['colspan'] - 1; ++$i) {
+                ++$columnTo;
+            }
+            $sheet->mergeCells($column . $row . ':' . $columnTo . $row);
+            $column = $columnTo;
+        }
+
+        ++$column;
+    }
+
+    protected function processDomElement(DOMNode $element, Worksheet $sheet, int &$row, string &$column, string &$cellContent): void
     {
         foreach ($element->childNodes as $child) {
             if ($child instanceof DOMText) {
@@ -306,267 +622,7 @@ class Html extends BaseReader
                 //    but if we have a rich text run instead, we need to append it correctly
                     //    TODO
             } elseif ($child instanceof DOMElement) {
-                $attributeArray = [];
-                foreach ($child->attributes as $attribute) {
-                    $attributeArray[$attribute->name] = $attribute->value;
-                }
-
-                switch ($child->nodeName) {
-                    case 'meta':
-                        foreach ($attributeArray as $attributeName => $attributeValue) {
-                            // Extract character set, so we can convert to UTF-8 if required
-                            if ($attributeName === 'charset') {
-                                $this->setInputEncoding($attributeValue);
-                            }
-                        }
-                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-
-                        break;
-                    case 'title':
-                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-                        $sheet->setTitle($cellContent, true, false);
-                        $cellContent = '';
-
-                        break;
-                    case 'span':
-                    case 'div':
-                    case 'font':
-                    case 'i':
-                    case 'em':
-                    case 'strong':
-                    case 'b':
-                        if (isset($attributeArray['class']) && $attributeArray['class'] === 'comment') {
-                            $sheet->getComment($column . $row)
-                                ->getText()
-                                ->createTextRun($child->textContent);
-
-                            break;
-                        }
-
-                        if ($cellContent > '') {
-                            $cellContent .= ' ';
-                        }
-                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-                        if ($cellContent > '') {
-                            $cellContent .= ' ';
-                        }
-
-                        if (isset($this->formats[$child->nodeName])) {
-                            $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
-                        }
-
-                        break;
-                    case 'hr':
-                        $this->flushCell($sheet, $column, $row, $cellContent);
-                        ++$row;
-                        if (isset($this->formats[$child->nodeName])) {
-                            $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
-                        } else {
-                            $cellContent = '----------';
-                            $this->flushCell($sheet, $column, $row, $cellContent);
-                        }
-                        ++$row;
-                        // Add a break after a horizontal rule, simply by allowing the code to dropthru
-                        // no break
-                    case 'br':
-                        if ($this->tableLevel > 0) {
-                            //    If we're inside a table, replace with a \n and set the cell to wrap
-                            $cellContent .= "\n";
-                            $sheet->getStyle($column . $row)->getAlignment()->setWrapText(true);
-                        } else {
-                            //    Otherwise flush our existing content and move the row cursor on
-                            $this->flushCell($sheet, $column, $row, $cellContent);
-                            ++$row;
-                        }
-
-                        break;
-                    case 'a':
-                        foreach ($attributeArray as $attributeName => $attributeValue) {
-                            switch ($attributeName) {
-                                case 'href':
-                                    $sheet->getCell($column . $row)->getHyperlink()->setUrl($attributeValue);
-                                    if (isset($this->formats[$child->nodeName])) {
-                                        $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
-                                    }
-
-                                    break;
-                                case 'class':
-                                    if ($attributeValue === 'comment-indicator') {
-                                        break; // Ignore - it's just a red square.
-                                    }
-                            }
-                        }
-                        $cellContent .= ' ';
-                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-
-                        break;
-                    case 'h1':
-                    case 'h2':
-                    case 'h3':
-                    case 'h4':
-                    case 'h5':
-                    case 'h6':
-                    case 'ol':
-                    case 'ul':
-                    case 'p':
-                        if ($this->tableLevel > 0) {
-                            //    If we're inside a table, replace with a \n
-                            $cellContent .= "\n";
-                            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-                        } else {
-                            if ($cellContent > '') {
-                                $this->flushCell($sheet, $column, $row, $cellContent);
-                                ++$row;
-                            }
-                            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-                            $this->flushCell($sheet, $column, $row, $cellContent);
-
-                            if (isset($this->formats[$child->nodeName])) {
-                                $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
-                            }
-
-                            ++$row;
-                            $column = 'A';
-                        }
-
-                        break;
-                    case 'li':
-                        if ($this->tableLevel > 0) {
-                            //    If we're inside a table, replace with a \n
-                            $cellContent .= "\n";
-                            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-                        } else {
-                            if ($cellContent > '') {
-                                $this->flushCell($sheet, $column, $row, $cellContent);
-                            }
-                            ++$row;
-                            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-                            $this->flushCell($sheet, $column, $row, $cellContent);
-                            $column = 'A';
-                        }
-
-                        break;
-                    case 'img':
-                        $this->insertImage($sheet, $column, $row, $attributeArray);
-
-                        break;
-                    case 'table':
-                        $this->flushCell($sheet, $column, $row, $cellContent);
-                        $column = $this->setTableStartColumn($column);
-                        if ($this->tableLevel > 1) {
-                            --$row;
-                        }
-                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-                        $column = $this->releaseTableStartColumn();
-                        if ($this->tableLevel > 1) {
-                            ++$column;
-                        } else {
-                            ++$row;
-                        }
-
-                        break;
-                    case 'thead':
-                    case 'tbody':
-                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-
-                        break;
-                    case 'tr':
-                        $column = $this->getTableStartColumn();
-                        $cellContent = '';
-                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-
-                        if (isset($attributeArray['height'])) {
-                            $sheet->getRowDimension($row)->setRowHeight($attributeArray['height']);
-                        }
-
-                        ++$row;
-
-                        break;
-                    case 'th':
-                    case 'td':
-                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-
-                        while (isset($this->rowspan[$column . $row])) {
-                            ++$column;
-                        }
-
-                        // apply inline style
-                        $this->applyInlineStyle($sheet, $row, $column, $attributeArray);
-
-                        $this->flushCell($sheet, $column, $row, $cellContent);
-
-                        if (isset($attributeArray['rowspan'], $attributeArray['colspan'])) {
-                            //create merging rowspan and colspan
-                            $columnTo = $column;
-                            for ($i = 0; $i < (int) $attributeArray['colspan'] - 1; ++$i) {
-                                ++$columnTo;
-                            }
-                            $range = $column . $row . ':' . $columnTo . ($row + (int) $attributeArray['rowspan'] - 1);
-                            foreach (Coordinate::extractAllCellReferencesInRange($range) as $value) {
-                                $this->rowspan[$value] = true;
-                            }
-                            $sheet->mergeCells($range);
-                            $column = $columnTo;
-                        } elseif (isset($attributeArray['rowspan'])) {
-                            //create merging rowspan
-                            $range = $column . $row . ':' . $column . ($row + (int) $attributeArray['rowspan'] - 1);
-                            foreach (Coordinate::extractAllCellReferencesInRange($range) as $value) {
-                                $this->rowspan[$value] = true;
-                            }
-                            $sheet->mergeCells($range);
-                        } elseif (isset($attributeArray['colspan'])) {
-                            //create merging colspan
-                            $columnTo = $column;
-                            for ($i = 0; $i < (int) $attributeArray['colspan'] - 1; ++$i) {
-                                ++$columnTo;
-                            }
-                            $sheet->mergeCells($column . $row . ':' . $columnTo . $row);
-                            $column = $columnTo;
-                        } elseif (isset($attributeArray['bgcolor'])) {
-                            $sheet->getStyle($column . $row)->applyFromArray(
-                                [
-                                    'fill' => [
-                                        'fillType' => Fill::FILL_SOLID,
-                                        'color' => ['rgb' => $attributeArray['bgcolor']],
-                                    ],
-                                ]
-                            );
-                        }
-
-                        if (isset($attributeArray['width'])) {
-                            $sheet->getColumnDimension($column)->setWidth($attributeArray['width']);
-                        }
-
-                        if (isset($attributeArray['height'])) {
-                            $sheet->getRowDimension($row)->setRowHeight($attributeArray['height']);
-                        }
-
-                        if (isset($attributeArray['align'])) {
-                            $sheet->getStyle($column . $row)->getAlignment()->setHorizontal($attributeArray['align']);
-                        }
-
-                        if (isset($attributeArray['valign'])) {
-                            $sheet->getStyle($column . $row)->getAlignment()->setVertical($attributeArray['valign']);
-                        }
-
-                        if (isset($attributeArray['data-format'])) {
-                            $sheet->getStyle($column . $row)->getNumberFormat()->setFormatCode($attributeArray['data-format']);
-                        }
-
-                        ++$column;
-
-                        break;
-                    case 'body':
-                        $row = 1;
-                        $column = 'A';
-                        $cellContent = '';
-                        $this->tableLevel = 0;
-                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-
-                        break;
-                    default:
-                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-                }
+                $this->processDomElementBody($element, $sheet, $row, $column, $cellContent, $child);
             }
         }
     }
@@ -588,7 +644,11 @@ class Html extends BaseReader
         // Create a new DOM object
         $dom = new DOMDocument();
         // Reload the HTML file into the DOM object
-        $loaded = $dom->loadHTML(mb_convert_encoding($this->securityScanner->scanFile($pFilename), 'HTML-ENTITIES', 'UTF-8'));
+        try {
+            $loaded = $dom->loadHTML(mb_convert_encoding($this->securityScanner->scanFile($pFilename), 'HTML-ENTITIES', 'UTF-8'));
+        } catch (Throwable $e) {
+            $loaded = false;
+        }
         if ($loaded === false) {
             throw new Exception('Failed to load ' . $pFilename . ' as a DOM Document');
         }
@@ -606,7 +666,11 @@ class Html extends BaseReader
         //    Create a new DOM object
         $dom = new DOMDocument();
         //    Reload the HTML file into the DOM object
-        $loaded = $dom->loadHTML(mb_convert_encoding($this->securityScanner->scan($content), 'HTML-ENTITIES', 'UTF-8'));
+        try {
+            $loaded = $dom->loadHTML(mb_convert_encoding($this->securityScanner->scan($content), 'HTML-ENTITIES', 'UTF-8'));
+        } catch (Throwable $e) {
+            $loaded = false;
+        }
         if ($loaded === false) {
             throw new Exception('Failed to load content as a DOM Document');
         }
@@ -837,7 +901,7 @@ class Html extends BaseReader
             return substr($value, 1);
         }
 
-        return null;
+        return \PhpOffice\PhpSpreadsheet\Helper\Html::colourNameLookup((string) $value);
     }
 
     /**
@@ -853,7 +917,7 @@ class Html extends BaseReader
         $src = urldecode($attributes['src']);
         $width = isset($attributes['width']) ? (float) $attributes['width'] : null;
         $height = isset($attributes['height']) ? (float) $attributes['height'] : null;
-        $name = isset($attributes['alt']) ? (float) $attributes['alt'] : null;
+        $name = $attributes['alt'] ?? null;
 
         $drawing = new Drawing();
         $drawing->setPath($src);
@@ -884,6 +948,28 @@ class Html extends BaseReader
         );
     }
 
+    private static $borderMappings = [
+        'dash-dot' => Border::BORDER_DASHDOT,
+        'dash-dot-dot' => Border::BORDER_DASHDOTDOT,
+        'dashed' => Border::BORDER_DASHED,
+        'dotted' => Border::BORDER_DOTTED,
+        'double' => Border::BORDER_DOUBLE,
+        'hair' => Border::BORDER_HAIR,
+        'medium' => Border::BORDER_MEDIUM,
+        'medium-dashed' => Border::BORDER_MEDIUMDASHED,
+        'medium-dash-dot' => Border::BORDER_MEDIUMDASHDOT,
+        'medium-dash-dot-dot' => Border::BORDER_MEDIUMDASHDOTDOT,
+        'none' => Border::BORDER_NONE,
+        'slant-dash-dot' => Border::BORDER_SLANTDASHDOT,
+        'solid' => Border::BORDER_THIN,
+        'thick' => Border::BORDER_THICK,
+    ];
+
+    public static function getBorderMappings(): array
+    {
+        return self::$borderMappings;
+    }
+
     /**
      * Map html border style to PhpSpreadsheet border style.
      *
@@ -893,38 +979,7 @@ class Html extends BaseReader
      */
     public function getBorderStyle($style)
     {
-        switch ($style) {
-            case 'solid':
-                return Border::BORDER_THIN;
-            case 'dashed':
-                return Border::BORDER_DASHED;
-            case 'dotted':
-                return Border::BORDER_DOTTED;
-            case 'medium':
-                return Border::BORDER_MEDIUM;
-            case 'thick':
-                return Border::BORDER_THICK;
-            case 'none':
-                return Border::BORDER_NONE;
-            case 'dash-dot':
-                return Border::BORDER_DASHDOT;
-            case 'dash-dot-dot':
-                return Border::BORDER_DASHDOTDOT;
-            case 'double':
-                return Border::BORDER_DOUBLE;
-            case 'hair':
-                return Border::BORDER_HAIR;
-            case 'medium-dash-dot':
-                return Border::BORDER_MEDIUMDASHDOT;
-            case 'medium-dash-dot-dot':
-                return Border::BORDER_MEDIUMDASHDOTDOT;
-            case 'medium-dashed':
-                return Border::BORDER_MEDIUMDASHED;
-            case 'slant-dash-dot':
-                return Border::BORDER_SLANTDASHDOT;
-        }
-
-        return null;
+        return (array_key_exists($style, self::$borderMappings)) ? self::$borderMappings[$style] : null;
     }
 
     /**
diff --git a/tests/PhpSpreadsheetTests/Reader/Html/HtmlBorderTest.php b/tests/PhpSpreadsheetTests/Reader/Html/HtmlBorderTest.php
new file mode 100644
index 00000000..58a0b5d7
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Reader/Html/HtmlBorderTest.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Html;
+
+use PhpOffice\PhpSpreadsheet\Reader\Html;
+use PhpOffice\PhpSpreadsheet\Style\Border;
+use PHPUnit\Framework\TestCase;
+
+class HtmlBorderTest extends TestCase
+{
+    public function testCanApplyInlineBordersStyles(): void
+    {
+        $html = '<table>
+                    <tr>
+                        <td style="border: 1px solid #333333;">Thin border</td>
+                        <td style="border-bottom: 1px dashed #333333;">Border bottom</td>
+                        <td style="border-top: 1px solid #333333;">Border top</td>
+                        <td style="border-left: 1px solid green;">Border left</td>
+                        <td style="border-right: 1px solid #333333;">Border right</td>
+                        <td style="border: none"></td>
+                    </tr>
+                </table>';
+        $filename = HtmlHelper::createHtml($html);
+        $spreadsheet = HtmlHelper::loadHtmlIntoSpreadsheet($filename, true);
+        $firstSheet = $spreadsheet->getSheet(0);
+        $style = $firstSheet->getCell('A1')->getStyle();
+        $borders = $style->getBorders();
+
+        /** @var Border $border */
+        foreach ([$borders->getTop(), $borders->getBottom(), $borders->getLeft(), $borders->getRight()] as $border) {
+            self::assertEquals('333333', $border->getColor()->getRGB());
+            self::assertEquals(Border::BORDER_THIN, $border->getBorderStyle());
+        }
+
+        $style = $firstSheet->getCell('B1')->getStyle();
+        $border = $style->getBorders()->getBottom();
+        self::assertEquals('333333', $border->getColor()->getRGB());
+        self::assertEquals(Border::BORDER_DASHED, $border->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $style->getBorders()->getTop()->getBorderStyle());
+
+        $style = $firstSheet->getCell('C1')->getStyle();
+        $border = $style->getBorders()->getTop();
+        self::assertEquals('333333', $border->getColor()->getRGB());
+        self::assertEquals(Border::BORDER_THIN, $border->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $style->getBorders()->getBottom()->getBorderStyle());
+
+        $style = $firstSheet->getCell('D1')->getStyle();
+        $border = $style->getBorders()->getLeft();
+        self::assertEquals('00ff00', $border->getColor()->getRGB());
+        self::assertEquals(Border::BORDER_THIN, $border->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $style->getBorders()->getBottom()->getBorderStyle());
+
+        $style = $firstSheet->getCell('E1')->getStyle();
+        $border = $style->getBorders()->getRight();
+        self::assertEquals('333333', $border->getColor()->getRGB());
+        self::assertEquals(Border::BORDER_THIN, $border->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $style->getBorders()->getBottom()->getBorderStyle());
+
+        $style = $firstSheet->getCell('F1')->getStyle();
+        $borders = $style->getBorders();
+        foreach ([$borders->getTop(), $borders->getBottom(), $borders->getLeft(), $borders->getRight()] as $border) {
+            self::assertEquals(Border::BORDER_NONE, $border->getBorderStyle());
+        }
+    }
+
+    /**
+     * @dataProvider providerBorderStyle
+     */
+    public function testBorderStyle(string $style, string $expectedResult): void
+    {
+        $borders = Html::getBorderMappings();
+        self::assertEquals($expectedResult, $borders[$style]);
+    }
+
+    public function testBorderStyleCoverage(): void
+    {
+        $expected = Html::getBorderMappings();
+        $covered = [];
+        foreach ($expected as $key => $val) {
+            $covered[$key] = 0;
+        }
+        $tests = $this->providerBorderStyle();
+        foreach ($tests as $test) {
+            $covered[$test[0]] = 1;
+        }
+        foreach ($covered as $key => $val) {
+            self::assertEquals(1, $val, "Borderstyle $key not tested");
+        }
+    }
+
+    public function providerBorderStyle(): array
+    {
+        return [
+            ['dash-dot', Border::BORDER_DASHDOT],
+            ['dash-dot-dot', Border::BORDER_DASHDOTDOT],
+            ['dashed', Border::BORDER_DASHED],
+            ['dotted', Border::BORDER_DOTTED],
+            ['double', Border::BORDER_DOUBLE],
+            ['hair', Border::BORDER_HAIR],
+            ['medium', Border::BORDER_MEDIUM],
+            ['medium-dashed', Border::BORDER_MEDIUMDASHED],
+            ['medium-dash-dot', Border::BORDER_MEDIUMDASHDOT],
+            ['medium-dash-dot-dot', Border::BORDER_MEDIUMDASHDOTDOT],
+            ['none', Border::BORDER_NONE],
+            ['slant-dash-dot', Border::BORDER_SLANTDASHDOT],
+            ['solid', Border::BORDER_THIN],
+            ['thick', Border::BORDER_THICK],
+        ];
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Reader/Html/HtmlHelper.php b/tests/PhpSpreadsheetTests/Reader/Html/HtmlHelper.php
new file mode 100644
index 00000000..c09902ff
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Reader/Html/HtmlHelper.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Html;
+
+use PhpOffice\PhpSpreadsheet\Reader\Html;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+class HtmlHelper
+{
+    public static function createHtml(string $html): string
+    {
+        $filename = tempnam(sys_get_temp_dir(), 'html');
+        file_put_contents($filename, $html);
+
+        return $filename;
+    }
+
+    public static function loadHtmlIntoSpreadsheet(string $filename, bool $unlink = false): Spreadsheet
+    {
+        $html = new Html();
+        $spreadsheet = $html->load($filename);
+        if ($unlink) {
+            unlink($filename);
+        }
+
+        return $spreadsheet;
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Reader/Html/HtmlImageTest.php b/tests/PhpSpreadsheetTests/Reader/Html/HtmlImageTest.php
new file mode 100644
index 00000000..cf4157e3
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Reader/Html/HtmlImageTest.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Html;
+
+use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
+use PHPUnit\Framework\TestCase;
+
+class HtmlImageTest extends TestCase
+{
+    public function testCanInsertImage(): void
+    {
+        $imagePath = realpath(__DIR__ . '/../../../data/Reader/HTML/image.jpg');
+
+        $html = '<table>
+                    <tr>
+                        <td><img src="' . $imagePath . '" alt="test image"></td>
+                    </tr>
+                </table>';
+        $filename = HtmlHelper::createHtml($html);
+        $spreadsheet = HtmlHelper::loadHtmlIntoSpreadsheet($filename, true);
+        $firstSheet = $spreadsheet->getSheet(0);
+
+        /** @var Drawing $drawing */
+        $drawing = $firstSheet->getDrawingCollection()[0];
+        self::assertEquals($imagePath, $drawing->getPath());
+        self::assertEquals('A1', $drawing->getCoordinates());
+        self::assertEquals('test image', $drawing->getName());
+        self::assertEquals('100', $drawing->getWidth());
+        self::assertEquals('100', $drawing->getHeight());
+    }
+
+    public function testCanInsertImageWidth(): void
+    {
+        $imagePath = realpath(__DIR__ . '/../../../data/Reader/HTML/image.jpg');
+
+        $html = '<table>
+                    <tr>
+                        <td><img src="' . $imagePath . '" alt="test image" width="50"></td>
+                    </tr>
+                </table>';
+        $filename = HtmlHelper::createHtml($html);
+        $spreadsheet = HtmlHelper::loadHtmlIntoSpreadsheet($filename, true);
+        $firstSheet = $spreadsheet->getSheet(0);
+
+        /** @var Drawing $drawing */
+        $drawing = $firstSheet->getDrawingCollection()[0];
+        self::assertEquals('50', $drawing->getWidth());
+        self::assertEquals('50', $drawing->getHeight());
+    }
+
+    public function testCanInsertImageHeight(): void
+    {
+        $imagePath = realpath(__DIR__ . '/../../../data/Reader/HTML/image.jpg');
+
+        $html = '<table>
+                    <tr>
+                        <td><img src="' . $imagePath . '" height="75"></td>
+                    </tr>
+                </table>';
+        $filename = HtmlHelper::createHtml($html);
+        $spreadsheet = HtmlHelper::loadHtmlIntoSpreadsheet($filename, true);
+        $firstSheet = $spreadsheet->getSheet(0);
+
+        /** @var Drawing $drawing */
+        $drawing = $firstSheet->getDrawingCollection()[0];
+        self::assertEquals('', $drawing->getName());
+        self::assertEquals('75', $drawing->getWidth());
+        self::assertEquals('75', $drawing->getHeight());
+    }
+
+    public function testImageWithourSrc(): void
+    {
+        $html = '<table>
+                    <tr>
+                        <td><img></td>
+                    </tr>
+                </table>';
+        $filename = HtmlHelper::createHtml($html);
+        $spreadsheet = HtmlHelper::loadHtmlIntoSpreadsheet($filename, true);
+        $firstSheet = $spreadsheet->getSheet(0);
+
+        self::assertCount(0, $firstSheet->getDrawingCollection());
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Reader/Html/HtmlLoadStringTest.php b/tests/PhpSpreadsheetTests/Reader/Html/HtmlLoadStringTest.php
new file mode 100644
index 00000000..e1041507
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Reader/Html/HtmlLoadStringTest.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Html;
+
+use PhpOffice\PhpSpreadsheet\Reader\Exception as ReaderException;
+use PhpOffice\PhpSpreadsheet\Reader\Html;
+use PHPUnit\Framework\TestCase;
+
+class HtmlLoadStringTest extends TestCase
+{
+    public function testCanLoadFromString(): void
+    {
+        $html = '<table>
+                    <tr>
+                        <td>Hello World</td>
+                    </tr>
+                    <tr>
+                        <td>Hello<br />World</td>
+                    </tr>
+                    <tr>
+                        <td>Hello<br>World</td>
+                    </tr>
+                </table>';
+        $spreadsheet = (new Html())->loadFromString($html);
+        $firstSheet = $spreadsheet->getSheet(0);
+
+        $cellStyle = $firstSheet->getStyle('A1');
+        self::assertFalse($cellStyle->getAlignment()->getWrapText());
+
+        $cellStyle = $firstSheet->getStyle('A2');
+        self::assertTrue($cellStyle->getAlignment()->getWrapText());
+        $cellValue = $firstSheet->getCell('A2')->getValue();
+        self::assertStringContainsString("\n", $cellValue);
+
+        $cellStyle = $firstSheet->getStyle('A3');
+        self::assertTrue($cellStyle->getAlignment()->getWrapText());
+        $cellValue = $firstSheet->getCell('A3')->getValue();
+        self::assertStringContainsString("\n", $cellValue);
+    }
+
+    public function testLoadInvalidString(): void
+    {
+        $this->expectException(ReaderException::class);
+        $html = '<table<>';
+        $spreadsheet = (new Html())->loadFromString($html);
+        $firstSheet = $spreadsheet->getSheet(0);
+        $cellStyle = $firstSheet->getStyle('A1');
+        self::assertFalse($cellStyle->getAlignment()->getWrapText());
+    }
+
+    public function testCanLoadFromStringIntoExistingSpreadsheet(): void
+    {
+        $html = '<table>
+                    <tr>
+                        <td>Hello World</td>
+                    </tr>
+                    <tr>
+                        <td>Hello<br />World</td>
+                    </tr>
+                    <tr>
+                        <td>Hello<br>World</td>
+                    </tr>
+                </table>';
+        $reader = new Html();
+        $spreadsheet = $reader->loadFromString($html);
+        $firstSheet = $spreadsheet->getSheet(0);
+
+        $cellStyle = $firstSheet->getStyle('A1');
+        self::assertFalse($cellStyle->getAlignment()->getWrapText());
+
+        $cellStyle = $firstSheet->getStyle('A2');
+        self::assertTrue($cellStyle->getAlignment()->getWrapText());
+        $cellValue = $firstSheet->getCell('A2')->getValue();
+        self::assertStringContainsString("\n", $cellValue);
+
+        $cellStyle = $firstSheet->getStyle('A3');
+        self::assertTrue($cellStyle->getAlignment()->getWrapText());
+        $cellValue = $firstSheet->getCell('A3')->getValue();
+        self::assertStringContainsString("\n", $cellValue);
+
+        $reader->setSheetIndex(1);
+        $html = '<table>
+                    <tr>
+                        <td>Goodbye World</td>
+                    </tr>
+                </table>';
+
+        self::assertEquals(1, $spreadsheet->getSheetCount());
+        $spreadsheet = $reader->loadFromString($html, $spreadsheet);
+        self::assertEquals(2, $spreadsheet->getSheetCount());
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Reader/Html/HtmlTagsTest.php b/tests/PhpSpreadsheetTests/Reader/Html/HtmlTagsTest.php
new file mode 100644
index 00000000..c0c206f9
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Reader/Html/HtmlTagsTest.php
@@ -0,0 +1,236 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Html;
+
+use PhpOffice\PhpSpreadsheet\Reader\Html;
+use PhpOffice\PhpSpreadsheet\Style\Border;
+use PHPUnit\Framework\TestCase;
+
+class HtmlTagsTest extends TestCase
+{
+    public function testTags(): void
+    {
+        $reader = new Html();
+        $html1 = <<<EOF
+<table><tbody>
+<tr><td>1</td><td>2</td><td>3</td></tr>
+<tr><td><a href='www.google.com'>hyperlink</a></td><td>5<hr></td><td>6</td></tr>
+<tr><td>7</td><td>8</td><td>9</td></tr>
+<tr><td>10</td><td>11</td><td>12</td></tr>
+</tbody></table>
+<hr>
+<table><tbody>
+<tr><td>1</td><td><i>2</i></td><td>3</td></tr>
+<tr height='20'><td>4</td><td>5</td><td>6</td></tr>
+<tr><td>7</td><td>8</td><td>9</td></tr>
+<tr><td><ul><li>A</li><li>B</li><li>C</li></ul></td><td>11</td><td>12</td></tr>
+</tbody></table>
+<ul><li>D</li><li>E</li><li>F</li></ul>
+<br>
+<table><tbody>
+<tr><td>M</td>
+<td>
+  <table><tbody>
+  <tr><td>N</td><td>O</td></tr>
+  <tr><td>P</td><td>Q</td></tr>
+  </tbody></table>
+</td>
+<td>R</td>
+</tr>
+<tr><td>S</td><td>T</td><td>U</td></tr>
+</tbody></table>
+EOF;
+        $robj = $reader->loadFromString($html1);
+        $sheet = $robj->getActiveSheet();
+
+        self::assertEquals('www.google.com', $sheet->getCell('A2')->getHyperlink()->getUrl());
+        self::assertEquals('hyperlink', $sheet->getCell('A2')->getValue());
+        self::assertEquals(-1, $sheet->getRowDimension(11)->getRowHeight());
+        self::assertEquals(20, $sheet->getRowDimension(12)->getRowHeight());
+        self::assertEquals(5, $sheet->getCell('B2')->getValue());
+        self::assertEquals(Border::BORDER_THIN, $sheet->getCell('B3')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+        self::assertEquals(6, $sheet->getCell('C4')->getValue());
+        self::assertEquals(Border::BORDER_THIN, $sheet->getCell('A9')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+
+        self::assertEquals(2, $sheet->getCell('B11')->getValue());
+        self::assertTrue($sheet->getCell('B11')->getStyle()->getFont()->getItalic());
+
+        // list within table
+        self::assertEquals("A\nB\nC", $sheet->getCell('A14')->getValue());
+        self::assertTrue($sheet->getCell('A14')->getStyle()->getAlignment()->getWrapText());
+        // list outside of table
+        self::assertEquals('D', $sheet->getCell('A17')->getValue());
+        self::assertEquals('E', $sheet->getCell('A18')->getValue());
+        self::assertEquals('F', $sheet->getCell('A19')->getValue());
+
+        // embedded table
+        self::assertEquals('M', $sheet->getCell('A21')->getValue());
+        self::assertEquals('N', $sheet->getCell('B20')->getValue());
+        self::assertEquals('O', $sheet->getCell('C20')->getValue());
+        self::assertEquals('P', $sheet->getCell('B21')->getValue());
+        self::assertEquals('Q', $sheet->getCell('C21')->getValue());
+        self::assertEquals('R', $sheet->getCell('C23')->getValue());
+        self::assertEquals('S', $sheet->getCell('A24')->getValue());
+    }
+
+    public static function testTagsRowColSpans(): void
+    {
+        $reader = new Html();
+        $html1 = <<<EOF
+<table>
+  <tr>
+    <th>Month</th>
+    <th>Savings</th>
+    <th>Expenses</th>
+  </tr>
+  <tr>
+    <td>January</td>
+    <td>$100</td>
+    <td rowspan="2">$50</td>
+  </tr>
+  <tr>
+    <td>February</td>
+    <td>$80</td>
+  </tr>
+  <tr>
+  <td rowspan="2" colspan="2" bgcolor="#00FFFF">Away in March</td>
+  <td>$30</td>
+  </tr>
+  <tr>
+  <td>$40</td>
+  </tr>
+</table>
+EOF;
+        $robj = $reader->loadFromString($html1);
+        $sheet = $robj->getActiveSheet();
+
+        self::assertEquals(['C2:C3' => 'C2:C3', 'A4:B5' => 'A4:B5'], $sheet->getMergeCells());
+        self::assertEquals('Away in March', $sheet->getCell('A4')->getValue());
+        self::assertEquals('00FFFF', $sheet->getCell('A4')->getStyle()->getFill()->getEndColor()->getRGB());
+    }
+
+    public static function testDoublyEmbeddedTable(): void
+    {
+        $reader = new Html();
+        $html1 = <<<EOF
+<table><tbody>
+<tr><td>1</td><td>2</td><td>3</td></tr>
+<tr><td>4</td><td>5</td><td>6</td></tr>
+<tr><td>7</td><td>8</td><td>9</td></tr>
+<tr><td></td><td></td><td></td></tr>
+<tr><td></td><td></td><td></td></tr>
+<tr><td></td><td></td><td></td></tr>
+<tr><td>M</td>
+<td>
+  <table><tbody>
+  <tr><td>N</td>
+    <td>
+      <table><tbody>
+      <tr><td>10</td><td>11</td></tr>
+      <tr><td>12</td><td>13</td></tr>
+      </tbody></table>
+    </td>
+  <td>Y</td>
+  </tr>
+  <tr><td>P</td><td>Q</td><td>X</td></tr>
+  </tbody></table>
+</td>
+<td>R</td>
+</tr>
+<tr><td>S</td><td>T</td><td>U</td></tr>
+</tbody></table>
+EOF;
+        $robj = $reader->loadFromString($html1);
+        $sheet = $robj->getActiveSheet();
+
+        self::assertEquals('1', $sheet->getCell('A1')->getValue());
+        self::assertEquals('2', $sheet->getCell('B1')->getValue());
+        self::assertEquals('3', $sheet->getCell('C1')->getValue());
+        self::assertEquals('4', $sheet->getCell('A2')->getValue());
+        self::assertEquals('5', $sheet->getCell('B2')->getValue());
+        self::assertEquals('6', $sheet->getCell('C2')->getValue());
+        self::assertEquals('7', $sheet->getCell('A3')->getValue());
+        self::assertEquals('8', $sheet->getCell('B3')->getValue());
+        self::assertEquals('9', $sheet->getCell('C3')->getValue());
+        self::assertEquals('10', $sheet->getCell('C5')->getValue());
+        self::assertEquals('11', $sheet->getCell('D5')->getValue());
+        self::assertEquals('12', $sheet->getCell('C6')->getValue());
+        self::assertEquals('13', $sheet->getCell('D6')->getValue());
+        self::assertEquals('N', $sheet->getCell('B6')->getValue());
+        self::assertEquals('M', $sheet->getCell('A7')->getValue());
+        self::assertEquals('Y', $sheet->getCell('E7')->getValue());
+        self::assertEquals('P', $sheet->getCell('B8')->getValue());
+        self::assertEquals('Q', $sheet->getCell('C8')->getValue());
+        self::assertEquals('X', $sheet->getCell('D8')->getValue());
+        self::assertEquals('R', $sheet->getCell('C10')->getValue());
+        self::assertEquals('S', $sheet->getCell('A11')->getValue());
+        self::assertEquals('T', $sheet->getCell('B11')->getValue());
+        self::assertEquals('U', $sheet->getCell('C11')->getValue());
+    }
+
+    public static function testTagsOutsideTable(): void
+    {
+        $reader = new Html();
+        $html1 = <<<EOF
+<h1>Here comes a list</h1>
+<ol>
+<li>Item 1</li>
+<li>Item 2</li>
+<li>Item 3</li>
+<li>Item 4</li>
+</ol>
+And here's another
+<ul>
+<li>Item A</li>
+<li>Item B</li>
+</ul>
+<ol>
+Content before list
+<li>Item I</li>
+<li>Item II</li>
+<li>This <i>is</i> <span style='color: #ff0000;'>rich</span> text</li>
+</ol>
+
+EOF;
+        $robj = $reader->loadFromString($html1);
+        $sheet = $robj->getActiveSheet();
+
+        self::assertTrue($sheet->getCell('A1')->getStyle()->getFont()->getBold());
+        self::assertEquals('Here comes a list', $sheet->getCell('A1')->getValue());
+        self::assertEquals('Item 1', $sheet->getCell('A3')->getValue());
+        self::assertEquals('Item 2', $sheet->getCell('A4')->getValue());
+        self::assertEquals('Item 3', $sheet->getCell('A5')->getValue());
+        self::assertEquals('Item 4', $sheet->getCell('A6')->getValue());
+        self::assertEquals('And here\'s another', $sheet->getCell('A7')->getValue());
+        self::assertEquals('Item A', $sheet->getCell('A9')->getValue());
+        self::assertEquals('Item B', $sheet->getCell('A10')->getValue());
+        self::assertEquals('Content before list', $sheet->getCell('A11')->getValue());
+        self::assertEquals('Item I', $sheet->getCell('A12')->getValue());
+        self::assertEquals('Item II', $sheet->getCell('A13')->getValue());
+        // TODO Rich Text not yet supported
+    }
+
+    public static function testHyperlinksWithRowspan(): void
+    {
+        $reader = new Html();
+        $html1 = <<<EOF
+<table>
+	<tr>
+		<td rowspan="3">Title</td>
+		<td><a href="https://google.com">Link 1</a></td>
+	</tr>
+	<tr>
+		<td><a href="https://google.com">Link 2</a></td>
+	</tr>
+	<tr>
+		<td><a href="https://google.com">Link 3</a></td>
+	</tr>
+</table>
+EOF;
+        $robj = $reader->loadFromString($html1);
+        $sheet = $robj->getActiveSheet();
+        self::assertEquals('https://google.com', $sheet->getCell('B1')->getHyperlink()->getUrl());
+        self::assertEquals('https://google.com', $sheet->getCell('B2')->getHyperlink()->getUrl());
+        self::assertEquals('https://google.com', $sheet->getCell('B3')->getHyperlink()->getUrl());
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Reader/HtmlTest.php b/tests/PhpSpreadsheetTests/Reader/Html/HtmlTest.php
similarity index 53%
rename from tests/PhpSpreadsheetTests/Reader/HtmlTest.php
rename to tests/PhpSpreadsheetTests/Reader/Html/HtmlTest.php
index b0994a33..e87e636b 100644
--- a/tests/PhpSpreadsheetTests/Reader/HtmlTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Html/HtmlTest.php
@@ -1,12 +1,11 @@
 <?php
 
-namespace PhpOffice\PhpSpreadsheetTests\Reader;
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Html;
 
+use PhpOffice\PhpSpreadsheet\Reader\Exception as ReaderException;
 use PhpOffice\PhpSpreadsheet\Reader\Html;
 use PhpOffice\PhpSpreadsheet\Style\Alignment;
-use PhpOffice\PhpSpreadsheet\Style\Border;
 use PhpOffice\PhpSpreadsheet\Style\Font;
-use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
 use PHPUnit\Framework\TestCase;
 
 class HtmlTest extends TestCase
@@ -18,6 +17,33 @@ class HtmlTest extends TestCase
         self::assertFalse($reader->canRead($filename));
     }
 
+    public function testBadHtml(): void
+    {
+        $this->expectException(ReaderException::class);
+        $filename = 'tests/data/Reader/HTML/badhtml.html';
+        $reader = new Html();
+        self::assertTrue($reader->canRead($filename));
+        $spreadsheet = $reader->load($filename);
+        self::assertTrue(false);
+    }
+
+    public function testNonHtml(): void
+    {
+        $this->expectException(ReaderException::class);
+        $filename = __FILE__;
+        $reader = new Html();
+        self::assertFalse($reader->canRead($filename));
+        $spreadsheet = $reader->load($filename);
+        self::assertTrue(false);
+    }
+
+    public function testInvalidFilename(): void
+    {
+        $reader = new Html();
+        self::assertEquals(0, $reader->getSheetIndex());
+        self::assertFalse($reader->canRead(''));
+    }
+
     public function providerCanReadVerySmallFile()
     {
         $padding = str_repeat('a', 2048);
@@ -38,7 +64,7 @@ class HtmlTest extends TestCase
      */
     public function testCanReadVerySmallFile($expected, $content): void
     {
-        $filename = $this->createHtml($content);
+        $filename = HtmlHelper::createHtml($content);
         $reader = new Html();
         $actual = $reader->canRead($filename);
 
@@ -51,63 +77,21 @@ class HtmlTest extends TestCase
     {
         $html = '<table>
                     <tr>
-                        <td style="background-color: #000000;color: #FFFFFF">Blue background</td>
+                        <td style="background-color: #0000FF;color: #FFFFFF">Blue background</td>
+                        <td style="background-color: unknown1;color: unknown2">Unknown fore/background</td>
                     </tr>
                 </table>';
-        $filename = $this->createHtml($html);
-        $spreadsheet = $this->loadHtmlIntoSpreadsheet($filename);
+        $filename = HtmlHelper::createHtml($html);
+        $spreadsheet = HtmlHelper::loadHtmlIntoSpreadsheet($filename, true);
         $firstSheet = $spreadsheet->getSheet(0);
         $style = $firstSheet->getCell('A1')->getStyle();
-
         self::assertEquals('FFFFFF', $style->getFont()->getColor()->getRGB());
-
-        unlink($filename);
-    }
-
-    public function testCanApplyInlineBordersStyles(): void
-    {
-        $html = '<table>
-                    <tr>
-                        <td style="border: 1px solid #333333;">Thin border</td>
-                        <td style="border-bottom: 1px solid #333333;">Border bottom</td>
-                        <td style="border-top: 1px solid #333333;">Border top</td>
-                        <td style="border-left: 1px solid #333333;">Border left</td>
-                        <td style="border-right: 1px solid #333333;">Border right</td>
-                    </tr>
-                </table>';
-        $filename = $this->createHtml($html);
-        $spreadsheet = $this->loadHtmlIntoSpreadsheet($filename);
-        $firstSheet = $spreadsheet->getSheet(0);
-        $style = $firstSheet->getCell('A1')->getStyle();
-        $borders = $style->getBorders();
-
-        /** @var Border $border */
-        foreach ([$borders->getTop(), $borders->getBottom(), $borders->getLeft(), $borders->getRight()] as $border) {
-            self::assertEquals('333333', $border->getColor()->getRGB());
-            self::assertEquals(Border::BORDER_THIN, $border->getBorderStyle());
-        }
-
+        self::assertEquals('0000FF', $style->getFill()->getStartColor()->getRGB());
+        self::assertEquals('0000FF', $style->getFill()->getEndColor()->getRGB());
         $style = $firstSheet->getCell('B1')->getStyle();
-        $border = $style->getBorders()->getBottom();
-        self::assertEquals('333333', $border->getColor()->getRGB());
-        self::assertEquals(Border::BORDER_THIN, $border->getBorderStyle());
-
-        $style = $firstSheet->getCell('C1')->getStyle();
-        $border = $style->getBorders()->getTop();
-        self::assertEquals('333333', $border->getColor()->getRGB());
-        self::assertEquals(Border::BORDER_THIN, $border->getBorderStyle());
-
-        $style = $firstSheet->getCell('D1')->getStyle();
-        $border = $style->getBorders()->getLeft();
-        self::assertEquals('333333', $border->getColor()->getRGB());
-        self::assertEquals(Border::BORDER_THIN, $border->getBorderStyle());
-
-        $style = $firstSheet->getCell('E1')->getStyle();
-        $border = $style->getBorders()->getRight();
-        self::assertEquals('333333', $border->getColor()->getRGB());
-        self::assertEquals(Border::BORDER_THIN, $border->getBorderStyle());
-
-        unlink($filename);
+        self::assertEquals('000000', $style->getFont()->getColor()->getRGB());
+        self::assertEquals('000000', $style->getFill()->getEndColor()->getRGB());
+        self::assertEquals('FFFFFF', $style->getFill()->getstartColor()->getRGB());
     }
 
     public function testCanApplyInlineFontStyles(): void
@@ -122,8 +106,8 @@ class HtmlTest extends TestCase
                         <td style="text-decoration: line-through;">Line through</td>
                     </tr>
                 </table>';
-        $filename = $this->createHtml($html);
-        $spreadsheet = $this->loadHtmlIntoSpreadsheet($filename);
+        $filename = HtmlHelper::createHtml($html);
+        $spreadsheet = HtmlHelper::loadHtmlIntoSpreadsheet($filename, true);
         $firstSheet = $spreadsheet->getSheet(0);
 
         $style = $firstSheet->getCell('A1')->getStyle();
@@ -143,8 +127,6 @@ class HtmlTest extends TestCase
 
         $style = $firstSheet->getCell('F1')->getStyle();
         self::assertTrue($style->getFont()->getStrikethrough());
-
-        unlink($filename);
     }
 
     public function testCanApplyInlineWidth(): void
@@ -155,8 +137,8 @@ class HtmlTest extends TestCase
                         <td style="width: 100px;">100px</td>
                     </tr>
                 </table>';
-        $filename = $this->createHtml($html);
-        $spreadsheet = $this->loadHtmlIntoSpreadsheet($filename);
+        $filename = HtmlHelper::createHtml($html);
+        $spreadsheet = HtmlHelper::loadHtmlIntoSpreadsheet($filename, true);
         $firstSheet = $spreadsheet->getSheet(0);
 
         $dimension = $firstSheet->getColumnDimension('A');
@@ -164,8 +146,6 @@ class HtmlTest extends TestCase
 
         $dimension = $firstSheet->getColumnDimension('B');
         self::assertEquals(100, $dimension->getWidth());
-
-        unlink($filename);
     }
 
     public function testCanApplyInlineHeight(): void
@@ -178,8 +158,8 @@ class HtmlTest extends TestCase
                         <td style="height: 100px;">2</td>
                     </tr>
                 </table>';
-        $filename = $this->createHtml($html);
-        $spreadsheet = $this->loadHtmlIntoSpreadsheet($filename);
+        $filename = HtmlHelper::createHtml($html);
+        $spreadsheet = HtmlHelper::loadHtmlIntoSpreadsheet($filename, true);
         $firstSheet = $spreadsheet->getSheet(0);
 
         $dimension = $firstSheet->getRowDimension(1);
@@ -187,8 +167,6 @@ class HtmlTest extends TestCase
 
         $dimension = $firstSheet->getRowDimension(2);
         self::assertEquals(100, $dimension->getRowHeight());
-
-        unlink($filename);
     }
 
     public function testCanApplyAlignment(): void
@@ -203,8 +181,8 @@ class HtmlTest extends TestCase
                         <td style="word-wrap: break-word;">Wraptext</td>
                     </tr>
                 </table>';
-        $filename = $this->createHtml($html);
-        $spreadsheet = $this->loadHtmlIntoSpreadsheet($filename);
+        $filename = HtmlHelper::createHtml($html);
+        $spreadsheet = HtmlHelper::loadHtmlIntoSpreadsheet($filename, true);
         $firstSheet = $spreadsheet->getSheet(0);
 
         $style = $firstSheet->getCell('A1')->getStyle();
@@ -224,8 +202,6 @@ class HtmlTest extends TestCase
 
         $style = $firstSheet->getCell('F1')->getStyle();
         self::assertTrue($style->getAlignment()->getWrapText());
-
-        unlink($filename);
     }
 
     public function testCanApplyInlineDataFormat(): void
@@ -235,35 +211,12 @@ class HtmlTest extends TestCase
                         <td data-format="mmm-yy">2019-02-02 12:34:00</td>
                     </tr>
                 </table>';
-        $filename = $this->createHtml($html);
-        $spreadsheet = $this->loadHtmlIntoSpreadsheet($filename);
+        $filename = HtmlHelper::createHtml($html);
+        $spreadsheet = HtmlHelper::loadHtmlIntoSpreadsheet($filename, true);
         $firstSheet = $spreadsheet->getSheet(0);
 
         $style = $firstSheet->getCell('A1')->getStyle();
         self::assertEquals('mmm-yy', $style->getNumberFormat()->getFormatCode());
-
-        unlink($filename);
-    }
-
-    public function testCanInsertImage(): void
-    {
-        $imagePath = realpath(__DIR__ . '/../../data/Reader/HTML/image.jpg');
-
-        $html = '<table>
-                    <tr>
-                        <td><img src="' . $imagePath . '" alt=""></td>
-                    </tr>
-                </table>';
-        $filename = $this->createHtml($html);
-        $spreadsheet = $this->loadHtmlIntoSpreadsheet($filename);
-        $firstSheet = $spreadsheet->getSheet(0);
-
-        /** @var Drawing $drawing */
-        $drawing = $firstSheet->getDrawingCollection()[0];
-        self::assertEquals($imagePath, $drawing->getPath());
-        self::assertEquals('A1', $drawing->getCoordinates());
-
-        unlink($filename);
     }
 
     public function testCanApplyCellWrapping(): void
@@ -279,8 +232,8 @@ class HtmlTest extends TestCase
                         <td>Hello<br>World</td>
                     </tr>
                 </table>';
-        $filename = $this->createHtml($html);
-        $spreadsheet = $this->loadHtmlIntoSpreadsheet($filename);
+        $filename = HtmlHelper::createHtml($html);
+        $spreadsheet = HtmlHelper::loadHtmlIntoSpreadsheet($filename, true);
         $firstSheet = $spreadsheet->getSheet(0);
 
         $cellStyle = $firstSheet->getStyle('A1');
@@ -295,103 +248,6 @@ class HtmlTest extends TestCase
         self::assertTrue($cellStyle->getAlignment()->getWrapText());
         $cellValue = $firstSheet->getCell('A3')->getValue();
         self::assertStringContainsString("\n", $cellValue);
-
-        unlink($filename);
-    }
-
-    public function testCanLoadFromString(): void
-    {
-        $html = '<table>
-                    <tr>
-                        <td>Hello World</td>
-                    </tr>
-                    <tr>
-                        <td>Hello<br />World</td>
-                    </tr>
-                    <tr>
-                        <td>Hello<br>World</td>
-                    </tr>
-                </table>';
-        $spreadsheet = (new Html())->loadFromString($html);
-        $firstSheet = $spreadsheet->getSheet(0);
-
-        $cellStyle = $firstSheet->getStyle('A1');
-        self::assertFalse($cellStyle->getAlignment()->getWrapText());
-
-        $cellStyle = $firstSheet->getStyle('A2');
-        self::assertTrue($cellStyle->getAlignment()->getWrapText());
-        $cellValue = $firstSheet->getCell('A2')->getValue();
-        self::assertStringContainsString("\n", $cellValue);
-
-        $cellStyle = $firstSheet->getStyle('A3');
-        self::assertTrue($cellStyle->getAlignment()->getWrapText());
-        $cellValue = $firstSheet->getCell('A3')->getValue();
-        self::assertStringContainsString("\n", $cellValue);
-    }
-
-    public function testCanLoadFromStringIntoExistingSpreadsheet(): void
-    {
-        $html = '<table>
-                    <tr>
-                        <td>Hello World</td>
-                    </tr>
-                    <tr>
-                        <td>Hello<br />World</td>
-                    </tr>
-                    <tr>
-                        <td>Hello<br>World</td>
-                    </tr>
-                </table>';
-        $reader = new Html();
-        $spreadsheet = $reader->loadFromString($html);
-        $firstSheet = $spreadsheet->getSheet(0);
-
-        $cellStyle = $firstSheet->getStyle('A1');
-        self::assertFalse($cellStyle->getAlignment()->getWrapText());
-
-        $cellStyle = $firstSheet->getStyle('A2');
-        self::assertTrue($cellStyle->getAlignment()->getWrapText());
-        $cellValue = $firstSheet->getCell('A2')->getValue();
-        self::assertStringContainsString("\n", $cellValue);
-
-        $cellStyle = $firstSheet->getStyle('A3');
-        self::assertTrue($cellStyle->getAlignment()->getWrapText());
-        $cellValue = $firstSheet->getCell('A3')->getValue();
-        self::assertStringContainsString("\n", $cellValue);
-
-        $reader->setSheetIndex(1);
-        $html = '<table>
-                    <tr>
-                        <td>Goodbye World</td>
-                    </tr>
-                </table>';
-
-        self::assertEquals(1, $spreadsheet->getSheetCount());
-        $spreadsheet = $reader->loadFromString($html, $spreadsheet);
-        self::assertEquals(2, $spreadsheet->getSheetCount());
-    }
-
-    /**
-     * @param string $html
-     *
-     * @return string
-     */
-    private function createHtml($html)
-    {
-        $filename = tempnam(sys_get_temp_dir(), 'html');
-        file_put_contents($filename, $html);
-
-        return $filename;
-    }
-
-    /**
-     * @param $filename
-     *
-     * @return \PhpOffice\PhpSpreadsheet\Spreadsheet
-     */
-    private function loadHtmlIntoSpreadsheet($filename)
-    {
-        return (new Html())->load($filename);
     }
 
     public function testRowspanInRendering(): void
@@ -417,11 +273,10 @@ class HtmlTest extends TestCase
                     <td style="text-indent:10px">Text Indent</td>
                   </tr>
                 </table>';
-        $filename = $this->createHtml($html);
-        $spreadsheet = $this->loadHtmlIntoSpreadsheet($filename);
+        $filename = HtmlHelper::createHtml($html);
+        $spreadsheet = HtmlHelper::loadHtmlIntoSpreadsheet($filename, true);
         $firstSheet = $spreadsheet->getSheet(0);
         $style = $firstSheet->getCell('C2')->getStyle();
         self::assertEquals(10, $style->getAlignment()->getIndent());
-        unlink($filename);
     }
 }
diff --git a/tests/data/Reader/HTML/badhtml.html b/tests/data/Reader/HTML/badhtml.html
new file mode 100644
index 00000000..6816fb08
--- /dev/null
+++ b/tests/data/Reader/HTML/badhtml.html
@@ -0,0 +1 @@
+<table<>

From 752a0a5a6c00f89f8cea6f3ea3584bd5ebac4086 Mon Sep 17 00:00:00 2001
From: Owen Leibman <eclipsechasers2@yahoo.com>
Date: Thu, 25 Jun 2020 23:11:30 -0700
Subject: [PATCH 044/153] Scrutinizer Recommendations

Two unneeded assignments in tests, one unused parameter in source code.
---
 src/PhpSpreadsheet/Reader/Html.php                 | 4 ++--
 tests/PhpSpreadsheetTests/Reader/Html/HtmlTest.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/PhpSpreadsheet/Reader/Html.php b/src/PhpSpreadsheet/Reader/Html.php
index 7cb14f49..a83ed807 100644
--- a/src/PhpSpreadsheet/Reader/Html.php
+++ b/src/PhpSpreadsheet/Reader/Html.php
@@ -506,7 +506,7 @@ class Html extends BaseReader
         if ($child->nodeName !== 'td' && $child->nodeName !== 'th') {
             $this->processDomElement($child, $sheet, $row, $column, $cellContent);
         } else {
-            $this->processDomElementThTd($element, $sheet, $row, $column, $cellContent, $child, $attributeArray);
+            $this->processDomElementThTd($sheet, $row, $column, $cellContent, $child, $attributeArray);
         }
     }
 
@@ -559,7 +559,7 @@ class Html extends BaseReader
         }
     }
 
-    private function processDomElementThTd(DOMNode $element, Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    private function processDomElementThTd(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
     {
         while (isset($this->rowspan[$column . $row])) {
             ++$column;
diff --git a/tests/PhpSpreadsheetTests/Reader/Html/HtmlTest.php b/tests/PhpSpreadsheetTests/Reader/Html/HtmlTest.php
index e87e636b..91e60d3e 100644
--- a/tests/PhpSpreadsheetTests/Reader/Html/HtmlTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Html/HtmlTest.php
@@ -23,7 +23,7 @@ class HtmlTest extends TestCase
         $filename = 'tests/data/Reader/HTML/badhtml.html';
         $reader = new Html();
         self::assertTrue($reader->canRead($filename));
-        $spreadsheet = $reader->load($filename);
+        $reader->load($filename);
         self::assertTrue(false);
     }
 
@@ -33,7 +33,7 @@ class HtmlTest extends TestCase
         $filename = __FILE__;
         $reader = new Html();
         self::assertFalse($reader->canRead($filename));
-        $spreadsheet = $reader->load($filename);
+        $reader->load($filename);
         self::assertTrue(false);
     }
 

From 9f1a33cc8a386b97d2c330ec8cef1f6250a1e7e0 Mon Sep 17 00:00:00 2001
From: Owen Leibman <eclipsechasers2@yahoo.com>
Date: Thu, 25 Jun 2020 23:39:28 -0700
Subject: [PATCH 045/153] Scrutinizer Again

Cascading series of unused unused parameters.
---
 src/PhpSpreadsheet/Reader/Html.php | 48 +++++++++++++++---------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/PhpSpreadsheet/Reader/Html.php b/src/PhpSpreadsheet/Reader/Html.php
index a83ed807..1e34de0e 100644
--- a/src/PhpSpreadsheet/Reader/Html.php
+++ b/src/PhpSpreadsheet/Reader/Html.php
@@ -298,7 +298,7 @@ class Html extends BaseReader
         $cellContent = (string) '';
     }
 
-    private function processDomElementBody(DOMNode $element, Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child): void
+    private function processDomElementBody(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child): void
     {
         $attributeArray = [];
         foreach ($child->attributes as $attribute) {
@@ -312,24 +312,24 @@ class Html extends BaseReader
             $this->tableLevel = 0;
             $this->processDomElement($child, $sheet, $row, $column, $cellContent);
         } else {
-            $this->processDomElementTitle($element, $sheet, $row, $column, $cellContent, $child, $attributeArray);
+            $this->processDomElementTitle($sheet, $row, $column, $cellContent, $child, $attributeArray);
         }
     }
 
-    private function processDomElementTitle(DOMNode $element, Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    private function processDomElementTitle(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
     {
         if ($child->nodeName === 'title') {
             $this->processDomElement($child, $sheet, $row, $column, $cellContent);
             $sheet->setTitle($cellContent, true, false);
             $cellContent = '';
         } else {
-            $this->processDomElementSpanEtc($element, $sheet, $row, $column, $cellContent, $child, $attributeArray);
+            $this->processDomElementSpanEtc($sheet, $row, $column, $cellContent, $child, $attributeArray);
         }
     }
 
     private static $spanEtc = ['span', 'div', 'font', 'i', 'em', 'strong', 'b'];
 
-    private function processDomElementSpanEtc(DOMNode $element, Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    private function processDomElementSpanEtc(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
     {
         if (in_array($child->nodeName, self::$spanEtc)) {
             if (isset($attributeArray['class']) && $attributeArray['class'] === 'comment') {
@@ -343,11 +343,11 @@ class Html extends BaseReader
                 $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
             }
         } else {
-            $this->processDomElementHr($element, $sheet, $row, $column, $cellContent, $child, $attributeArray);
+            $this->processDomElementHr($sheet, $row, $column, $cellContent, $child, $attributeArray);
         }
     }
 
-    private function processDomElementHr(DOMNode $element, Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    private function processDomElementHr(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
     {
         if ($child->nodeName === 'hr') {
             $this->flushCell($sheet, $column, $row, $cellContent);
@@ -358,10 +358,10 @@ class Html extends BaseReader
             ++$row;
         }
         // fall through to br
-        $this->processDomElementBr($element, $sheet, $row, $column, $cellContent, $child, $attributeArray);
+        $this->processDomElementBr($sheet, $row, $column, $cellContent, $child, $attributeArray);
     }
 
-    private function processDomElementBr(DOMNode $element, Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    private function processDomElementBr(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
     {
         if ($child->nodeName === 'br' || $child->nodeName === 'hr') {
             if ($this->tableLevel > 0) {
@@ -374,11 +374,11 @@ class Html extends BaseReader
                 ++$row;
             }
         } else {
-            $this->processDomElementA($element, $sheet, $row, $column, $cellContent, $child, $attributeArray);
+            $this->processDomElementA($sheet, $row, $column, $cellContent, $child, $attributeArray);
         }
     }
 
-    private function processDomElementA(DOMNode $element, Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    private function processDomElementA(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
     {
         if ($child->nodeName === 'a') {
             foreach ($attributeArray as $attributeName => $attributeValue) {
@@ -400,13 +400,13 @@ class Html extends BaseReader
             //$cellContent .= ' ';
             $this->processDomElement($child, $sheet, $row, $column, $cellContent);
         } else {
-            $this->processDomElementH1Etc($element, $sheet, $row, $column, $cellContent, $child, $attributeArray);
+            $this->processDomElementH1Etc($sheet, $row, $column, $cellContent, $child, $attributeArray);
         }
     }
 
     private static $h1Etc = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'ol', 'ul', 'p'];
 
-    private function processDomElementH1Etc(DOMNode $element, Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    private function processDomElementH1Etc(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
     {
         if (in_array($child->nodeName, self::$h1Etc)) {
             if ($this->tableLevel > 0) {
@@ -430,11 +430,11 @@ class Html extends BaseReader
                 $column = 'A';
             }
         } else {
-            $this->processDomElementLi($element, $sheet, $row, $column, $cellContent, $child, $attributeArray);
+            $this->processDomElementLi($sheet, $row, $column, $cellContent, $child, $attributeArray);
         }
     }
 
-    private function processDomElementLi(DOMNode $element, Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    private function processDomElementLi(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
     {
         if ($child->nodeName === 'li') {
             if ($this->tableLevel > 0) {
@@ -451,20 +451,20 @@ class Html extends BaseReader
                 $column = 'A';
             }
         } else {
-            $this->processDomElementImg($element, $sheet, $row, $column, $cellContent, $child, $attributeArray);
+            $this->processDomElementImg($sheet, $row, $column, $cellContent, $child, $attributeArray);
         }
     }
 
-    private function processDomElementImg(DOMNode $element, Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    private function processDomElementImg(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
     {
         if ($child->nodeName === 'img') {
             $this->insertImage($sheet, $column, $row, $attributeArray);
         } else {
-            $this->processDomElementTable($element, $sheet, $row, $column, $cellContent, $child, $attributeArray);
+            $this->processDomElementTable($sheet, $row, $column, $cellContent, $child, $attributeArray);
         }
     }
 
-    private function processDomElementTable(DOMNode $element, Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    private function processDomElementTable(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
     {
         if ($child->nodeName === 'table') {
             $this->flushCell($sheet, $column, $row, $cellContent);
@@ -480,11 +480,11 @@ class Html extends BaseReader
                 ++$row;
             }
         } else {
-            $this->processDomElementTr($element, $sheet, $row, $column, $cellContent, $child, $attributeArray);
+            $this->processDomElementTr($sheet, $row, $column, $cellContent, $child, $attributeArray);
         }
     }
 
-    private function processDomElementTr(DOMNode $element, Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    private function processDomElementTr(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
     {
         if ($child->nodeName === 'tr') {
             $column = $this->getTableStartColumn();
@@ -497,11 +497,11 @@ class Html extends BaseReader
 
             ++$row;
         } else {
-            $this->processDomElementThTdOther($element, $sheet, $row, $column, $cellContent, $child, $attributeArray);
+            $this->processDomElementThTdOther($sheet, $row, $column, $cellContent, $child, $attributeArray);
         }
     }
 
-    private function processDomElementThTdOther(DOMNode $element, Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
+    private function processDomElementThTdOther(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child, array &$attributeArray): void
     {
         if ($child->nodeName !== 'td' && $child->nodeName !== 'th') {
             $this->processDomElement($child, $sheet, $row, $column, $cellContent);
@@ -622,7 +622,7 @@ class Html extends BaseReader
                 //    but if we have a rich text run instead, we need to append it correctly
                     //    TODO
             } elseif ($child instanceof DOMElement) {
-                $this->processDomElementBody($element, $sheet, $row, $column, $cellContent, $child);
+                $this->processDomElementBody($sheet, $row, $column, $cellContent, $child);
             }
         }
     }

From a264cafe4c2541c8a3f0d6cb2147ae6843b5aa3a Mon Sep 17 00:00:00 2001
From: Mark Baker <mark@lange.demon.co.uk>
Date: Sat, 27 Jun 2020 23:03:25 +0200
Subject: [PATCH 046/153] Helper class for the conversion of cell addresses
 between A1 and R1C1 formats, and vice-versa (#1558)

* Helper class for the conversion of cell addresses between A1 and R1C1 formats, and vice-versa
---
 src/PhpSpreadsheet/Cell/AddressHelper.php     |  88 ++++++++++++++
 .../Cell/AddressHelperTest.php                | 108 ++++++++++++++++++
 .../data/Cell/A1ConversionToR1C1Absolute.php  |  15 +++
 .../data/Cell/A1ConversionToR1C1Exception.php |   5 +
 .../data/Cell/A1ConversionToR1C1Relative.php  |  19 +++
 .../data/Cell/R1C1ConversionToA1Absolute.php  |  14 +++
 .../data/Cell/R1C1ConversionToA1Exception.php |   9 ++
 .../data/Cell/R1C1ConversionToA1Relative.php  |  14 +++
 8 files changed, 272 insertions(+)
 create mode 100644 src/PhpSpreadsheet/Cell/AddressHelper.php
 create mode 100644 tests/PhpSpreadsheetTests/Cell/AddressHelperTest.php
 create mode 100644 tests/data/Cell/A1ConversionToR1C1Absolute.php
 create mode 100644 tests/data/Cell/A1ConversionToR1C1Exception.php
 create mode 100644 tests/data/Cell/A1ConversionToR1C1Relative.php
 create mode 100644 tests/data/Cell/R1C1ConversionToA1Absolute.php
 create mode 100644 tests/data/Cell/R1C1ConversionToA1Exception.php
 create mode 100644 tests/data/Cell/R1C1ConversionToA1Relative.php

diff --git a/src/PhpSpreadsheet/Cell/AddressHelper.php b/src/PhpSpreadsheet/Cell/AddressHelper.php
new file mode 100644
index 00000000..77a521b0
--- /dev/null
+++ b/src/PhpSpreadsheet/Cell/AddressHelper.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+
+class AddressHelper
+{
+    /**
+     * Converts an R1C1 format cell address to an A1 format cell address.
+     */
+    public static function convertToA1(
+        string $address,
+        int $currentRowNumber = 1,
+        int $currentColumnNumber = 1
+    ): string {
+        $validityCheck = preg_match('/^(R(\[?-?\d*\]?))(C(\[?-?\d*\]?))$/i', $address, $cellReference);
+
+        if ($validityCheck === 0) {
+            throw new Exception('Invalid R1C1-format Cell Reference');
+        }
+
+        $rowReference = $cellReference[2];
+        //    Empty R reference is the current row
+        if ($rowReference === '') {
+            $rowReference = (string) $currentRowNumber;
+        }
+        //    Bracketed R references are relative to the current row
+        if ($rowReference[0] === '[') {
+            $rowReference = $currentRowNumber + trim($rowReference, '[]');
+        }
+        $columnReference = $cellReference[4];
+        //    Empty C reference is the current column
+        if ($columnReference === '') {
+            $columnReference = (string) $currentColumnNumber;
+        }
+        //    Bracketed C references are relative to the current column
+        if ($columnReference[0] === '[') {
+            $columnReference = $currentColumnNumber + trim($columnReference, '[]');
+        }
+
+        if ($columnReference <= 0 || $rowReference <= 0) {
+            throw new Exception('Invalid R1C1-format Cell Reference, Value out of range');
+        }
+        $A1CellReference = Coordinate::stringFromColumnIndex($columnReference) . $rowReference;
+
+        return $A1CellReference;
+    }
+
+    /**
+     * Converts an A1 format cell address to an R1C1 format cell address.
+     * If $currentRowNumber or $currentColumnNumber are provided, then the R1C1 address will be formatted as a relative address.
+     */
+    public static function convertToR1C1(
+        string $address,
+        ?int $currentRowNumber = null,
+        ?int $currentColumnNumber = null
+    ): string {
+        $validityCheck = preg_match('/^\$?([A-Z]{1,3})\$?(\d{1,7})$/i', $address, $cellReference);
+
+        if ($validityCheck === 0) {
+            throw new Exception('Invalid A1-format Cell Reference');
+        }
+
+        $columnId = Coordinate::columnIndexFromString($cellReference[1]);
+        $rowId = (int) $cellReference[2];
+
+        if ($currentRowNumber !== null) {
+            if ($rowId === $currentRowNumber) {
+                $rowId = '';
+            } else {
+                $rowId = '[' . ($rowId - $currentRowNumber) . ']';
+            }
+        }
+
+        if ($currentColumnNumber !== null) {
+            if ($columnId === $currentColumnNumber) {
+                $columnId = '';
+            } else {
+                $columnId = '[' . ($columnId - $currentColumnNumber) . ']';
+            }
+        }
+
+        $R1C1Address = "R{$rowId}C{$columnId}";
+
+        return $R1C1Address;
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Cell/AddressHelperTest.php b/tests/PhpSpreadsheetTests/Cell/AddressHelperTest.php
new file mode 100644
index 00000000..9b21767b
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Cell/AddressHelperTest.php
@@ -0,0 +1,108 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Cell;
+
+use PhpOffice\PhpSpreadsheet\Cell\AddressHelper;
+use PhpOffice\PhpSpreadsheet\Exception;
+use PHPUnit\Framework\TestCase;
+
+class AddressHelperTest extends TestCase
+{
+    /**
+     * @dataProvider providerR1C1ConversionToA1Absolute
+     */
+    public function testR1C1ConversionToA1Absolute(string $expectedValue, string $address): void
+    {
+        $actualValue = AddressHelper::convertToA1($address);
+
+        self::assertSame($expectedValue, $actualValue);
+    }
+
+    public function providerR1C1ConversionToA1Absolute()
+    {
+        return require 'tests/data/Cell/R1C1ConversionToA1Absolute.php';
+    }
+
+    /**
+     * @dataProvider providerR1C1ConversionToA1Relative
+     */
+    public function testR1C1ConversionToA1Relative(string $expectedValue, string $address, ?int $row = null, ?int $column = null): void
+    {
+        $args = [$address];
+        if ($row !== null) {
+            $args[] = $row;
+        }
+        if ($column !== null) {
+            $args[] = $column;
+        }
+
+        $actualValue = AddressHelper::convertToA1(...$args);
+
+        self::assertSame($expectedValue, $actualValue);
+    }
+
+    public function providerR1C1ConversionToA1Relative()
+    {
+        return require 'tests/data/Cell/R1C1ConversionToA1Relative.php';
+    }
+
+    /**
+     * @dataProvider providerR1C1ConversionToA1Exception
+     */
+    public function testR1C1ConversionToA1Exception(string $address): void
+    {
+        $this->expectException(Exception::class);
+
+        AddressHelper::convertToA1($address);
+    }
+
+    public function providerR1C1ConversionToA1Exception()
+    {
+        return require 'tests/data/Cell/R1C1ConversionToA1Exception.php';
+    }
+
+    /**
+     * @dataProvider providerA1ConversionToR1C1Absolute
+     */
+    public function testA1ConversionToR1C1Absolute(string $expectedValue, string $address): void
+    {
+        $actualValue = AddressHelper::convertToR1C1($address);
+
+        self::assertSame($expectedValue, $actualValue);
+    }
+
+    public function providerA1ConversionToR1C1Absolute()
+    {
+        return require 'tests/data/Cell/A1ConversionToR1C1Absolute.php';
+    }
+
+    /**
+     * @dataProvider providerA1ConversionToR1C1Relative
+     */
+    public function testA1ConversionToR1C1Relative(string $expectedValue, string $address, ?int $row = null, ?int $column = null): void
+    {
+        $actualValue = AddressHelper::convertToR1C1($address, $row, $column);
+
+        self::assertSame($expectedValue, $actualValue);
+    }
+
+    public function providerA1ConversionToR1C1Relative()
+    {
+        return require 'tests/data/Cell/A1ConversionToR1C1Relative.php';
+    }
+
+    /**
+     * @dataProvider providerA1ConversionToR1C1Exception
+     */
+    public function testA1ConversionToR1C1Exception(string $address): void
+    {
+        $this->expectException(Exception::class);
+
+        AddressHelper::convertToR1C1($address);
+    }
+
+    public function providerA1ConversionToR1C1Exception()
+    {
+        return require 'tests/data/Cell/A1ConversionToR1C1Exception.php';
+    }
+}
diff --git a/tests/data/Cell/A1ConversionToR1C1Absolute.php b/tests/data/Cell/A1ConversionToR1C1Absolute.php
new file mode 100644
index 00000000..171672bb
--- /dev/null
+++ b/tests/data/Cell/A1ConversionToR1C1Absolute.php
@@ -0,0 +1,15 @@
+<?php
+
+return [
+    ['R1C1', 'A1'],
+    ['R1C1', '$A$1'],
+    ['R1C1', '$A1'],
+    ['R1C1', 'A$1'],
+    ['R2C2', 'B2'],
+    ['R5C12', 'L5'],
+    ['R1024C26', 'Z1024'],
+    ['R2048C27', 'AA2048'],
+    ['R4096C52', 'AZ4096'],
+    ['R8192C53', 'BA8192'],
+    ['R65535C256', 'IV65535'],
+];
diff --git a/tests/data/Cell/A1ConversionToR1C1Exception.php b/tests/data/Cell/A1ConversionToR1C1Exception.php
new file mode 100644
index 00000000..7dd4a68e
--- /dev/null
+++ b/tests/data/Cell/A1ConversionToR1C1Exception.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+    ['A11Y'],
+];
diff --git a/tests/data/Cell/A1ConversionToR1C1Relative.php b/tests/data/Cell/A1ConversionToR1C1Relative.php
new file mode 100644
index 00000000..76a6aee8
--- /dev/null
+++ b/tests/data/Cell/A1ConversionToR1C1Relative.php
@@ -0,0 +1,19 @@
+<?php
+
+return [
+    ['R[2]C[2]', 'O18', 16, 13],
+    ['R[-2]C[2]', 'O14', 16, 13],
+    ['R[2]C[-2]', 'K18', 16, 13],
+    ['R[-2]C[-2]', 'K14', 16, 13],
+    ['RC[3]', 'P16', 16, 13],
+    ['RC[-3]', 'J16', 16, 13],
+    ['R[4]C', 'M20', 16, 13],
+    ['R[-4]C', 'M12', 16, 13],
+    ['RC', 'E5', 5, 5],
+    ['R5C', 'E5', null, 5],
+    ['RC5', 'E5', 5, null],
+    ['R5C[2]', 'E5', null, 3],
+    ['R[2]C5', 'E5', 3, null],
+    ['R5C[-2]', 'E5', null, 7],
+    ['R[-2]C5', 'E5', 7, null],
+];
diff --git a/tests/data/Cell/R1C1ConversionToA1Absolute.php b/tests/data/Cell/R1C1ConversionToA1Absolute.php
new file mode 100644
index 00000000..8828934e
--- /dev/null
+++ b/tests/data/Cell/R1C1ConversionToA1Absolute.php
@@ -0,0 +1,14 @@
+<?php
+
+return [
+    ['A1', 'R1C1'],
+    ['B2', 'R2C2'],
+    ['L5', 'R5C12'],
+    ['Z1024', 'R1024C26'],
+    ['AA2048', 'R2048C27'],
+    ['AZ4096', 'R4096C52'],
+    ['BA8192', 'R8192C53'],
+    ['IV65535', 'R65535C256'],
+    ['K1', 'RC11'],
+    ['A16', 'R16C'],
+];
diff --git a/tests/data/Cell/R1C1ConversionToA1Exception.php b/tests/data/Cell/R1C1ConversionToA1Exception.php
new file mode 100644
index 00000000..fa27fbe9
--- /dev/null
+++ b/tests/data/Cell/R1C1ConversionToA1Exception.php
@@ -0,0 +1,9 @@
+<?php
+
+return [
+    ['RICE'],
+    ['R[-1]C'],
+    ['RC[-1]'],
+    ['R-1C'],
+    ['RC-1'],
+];
diff --git a/tests/data/Cell/R1C1ConversionToA1Relative.php b/tests/data/Cell/R1C1ConversionToA1Relative.php
new file mode 100644
index 00000000..9e7d97ba
--- /dev/null
+++ b/tests/data/Cell/R1C1ConversionToA1Relative.php
@@ -0,0 +1,14 @@
+<?php
+
+return [
+    ['C3', 'R[2]C[2]'],
+    ['O18', 'R[2]C[2]', 16, 13],
+    ['O14', 'R[-2]C[2]', 16, 13],
+    ['K18', 'R[2]C[-2]', 16, 13],
+    ['K14', 'R[-2]C[-2]', 16, 13],
+    ['P16', 'RC[3]', 16, 13],
+    ['J16', 'RC[-3]', 16, 13],
+    ['M20', 'R[4]C', 16, 13],
+    ['M12', 'R[-4]C', 16, 13],
+    ['E5', 'RC', 5, 5],
+];

From 65a94abeca9a273a64399503419cd8246b21dcce Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Sat, 27 Jun 2020 23:10:28 +0200
Subject: [PATCH 047/153] And now phpcs is telling me to fix my grammar

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02179db6..68aad0c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Added
 - Add support for IFS() logical function [#1442](https://github.com/PHPOffice/PhpSpreadsheet/pull/1442)
+- Add Cell Address Helper to provide conversions between the R1C1 and A1 address formats [#1558](https://github.com/PHPOffice/PhpSpreadsheet/pull/1558)
 
 ## [1.13.0] - 2020-05-31
 

From 321dfc7a3da7f982084f0959d71f6ab4ea01561e Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Sun, 28 Jun 2020 16:29:13 +0900
Subject: [PATCH 048/153] Upgrad PHP deps

---
 composer.json                                 |   4 +-
 composer.lock                                 | 886 ++++++++++--------
 src/PhpSpreadsheet/Chart/Renderer/JpGraph.php |   2 +
 src/PhpSpreadsheet/Reader/Xls.php             |   3 +
 src/PhpSpreadsheet/Shared/Font.php            |   4 +
 src/PhpSpreadsheet/Shared/OLE/PPS.php         |   1 +
 src/PhpSpreadsheet/Writer/Xls/Parser.php      |   2 +
 7 files changed, 535 insertions(+), 367 deletions(-)

diff --git a/composer.json b/composer.json
index 6ce3a728..b480c082 100644
--- a/composer.json
+++ b/composer.json
@@ -53,10 +53,10 @@
         "ext-xmlwriter": "*",
         "ext-zip": "*",
         "ext-zlib": "*",
+        "maennchen/zipstream-php": "^2.1",
         "markbaker/complex": "^1.4",
         "markbaker/matrix": "^1.2",
-        "psr/simple-cache": "^1.0",
-        "maennchen/zipstream-php": "^2.0"
+        "psr/simple-cache": "^1.0"
     },
     "require-dev": {
         "dompdf/dompdf": "^0.8.5",
diff --git a/composer.lock b/composer.lock
index 41ec1b9b..9f5ae4aa 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,27 +4,27 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "ab06908c3ff8187971def16c578f1ced",
+    "content-hash": "4103c8180a2e28881d3dbb45e835e863",
     "packages": [
         {
             "name": "maennchen/zipstream-php",
-            "version": "2.0.0",
+            "version": "2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/maennchen/ZipStream-PHP.git",
-                "reference": "9ceee828f9620b2e5c075e551ec7ed8a7035ac95"
+                "reference": "c4c5803cc1f93df3d2448478ef79394a5981cc58"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/9ceee828f9620b2e5c075e551ec7ed8a7035ac95",
-                "reference": "9ceee828f9620b2e5c075e551ec7ed8a7035ac95",
+                "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/c4c5803cc1f93df3d2448478ef79394a5981cc58",
+                "reference": "c4c5803cc1f93df3d2448478ef79394a5981cc58",
                 "shasum": ""
             },
             "require": {
-                "ext-mbstring": "*",
                 "myclabs/php-enum": "^1.5",
                 "php": ">= 7.1",
-                "psr/http-message": "^1.0"
+                "psr/http-message": "^1.0",
+                "symfony/polyfill-mbstring": "^1.0"
             },
             "require-dev": {
                 "ext-zip": "*",
@@ -65,7 +65,7 @@
                 "stream",
                 "zip"
             ],
-            "time": "2020-02-23T01:48:39+00:00"
+            "time": "2020-05-30T13:11:16+00:00"
         },
         {
             "name": "markbaker/complex",
@@ -374,6 +374,69 @@
                 "simple-cache"
             ],
             "time": "2017-10-23T01:57:42+00:00"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.17.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "7110338d81ce1cbc3e273136e4574663627037a7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7110338d81ce1cbc3e273136e4574663627037a7",
+                "reference": "7110338d81ce1cbc3e273136e4574663627037a7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.17-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2020-06-06T08:46:27+00:00"
         }
     ],
     "packages-dev": [
@@ -440,16 +503,16 @@
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "1.4.1",
+            "version": "1.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7"
+                "reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/1ab9842d69e64fb3a01be6b656501032d1b78cb7",
-                "reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51",
+                "reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51",
                 "shasum": ""
             },
             "require": {
@@ -480,32 +543,26 @@
                 "Xdebug",
                 "performance"
             ],
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                }
-            ],
-            "time": "2020-03-01T12:26:26+00:00"
+            "time": "2020-06-04T11:16:35+00:00"
         },
         {
             "name": "doctrine/annotations",
-            "version": "1.10.2",
+            "version": "1.10.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/annotations.git",
-                "reference": "b9d758e831c70751155c698c2f7df4665314a1cb"
+                "reference": "5db60a4969eba0e0c197a19c077780aadbc43c5d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/b9d758e831c70751155c698c2f7df4665314a1cb",
-                "reference": "b9d758e831c70751155c698c2f7df4665314a1cb",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/5db60a4969eba0e0c197a19c077780aadbc43c5d",
+                "reference": "5db60a4969eba0e0c197a19c077780aadbc43c5d",
                 "shasum": ""
             },
             "require": {
                 "doctrine/lexer": "1.*",
                 "ext-tokenizer": "*",
-                "php": "^7.1"
+                "php": "^7.1 || ^8.0"
             },
             "require-dev": {
                 "doctrine/cache": "1.*",
@@ -555,24 +612,24 @@
                 "docblock",
                 "parser"
             ],
-            "time": "2020-04-20T09:18:32+00:00"
+            "time": "2020-05-25T17:24:27+00:00"
         },
         {
             "name": "doctrine/instantiator",
-            "version": "1.3.0",
+            "version": "1.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "ae466f726242e637cebdd526a7d991b9433bacf1"
+                "reference": "f350df0268e904597e3bd9c4685c53e0e333feea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/ae466f726242e637cebdd526a7d991b9433bacf1",
-                "reference": "ae466f726242e637cebdd526a7d991b9433bacf1",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f350df0268e904597e3bd9c4685c53e0e333feea",
+                "reference": "f350df0268e904597e3bd9c4685c53e0e333feea",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": "^7.1 || ^8.0"
             },
             "require-dev": {
                 "doctrine/coding-standard": "^6.0",
@@ -611,24 +668,24 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2019-10-21T16:45:58+00:00"
+            "time": "2020-05-29T17:27:14+00:00"
         },
         {
             "name": "doctrine/lexer",
-            "version": "1.2.0",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/lexer.git",
-                "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6"
+                "reference": "e864bbf5904cb8f5bb334f99209b48018522f042"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6",
-                "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042",
+                "reference": "e864bbf5904cb8f5bb334f99209b48018522f042",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2"
+                "php": "^7.2 || ^8.0"
             },
             "require-dev": {
                 "doctrine/coding-standard": "^6.0",
@@ -673,7 +730,7 @@
                 "parser",
                 "php"
             ],
-            "time": "2019-10-30T14:39:59+00:00"
+            "time": "2020-05-25T17:44:05+00:00"
         },
         {
             "name": "dompdf/dompdf",
@@ -743,16 +800,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v2.16.3",
+            "version": "v2.16.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "83baf823a33a1cbd5416c8626935cf3f843c10b0"
+                "reference": "1023c3458137ab052f6ff1e09621a721bfdeca13"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/83baf823a33a1cbd5416c8626935cf3f843c10b0",
-                "reference": "83baf823a33a1cbd5416c8626935cf3f843c10b0",
+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/1023c3458137ab052f6ff1e09621a721bfdeca13",
+                "reference": "1023c3458137ab052f6ff1e09621a721bfdeca13",
                 "shasum": ""
             },
             "require": {
@@ -784,12 +841,12 @@
                 "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.1",
                 "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.1",
                 "phpunitgoodpractices/traits": "^1.8",
-                "symfony/phpunit-bridge": "^4.3 || ^5.0",
+                "symfony/phpunit-bridge": "^5.1",
                 "symfony/yaml": "^3.0 || ^4.0 || ^5.0"
             },
             "suggest": {
                 "ext-dom": "For handling output formats in XML",
-                "ext-mbstring": "For handling non-UTF8 characters in cache signature.",
+                "ext-mbstring": "For handling non-UTF8 characters.",
                 "php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.",
                 "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.",
                 "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible."
@@ -830,13 +887,7 @@
                 }
             ],
             "description": "A tool to automatically fix PHP code style",
-            "funding": [
-                {
-                    "url": "https://github.com/keradus",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-04-15T18:51:10+00:00"
+            "time": "2020-06-27T23:57:46+00:00"
         },
         {
             "name": "jpgraph/jpgraph",
@@ -876,20 +927,21 @@
                 "jpgraph",
                 "pie"
             ],
+            "abandoned": true,
             "time": "2017-02-23T09:44:15+00:00"
         },
         {
             "name": "mpdf/mpdf",
-            "version": "v8.0.5",
+            "version": "v8.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mpdf/mpdf.git",
-                "reference": "bad32aa9cd5958175aef185c02e032ddbadc56ea"
+                "reference": "d27aa93513b915896fa7cb53901d3122e286f811"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mpdf/mpdf/zipball/bad32aa9cd5958175aef185c02e032ddbadc56ea",
-                "reference": "bad32aa9cd5958175aef185c02e032ddbadc56ea",
+                "url": "https://api.github.com/repos/mpdf/mpdf/zipball/d27aa93513b915896fa7cb53901d3122e286f811",
+                "reference": "d27aa93513b915896fa7cb53901d3122e286f811",
                 "shasum": ""
             },
             "require": {
@@ -945,7 +997,7 @@
                 "php",
                 "utf-8"
             ],
-            "time": "2020-02-05T08:43:46+00:00"
+            "time": "2020-05-25T09:08:39+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -1330,25 +1382,25 @@
         },
         {
             "name": "phpdocumentor/reflection-common",
-            "version": "2.1.0",
+            "version": "2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b"
+                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/6568f4687e5b41b054365f9ae03fcb1ed5f2069b",
-                "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
+                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.x-dev"
+                    "dev-2.x": "2.x-dev"
                 }
             },
             "autoload": {
@@ -1375,7 +1427,7 @@
                 "reflection",
                 "static analysis"
             ],
-            "time": "2020-04-27T09:25:28+00:00"
+            "time": "2020-06-27T09:03:43+00:00"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
@@ -1432,30 +1484,29 @@
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.1.0",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "7462d5f123dfc080dfdf26897032a6513644fc95"
+                "reference": "e878a14a65245fbe78f8080eba03b47c3b705651"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/7462d5f123dfc080dfdf26897032a6513644fc95",
-                "reference": "7462d5f123dfc080dfdf26897032a6513644fc95",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e878a14a65245fbe78f8080eba03b47c3b705651",
+                "reference": "e878a14a65245fbe78f8080eba03b47c3b705651",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2",
+                "php": "^7.2 || ^8.0",
                 "phpdocumentor/reflection-common": "^2.0"
             },
             "require-dev": {
-                "ext-tokenizer": "^7.2",
-                "mockery/mockery": "~1"
+                "ext-tokenizer": "*"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.x-dev"
+                    "dev-1.x": "1.x-dev"
                 }
             },
             "autoload": {
@@ -1474,7 +1525,7 @@
                 }
             ],
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
-            "time": "2020-02-18T18:59:58+00:00"
+            "time": "2020-06-27T10:12:23+00:00"
         },
         {
             "name": "phpspec/prophecy",
@@ -1793,16 +1844,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "8.5.4",
+            "version": "8.5.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "8474e22d7d642f665084ba5ec780626cbd1efd23"
+                "reference": "34c18baa6a44f1d1fbf0338907139e9dce95b997"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8474e22d7d642f665084ba5ec780626cbd1efd23",
-                "reference": "8474e22d7d642f665084ba5ec780626cbd1efd23",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/34c18baa6a44f1d1fbf0338907139e9dce95b997",
+                "reference": "34c18baa6a44f1d1fbf0338907139e9dce95b997",
                 "shasum": ""
             },
             "require": {
@@ -1872,17 +1923,7 @@
                 "testing",
                 "xunit"
             ],
-            "funding": [
-                {
-                    "url": "https://phpunit.de/donate.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-04-23T04:39:42+00:00"
+            "time": "2020-06-22T07:06:58+00:00"
         },
         {
             "name": "psr/container",
@@ -2028,16 +2069,16 @@
         },
         {
             "name": "sabberworm/php-css-parser",
-            "version": "8.3.0",
+            "version": "8.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sabberworm/PHP-CSS-Parser.git",
-                "reference": "91bcc3e3fdb7386c9a2e0e0aa09ca75cc43f121f"
+                "reference": "d217848e1396ef962fb1997cf3e2421acba7f796"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/91bcc3e3fdb7386c9a2e0e0aa09ca75cc43f121f",
-                "reference": "91bcc3e3fdb7386c9a2e0e0aa09ca75cc43f121f",
+                "url": "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/d217848e1396ef962fb1997cf3e2421acba7f796",
+                "reference": "d217848e1396ef962fb1997cf3e2421acba7f796",
                 "shasum": ""
             },
             "require": {
@@ -2069,7 +2110,7 @@
                 "parser",
                 "stylesheet"
             ],
-            "time": "2019-02-22T07:42:52+00:00"
+            "time": "2020-06-01T09:10:00+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
@@ -2688,16 +2729,16 @@
         },
         {
             "name": "setasign/fpdi",
-            "version": "v2.3.2",
+            "version": "v2.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Setasign/FPDI.git",
-                "reference": "527761458f504882ab844f15754523825647f291"
+                "reference": "50c388860a73191e010810ed57dbed795578e867"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Setasign/FPDI/zipball/527761458f504882ab844f15754523825647f291",
-                "reference": "527761458f504882ab844f15754523825647f291",
+                "url": "https://api.github.com/repos/Setasign/FPDI/zipball/50c388860a73191e010810ed57dbed795578e867",
+                "reference": "50c388860a73191e010810ed57dbed795578e867",
                 "shasum": ""
             },
             "require": {
@@ -2745,13 +2786,7 @@
                 "fpdi",
                 "pdf"
             ],
-            "funding": [
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/setasign/fpdi",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-03-23T15:53:59+00:00"
+            "time": "2020-04-28T12:40:35+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
@@ -2806,26 +2841,29 @@
         },
         {
             "name": "symfony/console",
-            "version": "v5.0.7",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "5fa1caadc8cdaa17bcfb25219f3b53fe294a9935"
+                "reference": "34ac555a3627e324b660e318daa07572e1140123"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/5fa1caadc8cdaa17bcfb25219f3b53fe294a9935",
-                "reference": "5fa1caadc8cdaa17bcfb25219f3b53fe294a9935",
+                "url": "https://api.github.com/repos/symfony/console/zipball/34ac555a3627e324b660e318daa07572e1140123",
+                "reference": "34ac555a3627e324b660e318daa07572e1140123",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": ">=7.2.5",
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/polyfill-php73": "^1.8",
-                "symfony/service-contracts": "^1.1|^2"
+                "symfony/polyfill-php80": "^1.15",
+                "symfony/service-contracts": "^1.1|^2",
+                "symfony/string": "^5.1"
             },
             "conflict": {
                 "symfony/dependency-injection": "<4.4",
+                "symfony/dotenv": "<5.1",
                 "symfony/event-dispatcher": "<4.4",
                 "symfony/lock": "<4.4",
                 "symfony/process": "<4.4"
@@ -2851,7 +2889,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -2878,39 +2916,73 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-03-30T11:42:42+00:00"
+            "time": "2020-06-15T12:59:21+00:00"
         },
         {
-            "name": "symfony/event-dispatcher",
-            "version": "v5.0.7",
+            "name": "symfony/deprecation-contracts",
+            "version": "v2.1.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "24f40d95385774ed5c71dbf014edd047e2f2f3dc"
+                "url": "https://github.com/symfony/deprecation-contracts.git",
+                "reference": "dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/24f40d95385774ed5c71dbf014edd047e2f2f3dc",
-                "reference": "24f40d95385774ed5c71dbf014edd047e2f2f3dc",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337",
+                "reference": "dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
-                "symfony/event-dispatcher-contracts": "^2"
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.1-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "function.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "A generic function and convention to trigger deprecation notices",
+            "homepage": "https://symfony.com",
+            "time": "2020-05-27T08:34:37+00:00"
+        },
+        {
+            "name": "symfony/event-dispatcher",
+            "version": "v5.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/event-dispatcher.git",
+                "reference": "cc0d059e2e997e79ca34125a52f3e33de4424ac7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/cc0d059e2e997e79ca34125a52f3e33de4424ac7",
+                "reference": "cc0d059e2e997e79ca34125a52f3e33de4424ac7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1",
+                "symfony/event-dispatcher-contracts": "^2",
+                "symfony/polyfill-php80": "^1.15"
             },
             "conflict": {
                 "symfony/dependency-injection": "<4.4"
@@ -2935,7 +3007,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -2962,38 +3034,24 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-03-27T16:56:45+00:00"
+            "time": "2020-05-20T17:43:50+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v2.0.1",
+            "version": "v2.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "af23c2584d4577d54661c434446fb8fbed6025dd"
+                "reference": "405952c4e90941a17e52ef7489a2bd94870bb290"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/af23c2584d4577d54661c434446fb8fbed6025dd",
-                "reference": "af23c2584d4577d54661c434446fb8fbed6025dd",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/405952c4e90941a17e52ef7489a2bd94870bb290",
+                "reference": "405952c4e90941a17e52ef7489a2bd94870bb290",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": ">=7.2.5",
                 "psr/event-dispatcher": "^1"
             },
             "suggest": {
@@ -3002,7 +3060,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "2.1-dev"
                 }
             },
             "autoload": {
@@ -3034,30 +3092,30 @@
                 "interoperability",
                 "standards"
             ],
-            "time": "2019-11-18T17:27:11+00:00"
+            "time": "2020-05-20T17:43:50+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v5.0.7",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "ca3b87dd09fff9b771731637f5379965fbfab420"
+                "reference": "6e4320f06d5f2cce0d96530162491f4465179157"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/ca3b87dd09fff9b771731637f5379965fbfab420",
-                "reference": "ca3b87dd09fff9b771731637f5379965fbfab420",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/6e4320f06d5f2cce0d96530162491f4465179157",
+                "reference": "6e4320f06d5f2cce0d96530162491f4465179157",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": ">=7.2.5",
                 "symfony/polyfill-ctype": "~1.8"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -3084,43 +3142,29 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-03-27T16:56:45+00:00"
+            "time": "2020-05-30T20:35:19+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v5.0.7",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "600a52c29afc0d1caa74acbec8d3095ca7e9910d"
+                "reference": "4298870062bfc667cb78d2b379be4bf5dec5f187"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/600a52c29afc0d1caa74acbec8d3095ca7e9910d",
-                "reference": "600a52c29afc0d1caa74acbec8d3095ca7e9910d",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/4298870062bfc667cb78d2b379be4bf5dec5f187",
+                "reference": "4298870062bfc667cb78d2b379be4bf5dec5f187",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5"
+                "php": ">=7.2.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -3147,43 +3191,31 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-03-27T16:56:45+00:00"
+            "time": "2020-05-20T17:43:50+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v5.0.7",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "09dccfffd24b311df7f184aa80ee7b61ad61ed8d"
+                "reference": "663f5dd5e14057d1954fe721f9709d35837f2447"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/09dccfffd24b311df7f184aa80ee7b61ad61ed8d",
-                "reference": "09dccfffd24b311df7f184aa80ee7b61ad61ed8d",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/663f5dd5e14057d1954fe721f9709d35837f2447",
+                "reference": "663f5dd5e14057d1954fe721f9709d35837f2447",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5"
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1",
+                "symfony/polyfill-php80": "^1.15"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -3215,34 +3247,20 @@
                 "configuration",
                 "options"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-03-27T16:56:45+00:00"
+            "time": "2020-05-23T13:08:13+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.15.0",
+            "version": "v1.17.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14"
+                "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/4719fa9c18b0464d399f1a63bf624b42b6fa8d14",
-                "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d",
+                "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d",
                 "shasum": ""
             },
             "require": {
@@ -3254,7 +3272,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.15-dev"
+                    "dev-master": "1.17-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -3287,51 +3309,41 @@
                 "polyfill",
                 "portable"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-02-27T09:26:54+00:00"
+            "time": "2020-06-06T08:46:27+00:00"
         },
         {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.15.0",
+            "name": "symfony/polyfill-intl-grapheme",
+            "version": "v1.17.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac"
+                "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
+                "reference": "6e4dbcf5e81eba86e36731f94fe56b1726835846"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/81ffd3a9c6d707be22e3012b827de1c9775fc5ac",
-                "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/6e4dbcf5e81eba86e36731f94fe56b1726835846",
+                "reference": "6e4dbcf5e81eba86e36731f94fe56b1726835846",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
             "suggest": {
-                "ext-mbstring": "For best performance"
+                "ext-intl": "For best performance"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.15-dev"
+                    "dev-master": "1.17-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
+                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
                 },
                 "files": [
                     "bootstrap.php"
@@ -3351,43 +3363,97 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill for the Mbstring extension",
+            "description": "Symfony polyfill for intl's grapheme_* functions",
             "homepage": "https://symfony.com",
             "keywords": [
                 "compatibility",
-                "mbstring",
+                "grapheme",
+                "intl",
                 "polyfill",
                 "portable",
                 "shim"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-03-09T19:04:49+00:00"
+            "time": "2020-06-06T08:46:27+00:00"
         },
         {
-            "name": "symfony/polyfill-php70",
-            "version": "v1.15.0",
+            "name": "symfony/polyfill-intl-normalizer",
+            "version": "v1.17.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-php70.git",
-                "reference": "2a18e37a489803559284416df58c71ccebe50bf0"
+                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
+                "reference": "40309d1700e8f72447bb9e7b54af756eeea35620"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/2a18e37a489803559284416df58c71ccebe50bf0",
-                "reference": "2a18e37a489803559284416df58c71ccebe50bf0",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/40309d1700e8f72447bb9e7b54af756eeea35620",
+                "reference": "40309d1700e8f72447bb9e7b54af756eeea35620",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.17-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ],
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's Normalizer class and related functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "intl",
+                "normalizer",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2020-06-14T14:40:37+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php70",
+            "version": "v1.17.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php70.git",
+                "reference": "471b096aede7025bace8eb356b9ac801aaba7e2d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/471b096aede7025bace8eb356b9ac801aaba7e2d",
+                "reference": "471b096aede7025bace8eb356b9ac801aaba7e2d",
                 "shasum": ""
             },
             "require": {
@@ -3397,7 +3463,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.15-dev"
+                    "dev-master": "1.17-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -3433,20 +3503,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-02-27T09:26:54+00:00"
+            "time": "2020-06-06T08:46:27+00:00"
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.15.0",
+            "version": "v1.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "37b0976c78b94856543260ce09b460a7bc852747"
+                "reference": "f048e612a3905f34931127360bdd2def19a5e582"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/37b0976c78b94856543260ce09b460a7bc852747",
-                "reference": "37b0976c78b94856543260ce09b460a7bc852747",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/f048e612a3905f34931127360bdd2def19a5e582",
+                "reference": "f048e612a3905f34931127360bdd2def19a5e582",
                 "shasum": ""
             },
             "require": {
@@ -3455,7 +3525,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.15-dev"
+                    "dev-master": "1.17-dev"
                 }
             },
             "autoload": {
@@ -3488,34 +3558,20 @@
                 "portable",
                 "shim"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-02-27T09:26:54+00:00"
+            "time": "2020-05-12T16:47:27+00:00"
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.15.0",
+            "version": "v1.17.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7"
+                "reference": "fa0837fe02d617d31fbb25f990655861bb27bd1a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7",
-                "reference": "0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fa0837fe02d617d31fbb25f990655861bb27bd1a",
+                "reference": "fa0837fe02d617d31fbb25f990655861bb27bd1a",
                 "shasum": ""
             },
             "require": {
@@ -3524,7 +3580,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.15-dev"
+                    "dev-master": "1.17-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -3560,43 +3620,96 @@
                 "portable",
                 "shim"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-02-27T09:26:54+00:00"
+            "time": "2020-06-06T08:46:27+00:00"
         },
         {
-            "name": "symfony/process",
-            "version": "v5.0.7",
+            "name": "symfony/polyfill-php80",
+            "version": "v1.17.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/process.git",
-                "reference": "c5ca4a0fc16a0c888067d43fbcfe1f8a53d8e70e"
+                "url": "https://github.com/symfony/polyfill-php80.git",
+                "reference": "4a5b6bba3259902e386eb80dd1956181ee90b5b2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/c5ca4a0fc16a0c888067d43fbcfe1f8a53d8e70e",
-                "reference": "c5ca4a0fc16a0c888067d43fbcfe1f8a53d8e70e",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4a5b6bba3259902e386eb80dd1956181ee90b5b2",
+                "reference": "4a5b6bba3259902e386eb80dd1956181ee90b5b2",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5"
+                "php": ">=7.0.8"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "1.17-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ],
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ion Bazan",
+                    "email": "ion.bazan@gmail.com"
+                },
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2020-06-06T08:46:27+00:00"
+        },
+        {
+            "name": "symfony/process",
+            "version": "v5.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/process.git",
+                "reference": "7f6378c1fa2147eeb1b4c385856ce9de0d46ebd1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/process/zipball/7f6378c1fa2147eeb1b4c385856ce9de0d46ebd1",
+                "reference": "7f6378c1fa2147eeb1b4c385856ce9de0d46ebd1",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/polyfill-php80": "^1.15"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -3623,38 +3736,24 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-03-27T16:56:45+00:00"
+            "time": "2020-05-30T20:35:19+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v2.0.1",
+            "version": "v2.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "144c5e51266b281231e947b51223ba14acf1a749"
+                "reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/144c5e51266b281231e947b51223ba14acf1a749",
-                "reference": "144c5e51266b281231e947b51223ba14acf1a749",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/66a8f0957a3ca54e4f724e49028ab19d75a8918b",
+                "reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": ">=7.2.5",
                 "psr/container": "^1.0"
             },
             "suggest": {
@@ -3663,7 +3762,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "2.1-dev"
                 }
             },
             "autoload": {
@@ -3695,30 +3794,30 @@
                 "interoperability",
                 "standards"
             ],
-            "time": "2019-11-18T17:27:11+00:00"
+            "time": "2020-05-20T17:43:50+00:00"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v5.0.7",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "a1d86d30d4522423afc998f32404efa34fcf5a73"
+                "reference": "0f7c58cf81dbb5dd67d423a89d577524a2ec0323"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/a1d86d30d4522423afc998f32404efa34fcf5a73",
-                "reference": "a1d86d30d4522423afc998f32404efa34fcf5a73",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/0f7c58cf81dbb5dd67d423a89d577524a2ec0323",
+                "reference": "0f7c58cf81dbb5dd67d423a89d577524a2ec0323",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": ">=7.2.5",
                 "symfony/service-contracts": "^1.0|^2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -3745,21 +3844,78 @@
             ],
             "description": "Symfony Stopwatch Component",
             "homepage": "https://symfony.com",
-            "funding": [
+            "time": "2020-05-20T17:43:50+00:00"
+        },
+        {
+            "name": "symfony/string",
+            "version": "v5.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/string.git",
+                "reference": "ac70459db781108db7c6d8981dd31ce0e29e3298"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/string/zipball/ac70459db781108db7c6d8981dd31ce0e29e3298",
+                "reference": "ac70459db781108db7c6d8981dd31ce0e29e3298",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.5",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-intl-grapheme": "~1.0",
+                "symfony/polyfill-intl-normalizer": "~1.0",
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/polyfill-php80": "~1.15"
+            },
+            "require-dev": {
+                "symfony/error-handler": "^4.4|^5.0",
+                "symfony/http-client": "^4.4|^5.0",
+                "symfony/translation-contracts": "^1.1|^2",
+                "symfony/var-exporter": "^4.4|^5.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\String\\": ""
+                },
+                "files": [
+                    "Resources/functions.php"
+                ],
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
                 {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
                 },
                 {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "time": "2020-03-27T16:56:45+00:00"
+            "description": "Symfony String component",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "grapheme",
+                "i18n",
+                "string",
+                "unicode",
+                "utf-8",
+                "utf8"
+            ],
+            "time": "2020-06-11T12:16:36+00:00"
         },
         {
             "name": "tecnickcom/tcpdf",
@@ -3865,16 +4021,16 @@
         },
         {
             "name": "webmozart/assert",
-            "version": "1.8.0",
+            "version": "1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozart/assert.git",
-                "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6"
+                "reference": "9dc4f203e36f2b486149058bade43c851dd97451"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/ab2cb0b3b559010b75981b1bdce728da3ee90ad6",
-                "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/9dc4f203e36f2b486149058bade43c851dd97451",
+                "reference": "9dc4f203e36f2b486149058bade43c851dd97451",
                 "shasum": ""
             },
             "require": {
@@ -3882,6 +4038,7 @@
                 "symfony/polyfill-ctype": "^1.8"
             },
             "conflict": {
+                "phpstan/phpstan": "<0.12.20",
                 "vimeo/psalm": "<3.9.1"
             },
             "require-dev": {
@@ -3909,7 +4066,7 @@
                 "check",
                 "validate"
             ],
-            "time": "2020-04-18T12:12:48+00:00"
+            "time": "2020-06-16T10:16:42+00:00"
         }
     ],
     "aliases": [],
@@ -3933,6 +4090,5 @@
         "ext-zip": "*",
         "ext-zlib": "*"
     },
-    "platform-dev": [],
-    "plugin-api-version": "1.1.0"
+    "platform-dev": []
 }
diff --git a/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php b/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
index bd931c66..5546da58 100644
--- a/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
+++ b/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
@@ -219,9 +219,11 @@ class JpGraph implements IRenderer
                     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
diff --git a/src/PhpSpreadsheet/Reader/Xls.php b/src/PhpSpreadsheet/Reader/Xls.php
index 3f383b9e..c7c5f77f 100644
--- a/src/PhpSpreadsheet/Reader/Xls.php
+++ b/src/PhpSpreadsheet/Reader/Xls.php
@@ -4944,6 +4944,7 @@ class Xls extends BaseReader
         // offset: var; size: $sz1; formula data for first condition (without size field)
         $formula1 = substr($recordData, $offset, $sz1);
         $formula1 = pack('v', $sz1) . $formula1; // prepend the length
+
         try {
             $formula1 = $this->getFormulaFromStructure($formula1);
 
@@ -4966,6 +4967,7 @@ class Xls extends BaseReader
         // offset: var; size: $sz2; formula data for second condition (without size field)
         $formula2 = substr($recordData, $offset, $sz2);
         $formula2 = pack('v', $sz2) . $formula2; // prepend the length
+
         try {
             $formula2 = $this->getFormulaFromStructure($formula2);
         } catch (PhpSpreadsheetException $e) {
@@ -5763,6 +5765,7 @@ class Xls extends BaseReader
                 $size = 9;
                 $data = self::extractNumber(substr($formulaData, 1));
                 $data = str_replace(',', '.', (string) $data); // in case non-English locale
+
                 break;
             case 0x20:    //    array constant
             case 0x40:
diff --git a/src/PhpSpreadsheet/Shared/Font.php b/src/PhpSpreadsheet/Shared/Font.php
index ca94529c..ee1f8aba 100644
--- a/src/PhpSpreadsheet/Shared/Font.php
+++ b/src/PhpSpreadsheet/Shared/Font.php
@@ -318,21 +318,25 @@ class Font
                 // value 8.26 was found via interpolation by inspecting real Excel files with Calibri 11 font.
                 $columnWidth = (int) (8.26 * StringHelper::countCharacters($columnText));
                 $columnWidth = $columnWidth * $fontSize / 11; // extrapolate from font size
+
                 break;
             case 'Arial':
                 // value 8 was set because of experience in different exports at Arial 10 font.
                 $columnWidth = (int) (8 * StringHelper::countCharacters($columnText));
                 $columnWidth = $columnWidth * $fontSize / 10; // extrapolate from font size
+
                 break;
             case 'Verdana':
                 // value 8 was found via interpolation by inspecting real Excel files with Verdana 10 font.
                 $columnWidth = (int) (8 * StringHelper::countCharacters($columnText));
                 $columnWidth = $columnWidth * $fontSize / 10; // extrapolate from font size
+
                 break;
             default:
                 // just assume Calibri
                 $columnWidth = (int) (8.26 * StringHelper::countCharacters($columnText));
                 $columnWidth = $columnWidth * $fontSize / 11; // extrapolate from font size
+
                 break;
         }
 
diff --git a/src/PhpSpreadsheet/Shared/OLE/PPS.php b/src/PhpSpreadsheet/Shared/OLE/PPS.php
index 0407e0d1..7aa42a14 100644
--- a/src/PhpSpreadsheet/Shared/OLE/PPS.php
+++ b/src/PhpSpreadsheet/Shared/OLE/PPS.php
@@ -192,6 +192,7 @@ class PPS
             . pack('V', isset($this->startBlock) ? $this->startBlock : 0)  // 120
             . pack('V', $this->Size)               // 124
             . pack('V', 0); // 128
+
         return $ret;
     }
 
diff --git a/src/PhpSpreadsheet/Writer/Xls/Parser.php b/src/PhpSpreadsheet/Writer/Xls/Parser.php
index 5e3316ab..621853c0 100644
--- a/src/PhpSpreadsheet/Writer/Xls/Parser.php
+++ b/src/PhpSpreadsheet/Writer/Xls/Parser.php
@@ -1250,6 +1250,7 @@ class Parser
                 throw new WriterException("')' token expected.");
             }
             $this->advance(); // eat the ")"
+
             return $result;
         }
         // if it's a reference
@@ -1350,6 +1351,7 @@ class Parser
 
         $result = $this->createTree($function, $result, $num_args);
         $this->advance(); // eat the ")"
+
         return $result;
     }
 

From 2896e6ceb969297f8ff3669bb8d07a91a910a08d Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Sun, 28 Jun 2020 17:34:32 +0900
Subject: [PATCH 049/153] Consistent regexp escaping

---
 samples/Pdf/21b_Pdf.php                                | 2 +-
 tests/PhpSpreadsheetTests/Writer/Html/CallbackTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/Pdf/21b_Pdf.php b/samples/Pdf/21b_Pdf.php
index 142fc344..c67ff3d2 100644
--- a/samples/Pdf/21b_Pdf.php
+++ b/samples/Pdf/21b_Pdf.php
@@ -8,7 +8,7 @@ use PhpOffice\PhpSpreadsheet\Writer\Pdf\Tcpdf;
 function replaceBody(string $html): string
 {
     $lorem = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.';
-    $bodystring = '@<body>.*</body>@ms';
+    $bodystring = '~<body>.*</body>~ms';
     $bodyrepl = <<<EOF
 <body>
 <h1>Serif</h1>
diff --git a/tests/PhpSpreadsheetTests/Writer/Html/CallbackTest.php b/tests/PhpSpreadsheetTests/Writer/Html/CallbackTest.php
index 388dbd0e..94c201a7 100644
--- a/tests/PhpSpreadsheetTests/Writer/Html/CallbackTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Html/CallbackTest.php
@@ -20,7 +20,7 @@ body {
 
 EOF;
 
-        return preg_replace('@</head>@', "$newstyle</head>", $html);
+        return preg_replace('~</head>~', "$newstyle</head>", $html);
     }
 
     public function testSetAndReset(): void

From 5e64479c06b5880182e2b6276f94ba9fd3c75106 Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Sun, 28 Jun 2020 17:34:50 +0900
Subject: [PATCH 050/153] Document the callback

---
 src/PhpSpreadsheet/Writer/Html.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/PhpSpreadsheet/Writer/Html.php b/src/PhpSpreadsheet/Writer/Html.php
index 752f286f..f3b40fa1 100644
--- a/src/PhpSpreadsheet/Writer/Html.php
+++ b/src/PhpSpreadsheet/Writer/Html.php
@@ -208,9 +208,15 @@ class Html extends BaseWriter
         return $html;
     }
 
-    public function setEditHtmlCallback(?callable $cbk): void
+    /**
+     * Set a callback to edit the entire HTML.
+     *
+     * The callback must accept the HTML as string as first parameter,
+     * and it must return the edited HTML as string.
+     */
+    public function setEditHtmlCallback(?callable $callback): void
     {
-        $this->editHtmlCallback = $cbk;
+        $this->editHtmlCallback = $callback;
     }
 
     const VALIGN_ARR = [

From 14a0fa4cd0601da933616e06dfc95537f822ec80 Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Sun, 28 Jun 2020 17:35:10 +0900
Subject: [PATCH 051/153] New members should always be private

---
 src/PhpSpreadsheet/Writer/Html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpSpreadsheet/Writer/Html.php b/src/PhpSpreadsheet/Writer/Html.php
index f3b40fa1..eb50c456 100644
--- a/src/PhpSpreadsheet/Writer/Html.php
+++ b/src/PhpSpreadsheet/Writer/Html.php
@@ -136,7 +136,7 @@ class Html extends BaseWriter
      *
      * @var null|callable
      */
-    protected $editHtmlCallback;
+    private $editHtmlCallback;
 
     /**
      * Create a new HTML.

From f1fb8dcf1fe0f3e00ae4ff6d22308394f2d2fdbb Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Sun, 28 Jun 2020 21:56:12 +0900
Subject: [PATCH 052/153] Don't ouput row and columns without any cells in HTML
 writer

If row or column dimensions are accessed, then HTML writer would
still generate lots of empty cells, to show nothing at all. This
now ignore row and column dimensions to only output cell that
actually exists (even if those cells are empty).

Fixes #1235
Close #1537
---
 CHANGELOG.md                                  |  1 +
 src/PhpSpreadsheet/Writer/Html.php            | 41 ++++----
 .../Html/ExtendForChartsAndImagesTest.php     | 94 +++++++++++++++++++
 3 files changed, 113 insertions(+), 23 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Writer/Html/ExtendForChartsAndImagesTest.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68aad0c1..1867f097 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Fix for Issue [#1495](https://github.com/PHPOffice/PhpSpreadsheet/issues/1495) (Sheet index being changed when multiple sheets are used in formula) [#1500]((https://github.com/PHPOffice/PhpSpreadsheet/pull/1500))
 - Fix for Issue [#1533](https://github.com/PHPOffice/PhpSpreadsheet/issues/1533) (A reference to a cell containing a string starting with "#" leads to errors in the generated xlsx.) [#1534](https://github.com/PHPOffice/PhpSpreadsheet/pull/1534)
 - Xls Writer - Correct Timestamp Bug [#1493](https://github.com/PHPOffice/PhpSpreadsheet/pull/1493)
+- Don't ouput row and columns without any cells in HTML writer [#1235](https://github.com/PHPOffice/PhpSpreadsheet/issues/1235)
 
 ### Added
 - Add support for IFS() logical function [#1442](https://github.com/PHPOffice/PhpSpreadsheet/pull/1442)
diff --git a/src/PhpSpreadsheet/Writer/Html.php b/src/PhpSpreadsheet/Writer/Html.php
index eb50c456..ec8fec7d 100644
--- a/src/PhpSpreadsheet/Writer/Html.php
+++ b/src/PhpSpreadsheet/Writer/Html.php
@@ -449,22 +449,19 @@ class Html extends BaseWriter
         foreach ($sheets as $sheet) {
             // Write table header
             $html .= $this->generateTableHeader($sheet);
+
             // Get worksheet dimension
-            $dimension = explode(':', $sheet->calculateWorksheetDimension());
-            $dimension[0] = Coordinate::coordinateFromString($dimension[0]);
-            $dimension[0][0] = Coordinate::columnIndexFromString($dimension[0][0]);
-            $dimension[1] = Coordinate::coordinateFromString($dimension[1]);
-            $dimension[1][0] = Coordinate::columnIndexFromString($dimension[1][0]);
+            [$min, $max] = explode(':', $sheet->calculateWorksheetDataDimension());
+            [$minCol, $minRow] = Coordinate::coordinateFromString($min);
+            $minCol = Coordinate::columnIndexFromString($minCol);
+            [$maxCol, $maxRow] = Coordinate::coordinateFromString($max);
+            $maxCol = Coordinate::columnIndexFromString($maxCol);
 
-            // row min,max
-            $rowMin = $dimension[0][1];
-            $rowMax = $dimension[1][1];
-
-            [$theadStart, $theadEnd, $tbodyStart] = $this->generateSheetStarts($sheet, $rowMin);
+            [$theadStart, $theadEnd, $tbodyStart] = $this->generateSheetStarts($sheet, $minRow);
 
             // Loop through cells
-            $row = $rowMin - 1;
-            while ($row++ < $rowMax) {
+            $row = $minRow - 1;
+            while ($row++ < $maxRow) {
                 [$cellType, $startTag, $endTag] = $this->generateSheetTags($row, $theadStart, $theadEnd, $tbodyStart);
                 $html .= $startTag;
 
@@ -473,8 +470,8 @@ class Html extends BaseWriter
                     // Start a new rowData
                     $rowData = [];
                     // Loop through columns
-                    $column = $dimension[0][0];
-                    while ($column <= $dimension[1][0]) {
+                    $column = $minCol;
+                    while ($column <= $maxCol) {
                         // Cell exists?
                         if ($sheet->cellExistsByColumnAndRow($column, $row)) {
                             $rowData[$column] = Coordinate::stringFromColumnIndex($column) . $row;
@@ -557,7 +554,7 @@ class Html extends BaseWriter
      *
      * @codeCoverageIgnore
      */
-    private function extendRowsForCharts(Worksheet $pSheet, $row)
+    private function extendRowsForCharts(Worksheet $pSheet, int $row)
     {
         $rowMax = $row;
         $colMax = 'A';
@@ -582,7 +579,7 @@ class Html extends BaseWriter
         return [$rowMax, $colMax, $anyfound];
     }
 
-    private function extendRowsForChartsAndImages(Worksheet $pSheet, $row)
+    private function extendRowsForChartsAndImages(Worksheet $pSheet, int $row): string
     {
         [$rowMax, $colMax, $anyfound] = $this->extendRowsForCharts($pSheet, $row);
 
@@ -1169,7 +1166,7 @@ class Html extends BaseWriter
      * Generate table header.
      *
      * @param Worksheet $pSheet The worksheet for the table we are writing
-     * @param bool   $showid whether or not to add id to table tag
+     * @param bool $showid whether or not to add id to table tag
      *
      * @return string
      */
@@ -1182,8 +1179,6 @@ class Html extends BaseWriter
         $id = $showid ? "id='sheet$sheetIndex'" : '';
         if ($showid) {
             $html .= "<div style='page: page$sheetIndex'>\n";
-        //} elseif ($this->useInlineCss) {
-        //    $html .= "<div style='page-break-before: always' ></div>\n";
         } else {
             $html .= "<div style='page: page$sheetIndex' class='scrpgbrk'>\n";
         }
@@ -1621,11 +1616,11 @@ class Html extends BaseWriter
     /**
      * Get use embedded CSS?
      *
-     * @deprecated no longer used
-     *
      * @return bool
      *
      * @codeCoverageIgnore
+     *
+     * @deprecated no longer used
      */
     public function getUseEmbeddedCSS()
     {
@@ -1635,13 +1630,13 @@ class Html extends BaseWriter
     /**
      * Set use embedded CSS?
      *
-     * @deprecated no longer used
-     *
      * @param bool $pValue
      *
      * @return $this
      *
      * @codeCoverageIgnore
+     *
+     * @deprecated no longer used
      */
     public function setUseEmbeddedCSS($pValue)
     {
diff --git a/tests/PhpSpreadsheetTests/Writer/Html/ExtendForChartsAndImagesTest.php b/tests/PhpSpreadsheetTests/Writer/Html/ExtendForChartsAndImagesTest.php
new file mode 100644
index 00000000..e3d23230
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Writer/Html/ExtendForChartsAndImagesTest.php
@@ -0,0 +1,94 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Writer\Html;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
+use PhpOffice\PhpSpreadsheet\Writer\Html;
+use PhpOffice\PhpSpreadsheetTests\Functional;
+
+class ExtendForChartsAndImagesTest extends Functional\AbstractFunctional
+{
+    public function testEmptySheet(): void
+    {
+        $spreadsheet = new Spreadsheet();
+
+        $this->assertMaxColumnAndMaxRow($spreadsheet, 1, 1);
+    }
+
+    public function testSimpleSheet(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->setCellValue('B3', 'foo');
+
+        $this->assertMaxColumnAndMaxRow($spreadsheet, 2, 3);
+    }
+
+    public function testSheetWithExtraColumnDimensions(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->setCellValue('B3', 'foo');
+
+        // Artificially expend the sheet column count without any real cells
+        $sheet->getColumnDimension('E');
+
+        $this->assertMaxColumnAndMaxRow($spreadsheet, 2, 3);
+    }
+
+    public function testSheetWithExtraRowDimensions(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->setCellValue('B3', 'foo');
+
+        // Artificially expend the sheet row count without any real cells
+        $sheet->getRowDimension(5);
+
+        $this->assertMaxColumnAndMaxRow($spreadsheet, 2, 3);
+    }
+
+    public function testSheetWithImageBelowData(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->setCellValue('B3', 'foo');
+
+        // Add a drawing to the worksheet
+        $drawing = new Drawing();
+        $drawing->setPath('foo.png', false);
+        $drawing->setCoordinates('A5');
+        $drawing->setWorksheet($sheet);
+
+        $this->assertMaxColumnAndMaxRow($spreadsheet, 2, 5);
+    }
+
+    public function testSheetWithImageRightOfData(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->setCellValue('B3', 'foo');
+
+        // Add a drawing to the worksheet
+        $drawing = new Drawing();
+        $drawing->setPath('foo.png', false);
+        $drawing->setCoordinates('E1');
+        $drawing->setWorksheet($sheet);
+
+        $this->assertMaxColumnAndMaxRow($spreadsheet, 5, 3);
+    }
+
+    private function assertMaxColumnAndMaxRow(Spreadsheet $spreadsheet, int $expectedColumnCount, int $expectedRowCount): void
+    {
+        $writer = new Html($spreadsheet);
+        $html = $writer->generateHtmlAll();
+
+        $rowCount = substr_count($html, '<tr ');
+        self::assertSame($expectedRowCount, $rowCount);
+
+        $columnCount = substr_count($html, '<td ') / $rowCount;
+
+        self::assertSame($expectedColumnCount, $columnCount);
+    }
+}

From 93fbf8a93869fdabe61ca258b8294656905522f8 Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Sun, 28 Jun 2020 22:03:17 +0900
Subject: [PATCH 053/153] Update CHANGELOG

---
 CHANGELOG.md | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1867f097..610615d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ## [Unreleased]
 
+### Added
+
+- Add support for IFS() logical function [#1442](https://github.com/PHPOffice/PhpSpreadsheet/pull/1442)
+- Add Cell Address Helper to provide conversions between the R1C1 and A1 address formats [#1558](https://github.com/PHPOffice/PhpSpreadsheet/pull/1558)
+- Add ability to edit Html/Pdf before saving [#1499](https://github.com/PHPOffice/PhpSpreadsheet/pull/1499)
+
 ### Fixed
 
 - Resolve evaluation of utf-8 named ranges in calculation engine [#1522](https://github.com/PHPOffice/PhpSpreadsheet/pull/1522)
@@ -21,10 +27,6 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Xls Writer - Correct Timestamp Bug [#1493](https://github.com/PHPOffice/PhpSpreadsheet/pull/1493)
 - Don't ouput row and columns without any cells in HTML writer [#1235](https://github.com/PHPOffice/PhpSpreadsheet/issues/1235)
 
-### Added
-- Add support for IFS() logical function [#1442](https://github.com/PHPOffice/PhpSpreadsheet/pull/1442)
-- Add Cell Address Helper to provide conversions between the R1C1 and A1 address formats [#1558](https://github.com/PHPOffice/PhpSpreadsheet/pull/1558)
-
 ## [1.13.0] - 2020-05-31
 
 ### Added

From 6caa0cb4f5b6f71eae4bfffff6a0772df6122d29 Mon Sep 17 00:00:00 2001
From: Pavel Alazankin <alazankin@gmail.com>
Date: Sun, 28 Jun 2020 17:39:38 +0300
Subject: [PATCH 054/153] add ability to set codepage explicitly for BIFF5
 (#1484)

If BIFF5 excel 95 file doesn't have codepage record, the default codepage CP1252 is used and can't be change.
That causes to problems with decoding cyrillic text.
---
 CHANGELOG.md                           |  1 +
 src/PhpSpreadsheet/Reader/Xls.php      | 11 ++++++++++-
 src/PhpSpreadsheet/Shared/CodePage.php |  7 +++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 610615d5..b97431c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Add support for IFS() logical function [#1442](https://github.com/PHPOffice/PhpSpreadsheet/pull/1442)
 - Add Cell Address Helper to provide conversions between the R1C1 and A1 address formats [#1558](https://github.com/PHPOffice/PhpSpreadsheet/pull/1558)
 - Add ability to edit Html/Pdf before saving [#1499](https://github.com/PHPOffice/PhpSpreadsheet/pull/1499)
+- Add ability to set codepage explicitly for BIFF5 [#1018](https://github.com/PHPOffice/PhpSpreadsheet/issues/1018)
 
 ### Fixed
 
diff --git a/src/PhpSpreadsheet/Reader/Xls.php b/src/PhpSpreadsheet/Reader/Xls.php
index c7c5f77f..11a6195c 100644
--- a/src/PhpSpreadsheet/Reader/Xls.php
+++ b/src/PhpSpreadsheet/Reader/Xls.php
@@ -439,6 +439,15 @@ class Xls extends BaseReader
         }
     }
 
+    public function setCodepage(string $codepage): void
+    {
+        if (!CodePage::validate($codepage)) {
+            throw new PhpSpreadsheetException('Unknown codepage: ' . $codepage);
+        }
+
+        $this->codepage = $codepage;
+    }
+
     /**
      * Reads names of the worksheets from a file, without parsing the whole file to a PhpSpreadsheet object.
      *
@@ -640,7 +649,7 @@ class Xls extends BaseReader
 
         // initialize
         $this->pos = 0;
-        $this->codepage = 'CP1252';
+        $this->codepage = $this->codepage ?: CodePage::DEFAULT_CODE_PAGE;
         $this->formats = [];
         $this->objFonts = [];
         $this->palette = [];
diff --git a/src/PhpSpreadsheet/Shared/CodePage.php b/src/PhpSpreadsheet/Shared/CodePage.php
index 97cbfbbe..1d5d8933 100644
--- a/src/PhpSpreadsheet/Shared/CodePage.php
+++ b/src/PhpSpreadsheet/Shared/CodePage.php
@@ -6,6 +6,8 @@ use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
 
 class CodePage
 {
+    public const DEFAULT_CODE_PAGE = 'CP1252';
+
     private static $pageArray = [
         0 => 'CP1252', //    CodePage is not always correctly set when the xls file was saved by Apple's Numbers program
         367 => 'ASCII', //    ASCII
@@ -65,6 +67,11 @@ class CodePage
         65001 => 'UTF-8', //    Unicode (UTF-8)
     ];
 
+    public static function validate(string $codePage): bool
+    {
+        return in_array($codePage, self::$pageArray, true);
+    }
+
     /**
      * Convert Microsoft Code Page Identifier to Code Page Name which iconv
      * and mbstring understands.

From e74ef3a802640b9a790bae131a7a0b2e64ccba56 Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Mon, 29 Jun 2020 10:15:42 +0900
Subject: [PATCH 055/153] Generate API doc on tag only

Because it doesn't need to be run on every PR and documenting
only release is exactly what we want
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 05e964a1..7a17dd93 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@ jobs:
         - php ocular.phar code-coverage:upload --format=php-clover tests/coverage-clover.xml
 
     - stage: API documentations
-      if: branch = master
+      if: tag is present
       php: 7.4
       before_script:
         - curl -LO https://github.com/phpDocumentor/phpDocumentor/releases/download/v3.0.0-rc/phpDocumentor.phar

From 7f23ccb69d1957e0f968acbc08b695656cf5f5ab Mon Sep 17 00:00:00 2001
From: paulkned <paulkievits@hotmail.com>
Date: Mon, 29 Jun 2020 03:17:58 +0200
Subject: [PATCH 056/153] Added support for the WEBSERVICE function (#1409)

Co-authored-by: Paul Kievits <kievits@rsm.nl>
---
 CHANGELOG.md                                  |   1 +
 composer.json                                 |   3 +-
 composer.lock                                 | 294 +++++++++++++++++-
 .../Calculation/Calculation.php               |   5 +
 src/PhpSpreadsheet/Calculation/Category.php   |   1 +
 src/PhpSpreadsheet/Calculation/Web.php        |  53 ++++
 src/PhpSpreadsheet/Settings.php               |  29 ++
 .../Functions/Web/WebServiceTest.php          |  54 ++++
 .../DocumentGeneratorTest.php                 |   5 +
 tests/data/Calculation/Web/WEBSERVICE.php     |  28 ++
 10 files changed, 471 insertions(+), 2 deletions(-)
 create mode 100644 src/PhpSpreadsheet/Calculation/Web.php
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/Functions/Web/WebServiceTest.php
 create mode 100644 tests/data/Calculation/Web/WEBSERVICE.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b97431c5..f667053f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Add Cell Address Helper to provide conversions between the R1C1 and A1 address formats [#1558](https://github.com/PHPOffice/PhpSpreadsheet/pull/1558)
 - Add ability to edit Html/Pdf before saving [#1499](https://github.com/PHPOffice/PhpSpreadsheet/pull/1499)
 - Add ability to set codepage explicitly for BIFF5 [#1018](https://github.com/PHPOffice/PhpSpreadsheet/issues/1018)
+- Added support for the WEBSERVICE function
 
 ### Fixed
 
diff --git a/composer.json b/composer.json
index b480c082..d4810ce6 100644
--- a/composer.json
+++ b/composer.json
@@ -56,7 +56,8 @@
         "maennchen/zipstream-php": "^2.1",
         "markbaker/complex": "^1.4",
         "markbaker/matrix": "^1.2",
-        "psr/simple-cache": "^1.0"
+        "psr/simple-cache": "^1.0",
+        "guzzlehttp/guzzle": "^7.0"
     },
     "require-dev": {
         "dompdf/dompdf": "^0.8.5",
diff --git a/composer.lock b/composer.lock
index 9f5ae4aa..99de82bf 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,211 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "4103c8180a2e28881d3dbb45e835e863",
+    "content-hash": "b7ea4dea7ce2e1c2299029fe978d2173",
     "packages": [
+        {
+            "name": "guzzlehttp/guzzle",
+            "version": "7.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/guzzle.git",
+                "reference": "2d9d3c186a6637a43193e66b097c50e4451eaab2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/2d9d3c186a6637a43193e66b097c50e4451eaab2",
+                "reference": "2d9d3c186a6637a43193e66b097c50e4451eaab2",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "guzzlehttp/promises": "^1.0",
+                "guzzlehttp/psr7": "^1.6.1",
+                "php": "^7.2.5",
+                "psr/http-client": "^1.0"
+            },
+            "provide": {
+                "psr/http-client-implementation": "1.0"
+            },
+            "require-dev": {
+                "ergebnis/composer-normalize": "^2.0",
+                "ext-curl": "*",
+                "php-http/client-integration-tests": "dev-phpunit8",
+                "phpunit/phpunit": "^8.5.5",
+                "psr/log": "^1.1"
+            },
+            "suggest": {
+                "ext-curl": "Required for CURL handler support",
+                "ext-intl": "Required for Internationalized Domain Name (IDN) support",
+                "psr/log": "Required for using the Log middleware"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "7.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com",
+                    "homepage": "https://sagikazarmark.hu"
+                }
+            ],
+            "description": "Guzzle is a PHP HTTP client library",
+            "homepage": "http://guzzlephp.org/",
+            "keywords": [
+                "client",
+                "curl",
+                "framework",
+                "http",
+                "http client",
+                "psr-18",
+                "psr-7",
+                "rest",
+                "web service"
+            ],
+            "time": "2020-06-27T10:33:25+00:00"
+        },
+        {
+            "name": "guzzlehttp/promises",
+            "version": "v1.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/promises.git",
+                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Promise\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Guzzle promises library",
+            "keywords": [
+                "promise"
+            ],
+            "time": "2016-12-20T10:07:11+00:00"
+        },
+        {
+            "name": "guzzlehttp/psr7",
+            "version": "1.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/psr7.git",
+                "reference": "239400de7a173fe9901b9ac7c06497751f00727a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a",
+                "reference": "239400de7a173fe9901b9ac7c06497751f00727a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0",
+                "psr/http-message": "~1.0",
+                "ralouphie/getallheaders": "^2.0.5 || ^3.0.0"
+            },
+            "provide": {
+                "psr/http-message-implementation": "1.0"
+            },
+            "require-dev": {
+                "ext-zlib": "*",
+                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
+            },
+            "suggest": {
+                "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Psr7\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "homepage": "https://github.com/Tobion"
+                }
+            ],
+            "description": "PSR-7 message implementation that also provides common utility methods",
+            "keywords": [
+                "http",
+                "message",
+                "psr-7",
+                "request",
+                "response",
+                "stream",
+                "uri",
+                "url"
+            ],
+            "time": "2019-07-01T23:21:34+00:00"
+        },
         {
             "name": "maennchen/zipstream-php",
             "version": "2.1.0",
@@ -277,6 +480,55 @@
             ],
             "time": "2020-02-14T08:15:52+00:00"
         },
+        {
+            "name": "psr/http-client",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-client.git",
+                "reference": "496a823ef742b632934724bf769560c2a5c7c44e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-client/zipball/496a823ef742b632934724bf769560c2a5c7c44e",
+                "reference": "496a823ef742b632934724bf769560c2a5c7c44e",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0",
+                "psr/http-message": "^1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Client\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP clients",
+            "homepage": "https://github.com/php-fig/http-client",
+            "keywords": [
+                "http",
+                "http-client",
+                "psr",
+                "psr-18"
+            ],
+            "time": "2018-10-30T23:29:13+00:00"
+        },
         {
             "name": "psr/http-message",
             "version": "1.0.1",
@@ -375,6 +627,46 @@
             ],
             "time": "2017-10-23T01:57:42+00:00"
         },
+        {
+            "name": "ralouphie/getallheaders",
+            "version": "3.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ralouphie/getallheaders.git",
+                "reference": "120b605dfeb996808c31b6477290a714d356e822"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
+                "reference": "120b605dfeb996808c31b6477290a714d356e822",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "require-dev": {
+                "php-coveralls/php-coveralls": "^2.1",
+                "phpunit/phpunit": "^5 || ^6.5"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/getallheaders.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ralph Khattar",
+                    "email": "ralph.khattar@gmail.com"
+                }
+            ],
+            "description": "A polyfill for getallheaders.",
+            "time": "2019-03-08T08:55:37+00:00"
+        },
         {
             "name": "symfony/polyfill-mbstring",
             "version": "v1.17.1",
diff --git a/src/PhpSpreadsheet/Calculation/Calculation.php b/src/PhpSpreadsheet/Calculation/Calculation.php
index ed630354..a8f93a88 100644
--- a/src/PhpSpreadsheet/Calculation/Calculation.php
+++ b/src/PhpSpreadsheet/Calculation/Calculation.php
@@ -2184,6 +2184,11 @@ class Calculation
             'functionCall' => [LookupRef::class, 'VLOOKUP'],
             'argumentCount' => '3,4',
         ],
+        'WEBSERVICE' => [
+            'category' => Category::CATEGORY_WEB,
+            'functionCall' => [Web::class, 'WEBSERVICE'],
+            'argumentCount' => '1',
+        ],
         'WEEKDAY' => [
             'category' => Category::CATEGORY_DATE_AND_TIME,
             'functionCall' => [DateTime::class, 'WEEKDAY'],
diff --git a/src/PhpSpreadsheet/Calculation/Category.php b/src/PhpSpreadsheet/Calculation/Category.php
index 7574cb47..96bb72ad 100644
--- a/src/PhpSpreadsheet/Calculation/Category.php
+++ b/src/PhpSpreadsheet/Calculation/Category.php
@@ -16,4 +16,5 @@ abstract class Category
     const CATEGORY_MATH_AND_TRIG = 'Math and Trig';
     const CATEGORY_STATISTICAL = 'Statistical';
     const CATEGORY_TEXT_AND_DATA = 'Text and Data';
+    const CATEGORY_WEB = 'Web';
 }
diff --git a/src/PhpSpreadsheet/Calculation/Web.php b/src/PhpSpreadsheet/Calculation/Web.php
new file mode 100644
index 00000000..9f0faf99
--- /dev/null
+++ b/src/PhpSpreadsheet/Calculation/Web.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Calculation;
+
+use GuzzleHttp\Psr7\Request;
+use PhpOffice\PhpSpreadsheet\Settings;
+use Psr\Http\Client\ClientExceptionInterface;
+
+class Web
+{
+    /**
+     * WEBSERVICE.
+     *
+     * Returns data from a web service on the Internet or Intranet.
+     *
+     * Excel Function:
+     *        Webservice(url)
+     *
+     * @return string the output resulting from a call to the webservice
+     */
+    public static function WEBSERVICE(string $url)
+    {
+        $url = trim($url);
+        if (strlen($url) > 2048) {
+            return Functions::VALUE(); // Invalid URL length
+        }
+
+        if (!preg_match('/^http[s]?:\/\//', $url)) {
+            return Functions::VALUE(); // Invalid protocol
+        }
+
+        // Get results from the the webservice
+        $client = Settings::getHttpClient();
+        $request = new Request('GET', $url);
+
+        try {
+            $response = $client->sendRequest($request);
+        } catch (ClientExceptionInterface $e) {
+            return Functions::VALUE(); // cURL error
+        }
+
+        if ($response->getStatusCode() != 200) {
+            return Functions::VALUE(); // cURL error
+        }
+
+        $output = (string) $response->getBody();
+        if (strlen($output) > 32767) {
+            return Functions::VALUE(); // Output not a string or too long
+        }
+
+        return $output;
+    }
+}
diff --git a/src/PhpSpreadsheet/Settings.php b/src/PhpSpreadsheet/Settings.php
index 4e0c91ef..15218c72 100644
--- a/src/PhpSpreadsheet/Settings.php
+++ b/src/PhpSpreadsheet/Settings.php
@@ -2,9 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheet;
 
+use GuzzleHttp\Client;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Chart\Renderer\IRenderer;
 use PhpOffice\PhpSpreadsheet\Collection\Memory;
+use Psr\Http\Client\ClientInterface;
 use Psr\SimpleCache\CacheInterface;
 
 class Settings
@@ -42,6 +44,13 @@ class Settings
      */
     private static $cache;
 
+    /**
+     * The HTTP client implementation to be used for network request.
+     *
+     * @var ClientInterface
+     */
+    private static $client;
+
     /**
      * Set the locale code to use for formula translations and any special formatting.
      *
@@ -156,4 +165,24 @@ class Settings
 
         return self::$cache;
     }
+
+    /**
+     * Set the HTTP client implementation to be used for network request.
+     */
+    public static function setHttpClient(ClientInterface $httpClient): void
+    {
+        self::$client = $httpClient;
+    }
+
+    /**
+     * Get the HTTP client implementation to be used for network request.
+     */
+    public static function getHttpClient(): ClientInterface
+    {
+        if (!self::$client) {
+            self::$client = new Client();
+        }
+
+        return self::$client;
+    }
 }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Web/WebServiceTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Web/WebServiceTest.php
new file mode 100644
index 00000000..acc83cff
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Web/WebServiceTest.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Web;
+
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\ClientException;
+use GuzzleHttp\Exception\ConnectException;
+use GuzzleHttp\Handler\MockHandler;
+use GuzzleHttp\HandlerStack;
+use GuzzleHttp\Psr7\Request;
+use GuzzleHttp\Psr7\Response;
+use PhpOffice\PhpSpreadsheet\Calculation\Functions;
+use PhpOffice\PhpSpreadsheet\Calculation\Web;
+use PhpOffice\PhpSpreadsheet\Settings;
+use PHPUnit\Framework\TestCase;
+
+class WebServiceTest extends TestCase
+{
+    protected static $client;
+
+    public static function setUpBeforeClass(): void
+    {
+        // Prevent URL requests being sent out
+        $mock = new MockHandler([
+            new ClientException('This is not a valid URL', new Request('GET', 'test'), new Response()),
+            new ConnectException('This is a 404 error', new Request('GET', 'test')),
+            new Response('200', [], str_repeat('a', 40000)),
+            new Response('200', [], 'This is a test'),
+        ]);
+
+        $handlerStack = HandlerStack::create($mock);
+        self::$client = new Client(['handler' => $handlerStack]);
+    }
+
+    protected function setUp(): void
+    {
+        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
+    }
+
+    /**
+     * @dataProvider providerWEBSERVICE
+     */
+    public function testWEBSERVICE(string $expectedResult, string $url): void
+    {
+        Settings::setHttpClient(self::$client);
+        $result = Web::WEBSERVICE($url);
+        self::assertEquals($expectedResult, $result);
+    }
+
+    public function providerWEBSERVICE(): array
+    {
+        return require 'tests/data/Calculation/Web/WEBSERVICE.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/DocumentGeneratorTest.php b/tests/PhpSpreadsheetTests/DocumentGeneratorTest.php
index ac9af838..8a34f1c0 100644
--- a/tests/PhpSpreadsheetTests/DocumentGeneratorTest.php
+++ b/tests/PhpSpreadsheetTests/DocumentGeneratorTest.php
@@ -127,6 +127,11 @@ Excel Function      | PhpSpreadsheet Function
 Excel Function      | PhpSpreadsheet Function
 --------------------|-------------------------------------------
 
+## CATEGORY_WEB
+
+Excel Function      | PhpSpreadsheet Function
+--------------------|-------------------------------------------
+
 EXPECTED
 
             ],
diff --git a/tests/data/Calculation/Web/WEBSERVICE.php b/tests/data/Calculation/Web/WEBSERVICE.php
new file mode 100644
index 00000000..6d9934da
--- /dev/null
+++ b/tests/data/Calculation/Web/WEBSERVICE.php
@@ -0,0 +1,28 @@
+<?php
+
+return [
+    [
+        '#VALUE!',
+        'http://www.thisurlisfartoolongLoremipsumdolorsitametconsecteturadipiscingelitAliquamimperdietmetusurnasedaliquampurusdapibusefficiturQuisqueatullamcorpermaurisacmattisanteDonecsagittisauguenullaegeinterduurnapharetrautQuisquealectusvelnisivolutpatpharetraSuspendisseconvallisvulputateblanditClassaptenttacitisociosquadlitoratorquentperconubianostraperinceptoshimenaeosProinjustdiampulvinaracjustoauctorimperdietsuscipitestEtiamacmaximusmassasitametvulputatedolorthisurlisfartoolongLoremipsumdolorsitametconsecteturadipiscingelitAliquamimperdietmetusurnasedaliquampurusdapibusefficiturQuisqueatullamcorpermaurisacmattisanteDonecsagittisauguenullaegeinterduurnapharetrautQuisquealectusvelnisivolutpatpharetraSuspendisseconvallisvulputateblanditClassaptenttacitisociosquadlitoratorquentperconubianostraperinceptoshimenaeosProinjustdiampulvinaracjustoauctorimperdietsuscipitestEtiamacmaximusmassasitametvulputatedolorthisurlisfartoolongLoremipsumdolorsitametconsecteturadipiscingelitAliquamimperdietmetusurnasedaliquampurusdapibusefficiturQuisqueatullamcorpermaurisacmattisanteDonecsagittisauguenullaegeinterduurnapharetrautQuisquealectusvelnisivolutpatpharetraSuspendisseconvallisvulputateblanditClassaptenttacitisociosquadlitoratorquentperconubianostraperinceptoshimenaeosProinjustdiampulvinaracjustoauctorimperdietsuscipitestEtiamacmaximusmassasitametvulputatedolorthisurlisfartoolongLoremipsumdolorsitametconsecteturadipiscingelitAliquamimperdietmetusurnasedaliquampurusdapibusefficiturQuisqueatullamcorpermaurisacmattisanteDonecsagittisauguenullaegeinterduurnapharetrautQuisquealectusvelnisivolutpatpharetraSuspendisseconvallisvulputateblanditClassaptenttacitisociosquadlitoratorquentperconubianostraperinceptoshimenaeosProinjustdiampulvinaracjustoauctorimperdietsuscipitestEtiamacmaximusmassasitametvulputatedolorthisurlisfartoolongLoremipsumdolorsitametconsecteturadipiscingelitAliquamimperdietmetusurnasedaliquampurusdapibusefficiturQuisqueatullamcorpermaurisacmattisanteDonecsagittisauguenullaegeinterduurnapharetrautQuisquealectusvelnisivolutpatpharetraSuspendisseconvallisvulputateblanditClassaptenttacitisociosquadlitoratorquentperconubianostraperinceptoshimenaeosProinjustdiampulvinaracjustoauctorimperdietsuscipitestEtiamacmaximusmassasitametvulputatedolorthisurlisfartoolongLoremipsumdolorsitametconsecteturadipiscingelitAliquamimperdietmetusurnasedaliquampurusdapibusefficiturQuisqueatullamcorpermaurisacmattisanteDonecsagittisauguenullaegeinterduurnapharetrautQuisquealectusvelnisivolutpatpharetraSuspendisseconvallisvulputateblanditClassaptenttacitisociosquadlitoratorquentperconubianostraperinceptoshimenaeosProinjustdiampulvinaracjustoauctorimperdietsuscipitestEtiamacmaximusmassasitametvulputatedolor.com',
+    ],
+    [
+        '#VALUE!',
+        'ftp://www.bla.com',
+    ],
+    [
+        '#VALUE!',
+        'http://notevenanurl',
+    ],
+    [
+        '#VALUE!',
+        'http://www.example1.com',
+    ],
+    [
+        '#VALUE!',
+        'http://www.example2.com',
+    ],
+    [
+        'This is a test',
+        'http://www.example3.com',
+    ],
+];

From 96e493ca511fc47d479597a1dc9f4aa91d0e7850 Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Mon, 29 Jun 2020 10:23:33 +0900
Subject: [PATCH 057/153] Update CHANGELOG

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f667053f..a945169e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Add Cell Address Helper to provide conversions between the R1C1 and A1 address formats [#1558](https://github.com/PHPOffice/PhpSpreadsheet/pull/1558)
 - Add ability to edit Html/Pdf before saving [#1499](https://github.com/PHPOffice/PhpSpreadsheet/pull/1499)
 - Add ability to set codepage explicitly for BIFF5 [#1018](https://github.com/PHPOffice/PhpSpreadsheet/issues/1018)
-- Added support for the WEBSERVICE function
+- Added support for the WEBSERVICE function [#1409](https://github.com/PHPOffice/PhpSpreadsheet/pull/1409)
 
 ### Fixed
 

From 73fe58fdc9f3977619bec6b26e867eb2ac059dcd Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Mon, 29 Jun 2020 10:51:21 +0900
Subject: [PATCH 058/153] 1.14.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a945169e..ebdbf775 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com)
 and this project adheres to [Semantic Versioning](https://semver.org).
 
-## [Unreleased]
+## [1.14.0] - 2020-06-29
 
 ### Added
 

From 39f1a611207ce74c87ee51bf2bcb9afb9450e221 Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Mon, 29 Jun 2020 10:52:36 +0900
Subject: [PATCH 059/153] CHANGELOG placeholder

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ebdbf775..48ee6293 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,20 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com)
 and this project adheres to [Semantic Versioning](https://semver.org).
 
+## [Unreleased]
+
+### Added
+
+- nothing
+
+### Fixed
+
+- nothing
+
+### Changed
+
+- nothing
+
 ## [1.14.0] - 2020-06-29
 
 ### Added

From 8712fb0424cc7240405c6c708a571f0f7ac3bfee Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Mon, 29 Jun 2020 11:28:05 +0900
Subject: [PATCH 060/153] Drop polyfill that are not needed since PHP 7.2

---
 src/PhpSpreadsheet/Chart/Renderer/JpGraph.php  | 2 --
 src/PhpSpreadsheet/Chart/Renderer/Polyfill.php | 9 ---------
 2 files changed, 11 deletions(-)
 delete mode 100644 src/PhpSpreadsheet/Chart/Renderer/Polyfill.php

diff --git a/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php b/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
index 5546da58..02fbfed7 100644
--- a/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
+++ b/src/PhpSpreadsheet/Chart/Renderer/JpGraph.php
@@ -21,8 +21,6 @@ use ScatterPlot;
 use Spline;
 use StockPlot;
 
-require_once __DIR__ . '/Polyfill.php';
-
 class JpGraph implements IRenderer
 {
     private static $width = 640;
diff --git a/src/PhpSpreadsheet/Chart/Renderer/Polyfill.php b/src/PhpSpreadsheet/Chart/Renderer/Polyfill.php
deleted file mode 100644
index 5e233abd..00000000
--- a/src/PhpSpreadsheet/Chart/Renderer/Polyfill.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-// This is a dirty workaround to output JpGraph charts even when antialiasing is not available
-if (!function_exists('imageantialias')) {
-    function imageantialias(...$args): void
-    {
-        // Do nothing
-    }
-}

From a0bba38281f82f48e5fc981b4abe4396e13dbead Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Mon, 29 Jun 2020 20:15:41 +0200
Subject: [PATCH 061/153] Support pageOrder in page setup for Xlsx Reader and
 Writer

---
 src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php |  3 +++
 src/PhpSpreadsheet/Worksheet/PageSetup.php   | 19 +++++++++++++++++++
 src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php |  3 +++
 3 files changed, 25 insertions(+)

diff --git a/src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php b/src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php
index bfb7a1f5..b556703c 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php
@@ -69,6 +69,9 @@ class PageSetup extends BaseParserClass
                 self::boolean((string) $xmlSheet->pageSetup['useFirstPageNumber'])) {
                 $docPageSetup->setFirstPageNumber((int) ($xmlSheet->pageSetup['firstPageNumber']));
             }
+            if (isset($xmlSheet->pageSetup['pageOrder'])) {
+                $docPageSetup->setPageOrder((string) $xmlSheet->pageSetup['pageOrder']);
+            }
 
             $relAttributes = $xmlSheet->pageSetup->attributes('http://schemas.openxmlformats.org/officeDocument/2006/relationships');
             if (isset($relAttributes['id'])) {
diff --git a/src/PhpSpreadsheet/Worksheet/PageSetup.php b/src/PhpSpreadsheet/Worksheet/PageSetup.php
index f29dbad5..f52b414a 100644
--- a/src/PhpSpreadsheet/Worksheet/PageSetup.php
+++ b/src/PhpSpreadsheet/Worksheet/PageSetup.php
@@ -156,6 +156,9 @@ class PageSetup
     const SETPRINTRANGE_OVERWRITE = 'O';
     const SETPRINTRANGE_INSERT = 'I';
 
+    const PAGEORDER_OVER_THEN_DOWN = 'overThenDown';
+    const PAGEORDER_DOWN_THEN_OVER = 'downThenOver';
+
     /**
      * Paper size.
      *
@@ -246,6 +249,8 @@ class PageSetup
      */
     private $firstPageNumber;
 
+    private $pageOrder;
+
     /**
      * Create a new PageSetup.
      */
@@ -818,6 +823,20 @@ class PageSetup
         return $this->setFirstPageNumber(null);
     }
 
+    public function getPageOrder(): string
+    {
+        return $this->pageOrder;
+    }
+
+    public function setPageOrder(?string $pageOrder): self
+    {
+        if ($pageOrder === null || $pageOrder === self::PAGEORDER_DOWN_THEN_OVER || $pageOrder === self::PAGEORDER_OVER_THEN_DOWN) {
+            $this->pageOrder = $pageOrder;
+        }
+
+        return $this;
+    }
+
     /**
      * Implement PHP __clone to create a deep clone, not just a shallow copy.
      */
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php b/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
index be064256..2a8a3add 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
@@ -875,6 +875,9 @@ class Worksheet extends WriterPart
             $objWriter->writeAttribute('firstPageNumber', $pSheet->getPageSetup()->getFirstPageNumber());
             $objWriter->writeAttribute('useFirstPageNumber', '1');
         }
+        if ($pSheet->getPageSetup()->getPageOrder() !== null) {
+            $objWriter->writeAttribute('pageOrder', $pSheet->getPageSetup()->getPageOrder());
+        }
 
         $getUnparsedLoadedData = $pSheet->getParent()->getUnparsedLoadedData();
         if (isset($getUnparsedLoadedData['sheets'][$pSheet->getCodeName()]['pageSetupRelId'])) {

From 21b34f0afbabb30da2bd19980bb052ccf1295129 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Mon, 29 Jun 2020 20:27:47 +0200
Subject: [PATCH 062/153] pageOrder is nullable

---
 src/PhpSpreadsheet/Worksheet/PageSetup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpSpreadsheet/Worksheet/PageSetup.php b/src/PhpSpreadsheet/Worksheet/PageSetup.php
index f52b414a..290b8349 100644
--- a/src/PhpSpreadsheet/Worksheet/PageSetup.php
+++ b/src/PhpSpreadsheet/Worksheet/PageSetup.php
@@ -823,7 +823,7 @@ class PageSetup
         return $this->setFirstPageNumber(null);
     }
 
-    public function getPageOrder(): string
+    public function getPageOrder(): ?string
     {
         return $this->pageOrder;
     }

From 362b18ca122412eb12d2287aa9f329dba328cd54 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Tue, 30 Jun 2020 00:53:10 +0200
Subject: [PATCH 063/153] Read Print Settings Page Order in Xls Reader And
 eliminate switch for simple boolean portrait/landscape option

---
 src/PhpSpreadsheet/Reader/Xls.php | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/PhpSpreadsheet/Reader/Xls.php b/src/PhpSpreadsheet/Reader/Xls.php
index 11a6195c..c60ea772 100644
--- a/src/PhpSpreadsheet/Reader/Xls.php
+++ b/src/PhpSpreadsheet/Reader/Xls.php
@@ -3444,6 +3444,9 @@ class Xls extends BaseReader
 
             // offset: 10; size: 2; option flags
 
+            // bit: 0; mask: 0x0001; 0=landscape, 1=portrait
+            $isOverThenDown= (0x0001 & self::getUInt2d($recordData, 10));
+
             // bit: 1; mask: 0x0002; 0=landscape, 1=portrait
             $isPortrait = (0x0002 & self::getUInt2d($recordData, 10)) >> 1;
 
@@ -3453,16 +3456,8 @@ class Xls extends BaseReader
 
             if (!$isNotInit) {
                 $this->phpSheet->getPageSetup()->setPaperSize($paperSize);
-                switch ($isPortrait) {
-                    case 0:
-                        $this->phpSheet->getPageSetup()->setOrientation(PageSetup::ORIENTATION_LANDSCAPE);
-
-                        break;
-                    case 1:
-                        $this->phpSheet->getPageSetup()->setOrientation(PageSetup::ORIENTATION_PORTRAIT);
-
-                        break;
-                }
+                $this->phpSheet->getPageSetup()->setPageOrder(((bool) $isOverThenDown) ? PageSetup::PAGEORDER_OVER_THEN_DOWN : PageSetup::PAGEORDER_DOWN_THEN_OVER);
+                $this->phpSheet->getPageSetup()->setOrientation(((bool) $isPortrait) ? PageSetup::ORIENTATION_PORTRAIT : PageSetup::ORIENTATION_LANDSCAPE);
 
                 $this->phpSheet->getPageSetup()->setScale($scale, false);
                 $this->phpSheet->getPageSetup()->setFitToPage((bool) $this->isFitToPages);

From 4060cdec7e9e73919e154e8e89d0873def567588 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Tue, 30 Jun 2020 01:11:53 +0200
Subject: [PATCH 064/153] Fix comment

---
 src/PhpSpreadsheet/Reader/Xls.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpSpreadsheet/Reader/Xls.php b/src/PhpSpreadsheet/Reader/Xls.php
index c60ea772..5e4ee225 100644
--- a/src/PhpSpreadsheet/Reader/Xls.php
+++ b/src/PhpSpreadsheet/Reader/Xls.php
@@ -3444,7 +3444,7 @@ class Xls extends BaseReader
 
             // offset: 10; size: 2; option flags
 
-            // bit: 0; mask: 0x0001; 0=landscape, 1=portrait
+            // bit: 0; mask: 0x0001; 0=down then over, 1=over then down
             $isOverThenDown= (0x0001 & self::getUInt2d($recordData, 10));
 
             // bit: 1; mask: 0x0002; 0=landscape, 1=portrait

From fbb04c1f8203420e9aa7171b8f2a87fe1c55b642 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Tue, 30 Jun 2020 07:01:51 +0200
Subject: [PATCH 065/153] Xls Writer changes to save print order

---
 src/PhpSpreadsheet/Writer/Xls/Worksheet.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/PhpSpreadsheet/Writer/Xls/Worksheet.php b/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
index 0dce7ba5..1a4504ed 100644
--- a/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
+++ b/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
@@ -1729,11 +1729,12 @@ class Worksheet extends BIFFwriter
         $numFtr = $this->phpSheet->getPageMargins()->getFooter(); // Footer Margin
         $iCopies = 0x01; // Number of copies
 
-        $fLeftToRight = 0x0; // Print over then down
-
+        // Order of printing pages
+        $fLeftToRight = $this->phpSheet->getPageSetup()->getPageOrder() == PageSetup::PAGEORDER_OVER_THEN_DOWN
+            ? 0x0 : 0x1;
         // Page orientation
-        $fLandscape = ($this->phpSheet->getPageSetup()->getOrientation() == PageSetup::ORIENTATION_LANDSCAPE) ?
-            0x0 : 0x1;
+        $fLandscape = ($this->phpSheet->getPageSetup()->getOrientation() == PageSetup::ORIENTATION_LANDSCAPE)
+            ? 0x0 : 0x1;
 
         $fNoPls = 0x0; // Setup not read from printer
         $fNoColor = 0x0; // Print black and white

From 1f865c84c0d960c09b08d731edbac20797131cad Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Tue, 30 Jun 2020 07:24:12 +0200
Subject: [PATCH 066/153] Keep phpcs happy

---
 src/PhpSpreadsheet/Reader/Xls.php           | 2 +-
 src/PhpSpreadsheet/Writer/Xls/Worksheet.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/PhpSpreadsheet/Reader/Xls.php b/src/PhpSpreadsheet/Reader/Xls.php
index 5e4ee225..cdac07d0 100644
--- a/src/PhpSpreadsheet/Reader/Xls.php
+++ b/src/PhpSpreadsheet/Reader/Xls.php
@@ -3445,7 +3445,7 @@ class Xls extends BaseReader
             // offset: 10; size: 2; option flags
 
             // bit: 0; mask: 0x0001; 0=down then over, 1=over then down
-            $isOverThenDown= (0x0001 & self::getUInt2d($recordData, 10));
+            $isOverThenDown = (0x0001 & self::getUInt2d($recordData, 10));
 
             // bit: 1; mask: 0x0002; 0=landscape, 1=portrait
             $isPortrait = (0x0002 & self::getUInt2d($recordData, 10)) >> 1;
diff --git a/src/PhpSpreadsheet/Writer/Xls/Worksheet.php b/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
index 1a4504ed..eb6b479d 100644
--- a/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
+++ b/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
@@ -1730,8 +1730,8 @@ class Worksheet extends BIFFwriter
         $iCopies = 0x01; // Number of copies
 
         // Order of printing pages
-        $fLeftToRight = $this->phpSheet->getPageSetup()->getPageOrder() == PageSetup::PAGEORDER_OVER_THEN_DOWN
-            ? 0x0 : 0x1;
+        $fLeftToRight = $this->phpSheet->getPageSetup()->getPageOrder() === PageSetup::PAGEORDER_DOWN_THEN_OVER
+            ? 0x1 : 0x0;
         // Page orientation
         $fLandscape = ($this->phpSheet->getPageSetup()->getOrientation() == PageSetup::ORIENTATION_LANDSCAPE)
             ? 0x0 : 0x1;

From 3780072ae96fbe8f61c1b2109d217e62616c4f1e Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Tue, 30 Jun 2020 19:07:56 +0200
Subject: [PATCH 067/153] Retrieve basic print settings in the Ods Reader

---
 src/PhpSpreadsheet/Reader/Ods.php | 89 ++++++++++++++++++++++++++++++-
 1 file changed, 87 insertions(+), 2 deletions(-)

diff --git a/src/PhpSpreadsheet/Reader/Ods.php b/src/PhpSpreadsheet/Reader/Ods.php
index d638d1fb..d3482716 100644
--- a/src/PhpSpreadsheet/Reader/Ods.php
+++ b/src/PhpSpreadsheet/Reader/Ods.php
@@ -19,11 +19,19 @@ use PhpOffice\PhpSpreadsheet\Shared\Date;
 use PhpOffice\PhpSpreadsheet\Shared\File;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use XMLReader;
 use ZipArchive;
 
 class Ods extends BaseReader
 {
+    private $pageLayoutStyles = [];
+
+    private $masterStylesCrossReference = [];
+
+    private $masterPrintStylesCrossReference = [];
+
     /**
      * Create a new Ods Reader instance.
      */
@@ -276,7 +284,45 @@ class Ods extends BaseReader
 
         (new DocumentProperties($spreadsheet))->load($xml, $namespacesMeta);
 
-        // Content
+        // Styles
+
+        $dom = new DOMDocument('1.01', 'UTF-8');
+        $dom->loadXML(
+            $this->securityScanner->scan($zip->getFromName('styles.xml')),
+            Settings::getLibXmlLoaderOptions()
+        );
+        $officeNs = $dom->lookupNamespaceUri('office');
+        $stylesNs = $dom->lookupNamespaceUri('style');
+
+        $styles = $dom->getElementsByTagNameNS($officeNs, 'automatic-styles')
+            ->item(0)
+            ->getElementsByTagNameNS($stylesNs, 'page-layout');
+
+        foreach ($styles as $styleSet) {
+            $styleName = $styleSet->getAttributeNS($stylesNs, 'name');
+            $pageLayoutProperties = $styleSet->getElementsByTagNameNS($stylesNs, 'page-layout-properties')[0];
+            $styleOrientation = $pageLayoutProperties->getAttributeNS($stylesNs, 'print-orientation');
+            $styleScale = $pageLayoutProperties->getAttributeNS($stylesNs, 'scale-to');
+            $stylePrintOrder = $pageLayoutProperties->getAttributeNS($stylesNs, 'print-page-order');
+
+            $this->pageLayoutStyles[$styleName] = (object) [
+                'orientation' => $styleOrientation,
+                'scale' => $styleScale,
+                'printOrder' => $stylePrintOrder,
+            ];
+        }
+
+        $styleMasterLookup = $dom->getElementsByTagNameNS($officeNs, 'master-styles')
+            ->item(0)
+            ->getElementsByTagNameNS($stylesNs, 'master-page');
+
+        foreach ($styleMasterLookup as $styleMasterSet) {
+            $styleMasterName = $styleMasterSet->getAttributeNS($stylesNs, 'name');
+            $pageLayoutName = $styleMasterSet->getAttributeNS($stylesNs, 'page-layout-name');
+            $this->masterPrintStylesCrossReference[$styleMasterName] = $pageLayoutName;
+        }
+
+        // Main Content
 
         $dom = new DOMDocument('1.01', 'UTF-8');
         $dom->loadXML(
@@ -289,6 +335,20 @@ class Ods extends BaseReader
         $textNs = $dom->lookupNamespaceUri('text');
         $xlinkNs = $dom->lookupNamespaceUri('xlink');
 
+        $styleXReferences = $dom->getElementsByTagNameNS($officeNs, 'automatic-styles')
+            ->item(0)
+            ->getElementsByTagNameNS($stylesNs, 'style');
+
+        foreach ($styleXReferences as $styleXreferenceSet) {
+            $styleXRefName = $styleXreferenceSet->getAttributeNS($stylesNs, 'name');
+            $stylePageLayoutName = $styleXreferenceSet->getAttributeNS($stylesNs, 'master-page-name');
+            if (!empty($stylePageLayoutName)) {
+                $this->masterStylesCrossReference[$styleXRefName] = $stylePageLayoutName;
+            }
+        }
+
+        // Content
+
         $spreadsheets = $dom->getElementsByTagNameNS($officeNs, 'body')
             ->item(0)
             ->getElementsByTagNameNS($officeNs, 'spreadsheet');
@@ -309,6 +369,8 @@ class Ods extends BaseReader
                     continue;
                 }
 
+                $worksheetStyleName = $worksheetDataSet->getAttributeNS($tableNs, 'style-name');
+
                 // Create sheet
                 if ($worksheetID > 0) {
                     $spreadsheet->createSheet(); // First sheet is added by default
@@ -319,7 +381,7 @@ class Ods extends BaseReader
                     // Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in
                     // formula cells... during the load, all formulae should be correct, and we're simply
                     // bringing the worksheet name in line with the formula, not the reverse
-                    $spreadsheet->getActiveSheet()->setTitle($worksheetName, false, false);
+                    $spreadsheet->getActiveSheet()->setTitle((string) $worksheetName, false, false);
                 }
 
                 // Go through every child of table element
@@ -641,6 +703,7 @@ class Ods extends BaseReader
                             break;
                     }
                 }
+                $this->getPrintSettings($spreadsheet->getActiveSheet(), $worksheetStyleName);
                 ++$worksheetID;
             }
         }
@@ -649,6 +712,28 @@ class Ods extends BaseReader
         return $spreadsheet;
     }
 
+    private function getPrintSettings(Worksheet $worksheet, string $styleName)
+    {
+        if (!array_key_exists($styleName, $this->masterStylesCrossReference)) {
+            return;
+        }
+        $masterStyleName = $this->masterStylesCrossReference[$styleName];
+
+        if (!array_key_exists($masterStyleName, $this->masterPrintStylesCrossReference)) {
+            return;
+        }
+        $printSettingsIndex = $this->masterPrintStylesCrossReference[$masterStyleName];
+
+        if (!array_key_exists($printSettingsIndex, $this->pageLayoutStyles)) {
+            return;
+        }
+        $printSettings = $this->pageLayoutStyles[$printSettingsIndex];
+
+        $worksheet->getPageSetup()->setOrientation($printSettings->orientation ?? PageSetup::ORIENTATION_DEFAULT);
+        $worksheet->getPageSetup()->setScale((int) trim($printSettings->scale, '%'));
+        $worksheet->getPageSetup()->setPageOrder($printSettings->printOrder === 'ltr' ? PageSetup::PAGEORDER_OVER_THEN_DOWN : PageSetup::PAGEORDER_DOWN_THEN_OVER);
+    }
+
     /**
      * Recursively scan element.
      *

From 13a3363410e44c7d30814be3e7c94c2e68ddbff7 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Tue, 30 Jun 2020 19:15:08 +0200
Subject: [PATCH 068/153] Return void, just to keep phpcs happy

---
 src/PhpSpreadsheet/Reader/Ods.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpSpreadsheet/Reader/Ods.php b/src/PhpSpreadsheet/Reader/Ods.php
index d3482716..040bfffa 100644
--- a/src/PhpSpreadsheet/Reader/Ods.php
+++ b/src/PhpSpreadsheet/Reader/Ods.php
@@ -712,7 +712,7 @@ class Ods extends BaseReader
         return $spreadsheet;
     }
 
-    private function getPrintSettings(Worksheet $worksheet, string $styleName)
+    private function getPrintSettings(Worksheet $worksheet, string $styleName): void
     {
         if (!array_key_exists($styleName, $this->masterStylesCrossReference)) {
             return;

From 4dadf4a5c8d816e2f9ff04d9f803b5b1ad18f680 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Tue, 30 Jun 2020 22:23:33 +0200
Subject: [PATCH 069/153] Refactor reading Ods Page Settings into a separate
 class

---
 src/PhpSpreadsheet/Reader/Ods.php             |  69 +-----------
 .../Reader/Ods/PageSettings.php               | 104 ++++++++++++++++++
 2 files changed, 108 insertions(+), 65 deletions(-)
 create mode 100644 src/PhpSpreadsheet/Reader/Ods/PageSettings.php

diff --git a/src/PhpSpreadsheet/Reader/Ods.php b/src/PhpSpreadsheet/Reader/Ods.php
index 040bfffa..ad87192f 100644
--- a/src/PhpSpreadsheet/Reader/Ods.php
+++ b/src/PhpSpreadsheet/Reader/Ods.php
@@ -11,6 +11,7 @@ use DOMNode;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\Reader\Ods\PageSettings;
 use PhpOffice\PhpSpreadsheet\Reader\Ods\Properties as DocumentProperties;
 use PhpOffice\PhpSpreadsheet\Reader\Security\XmlScanner;
 use PhpOffice\PhpSpreadsheet\RichText\RichText;
@@ -19,8 +20,6 @@ use PhpOffice\PhpSpreadsheet\Shared\Date;
 use PhpOffice\PhpSpreadsheet\Shared\File;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
-use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
-use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use XMLReader;
 use ZipArchive;
 
@@ -291,36 +290,8 @@ class Ods extends BaseReader
             $this->securityScanner->scan($zip->getFromName('styles.xml')),
             Settings::getLibXmlLoaderOptions()
         );
-        $officeNs = $dom->lookupNamespaceUri('office');
-        $stylesNs = $dom->lookupNamespaceUri('style');
 
-        $styles = $dom->getElementsByTagNameNS($officeNs, 'automatic-styles')
-            ->item(0)
-            ->getElementsByTagNameNS($stylesNs, 'page-layout');
-
-        foreach ($styles as $styleSet) {
-            $styleName = $styleSet->getAttributeNS($stylesNs, 'name');
-            $pageLayoutProperties = $styleSet->getElementsByTagNameNS($stylesNs, 'page-layout-properties')[0];
-            $styleOrientation = $pageLayoutProperties->getAttributeNS($stylesNs, 'print-orientation');
-            $styleScale = $pageLayoutProperties->getAttributeNS($stylesNs, 'scale-to');
-            $stylePrintOrder = $pageLayoutProperties->getAttributeNS($stylesNs, 'print-page-order');
-
-            $this->pageLayoutStyles[$styleName] = (object) [
-                'orientation' => $styleOrientation,
-                'scale' => $styleScale,
-                'printOrder' => $stylePrintOrder,
-            ];
-        }
-
-        $styleMasterLookup = $dom->getElementsByTagNameNS($officeNs, 'master-styles')
-            ->item(0)
-            ->getElementsByTagNameNS($stylesNs, 'master-page');
-
-        foreach ($styleMasterLookup as $styleMasterSet) {
-            $styleMasterName = $styleMasterSet->getAttributeNS($stylesNs, 'name');
-            $pageLayoutName = $styleMasterSet->getAttributeNS($stylesNs, 'page-layout-name');
-            $this->masterPrintStylesCrossReference[$styleMasterName] = $pageLayoutName;
-        }
+        $pageSettings = new PageSettings($dom);
 
         // Main Content
 
@@ -335,17 +306,7 @@ class Ods extends BaseReader
         $textNs = $dom->lookupNamespaceUri('text');
         $xlinkNs = $dom->lookupNamespaceUri('xlink');
 
-        $styleXReferences = $dom->getElementsByTagNameNS($officeNs, 'automatic-styles')
-            ->item(0)
-            ->getElementsByTagNameNS($stylesNs, 'style');
-
-        foreach ($styleXReferences as $styleXreferenceSet) {
-            $styleXRefName = $styleXreferenceSet->getAttributeNS($stylesNs, 'name');
-            $stylePageLayoutName = $styleXreferenceSet->getAttributeNS($stylesNs, 'master-page-name');
-            if (!empty($stylePageLayoutName)) {
-                $this->masterStylesCrossReference[$styleXRefName] = $stylePageLayoutName;
-            }
-        }
+        $pageSettings->readStyleCrossReferences($dom);
 
         // Content
 
@@ -703,7 +664,7 @@ class Ods extends BaseReader
                             break;
                     }
                 }
-                $this->getPrintSettings($spreadsheet->getActiveSheet(), $worksheetStyleName);
+                $pageSettings->setPrintSettingsForWorksheet($spreadsheet->getActiveSheet(), $worksheetStyleName);
                 ++$worksheetID;
             }
         }
@@ -712,28 +673,6 @@ class Ods extends BaseReader
         return $spreadsheet;
     }
 
-    private function getPrintSettings(Worksheet $worksheet, string $styleName): void
-    {
-        if (!array_key_exists($styleName, $this->masterStylesCrossReference)) {
-            return;
-        }
-        $masterStyleName = $this->masterStylesCrossReference[$styleName];
-
-        if (!array_key_exists($masterStyleName, $this->masterPrintStylesCrossReference)) {
-            return;
-        }
-        $printSettingsIndex = $this->masterPrintStylesCrossReference[$masterStyleName];
-
-        if (!array_key_exists($printSettingsIndex, $this->pageLayoutStyles)) {
-            return;
-        }
-        $printSettings = $this->pageLayoutStyles[$printSettingsIndex];
-
-        $worksheet->getPageSetup()->setOrientation($printSettings->orientation ?? PageSetup::ORIENTATION_DEFAULT);
-        $worksheet->getPageSetup()->setScale((int) trim($printSettings->scale, '%'));
-        $worksheet->getPageSetup()->setPageOrder($printSettings->printOrder === 'ltr' ? PageSetup::PAGEORDER_OVER_THEN_DOWN : PageSetup::PAGEORDER_DOWN_THEN_OVER);
-    }
-
     /**
      * Recursively scan element.
      *
diff --git a/src/PhpSpreadsheet/Reader/Ods/PageSettings.php b/src/PhpSpreadsheet/Reader/Ods/PageSettings.php
new file mode 100644
index 00000000..5ff1d58b
--- /dev/null
+++ b/src/PhpSpreadsheet/Reader/Ods/PageSettings.php
@@ -0,0 +1,104 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Ods;
+
+use DOMDocument;
+use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class PageSettings
+{
+    private $officeNs;
+    private $stylesNs;
+
+    private $pageLayoutStyles = [];
+
+    private $masterStylesCrossReference = [];
+
+    private $masterPrintStylesCrossReference = [];
+
+    public function __construct(DOMDocument $styleDom)
+    {
+        $this->setDomNameSpaces($styleDom);
+        $this->readPageSettingStyles($styleDom);
+        $this->readStyleMasterLookup($styleDom);
+    }
+
+    private function setDomNameSpaces(DOMDocument $styleDom): void
+    {
+        $this->officeNs = $styleDom->lookupNamespaceUri('office');
+        $this->stylesNs = $styleDom->lookupNamespaceUri('style');
+    }
+
+    private function readPageSettingStyles(DOMDocument $styleDom): void
+    {
+        $styles = $styleDom->getElementsByTagNameNS($this->officeNs, 'automatic-styles')
+            ->item(0)
+            ->getElementsByTagNameNS($this->stylesNs, 'page-layout');
+
+        foreach ($styles as $styleSet) {
+            $styleName = $styleSet->getAttributeNS($this->stylesNs, 'name');
+            $pageLayoutProperties = $styleSet->getElementsByTagNameNS($this->stylesNs, 'page-layout-properties')[0];
+            $styleOrientation = $pageLayoutProperties->getAttributeNS($this->stylesNs, 'print-orientation');
+            $styleScale = $pageLayoutProperties->getAttributeNS($this->stylesNs, 'scale-to');
+            $stylePrintOrder = $pageLayoutProperties->getAttributeNS($this->stylesNs, 'print-page-order');
+
+            $this->pageLayoutStyles[$styleName] = (object) [
+                'orientation' => $styleOrientation,
+                'scale' => $styleScale,
+                'printOrder' => $stylePrintOrder,
+            ];
+        }
+    }
+
+    private function readStyleMasterLookup(DOMDocument $styleDom): void
+    {
+        $styleMasterLookup = $styleDom->getElementsByTagNameNS($this->officeNs, 'master-styles')
+            ->item(0)
+            ->getElementsByTagNameNS($this->stylesNs, 'master-page');
+
+        foreach ($styleMasterLookup as $styleMasterSet) {
+            $styleMasterName = $styleMasterSet->getAttributeNS($this->stylesNs, 'name');
+            $pageLayoutName = $styleMasterSet->getAttributeNS($this->stylesNs, 'page-layout-name');
+            $this->masterPrintStylesCrossReference[$styleMasterName] = $pageLayoutName;
+        }
+    }
+
+    public function readStyleCrossReferences(DOMDocument $contentDom): void
+    {
+        $styleXReferences = $contentDom->getElementsByTagNameNS($this->officeNs, 'automatic-styles')
+            ->item(0)
+            ->getElementsByTagNameNS($this->stylesNs, 'style');
+
+        foreach ($styleXReferences as $styleXreferenceSet) {
+            $styleXRefName = $styleXreferenceSet->getAttributeNS($this->stylesNs, 'name');
+            $stylePageLayoutName = $styleXreferenceSet->getAttributeNS($this->stylesNs, 'master-page-name');
+            if (!empty($stylePageLayoutName)) {
+                $this->masterStylesCrossReference[$styleXRefName] = $stylePageLayoutName;
+            }
+        }
+    }
+
+    public function setPrintSettingsForWorksheet(Worksheet $worksheet, string $styleName): void
+    {
+        if (!array_key_exists($styleName, $this->masterStylesCrossReference)) {
+            return;
+        }
+        $masterStyleName = $this->masterStylesCrossReference[$styleName];
+
+        if (!array_key_exists($masterStyleName, $this->masterPrintStylesCrossReference)) {
+            return;
+        }
+        $printSettingsIndex = $this->masterPrintStylesCrossReference[$masterStyleName];
+
+        if (!array_key_exists($printSettingsIndex, $this->pageLayoutStyles)) {
+            return;
+        }
+        $printSettings = $this->pageLayoutStyles[$printSettingsIndex];
+
+        $worksheet->getPageSetup()
+            ->setOrientation($printSettings->orientation ?? PageSetup::ORIENTATION_DEFAULT)
+            ->setPageOrder($printSettings->printOrder === 'ltr' ? PageSetup::PAGEORDER_OVER_THEN_DOWN : PageSetup::PAGEORDER_DOWN_THEN_OVER)
+            ->setScale((int) trim($printSettings->scale, '%'));
+    }
+}

From 736d9ffd3b03667a2038a12876b8a0c5df0e54d9 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Tue, 30 Jun 2020 22:45:08 +0200
Subject: [PATCH 070/153] Gotta keep phpcs happy, even if it is only a blank
 line between property declarations

---
 src/PhpSpreadsheet/Reader/Ods/PageSettings.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/PhpSpreadsheet/Reader/Ods/PageSettings.php b/src/PhpSpreadsheet/Reader/Ods/PageSettings.php
index 5ff1d58b..6810ef5f 100644
--- a/src/PhpSpreadsheet/Reader/Ods/PageSettings.php
+++ b/src/PhpSpreadsheet/Reader/Ods/PageSettings.php
@@ -9,6 +9,7 @@ use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 class PageSettings
 {
     private $officeNs;
+
     private $stylesNs;
 
     private $pageLayoutStyles = [];

From 163da065054345959b25550702c532738b046d5e Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Wed, 1 Jul 2020 14:50:13 +0200
Subject: [PATCH 071/153] Horizontal an dVertical centering for the Ods Reader

---
 src/PhpSpreadsheet/Reader/Ods/PageSettings.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/PhpSpreadsheet/Reader/Ods/PageSettings.php b/src/PhpSpreadsheet/Reader/Ods/PageSettings.php
index 6810ef5f..4a1fc065 100644
--- a/src/PhpSpreadsheet/Reader/Ods/PageSettings.php
+++ b/src/PhpSpreadsheet/Reader/Ods/PageSettings.php
@@ -43,11 +43,14 @@ class PageSettings
             $styleOrientation = $pageLayoutProperties->getAttributeNS($this->stylesNs, 'print-orientation');
             $styleScale = $pageLayoutProperties->getAttributeNS($this->stylesNs, 'scale-to');
             $stylePrintOrder = $pageLayoutProperties->getAttributeNS($this->stylesNs, 'print-page-order');
+            $centered = $pageLayoutProperties->getAttributeNS($this->stylesNs, 'table-centering');
 
             $this->pageLayoutStyles[$styleName] = (object) [
                 'orientation' => $styleOrientation,
                 'scale' => $styleScale,
                 'printOrder' => $stylePrintOrder,
+                'horizontalCentered' => $centered === 'horizontal' || $centered === 'both',
+                'verticalCentered' => $centered === 'vertical' || $centered === 'both',
             ];
         }
     }
@@ -100,6 +103,8 @@ class PageSettings
         $worksheet->getPageSetup()
             ->setOrientation($printSettings->orientation ?? PageSetup::ORIENTATION_DEFAULT)
             ->setPageOrder($printSettings->printOrder === 'ltr' ? PageSetup::PAGEORDER_OVER_THEN_DOWN : PageSetup::PAGEORDER_DOWN_THEN_OVER)
-            ->setScale((int) trim($printSettings->scale, '%'));
+            ->setScale((int) trim($printSettings->scale, '%'))
+            ->setHorizontalCentered($printSettings->horizontalCentered)
+            ->setVerticalCentered($printSettings->verticalCentered);
     }
 }

From e644cc72d03df950e211c0b711e0a8b9f550c9fe Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Wed, 1 Jul 2020 19:55:25 +0200
Subject: [PATCH 072/153] Additional print information for Gnumeric

---
 src/PhpSpreadsheet/Reader/Gnumeric.php | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/PhpSpreadsheet/Reader/Gnumeric.php b/src/PhpSpreadsheet/Reader/Gnumeric.php
index 81096730..4d4988e9 100644
--- a/src/PhpSpreadsheet/Reader/Gnumeric.php
+++ b/src/PhpSpreadsheet/Reader/Gnumeric.php
@@ -17,6 +17,7 @@ use PhpOffice\PhpSpreadsheet\Style\Border;
 use PhpOffice\PhpSpreadsheet\Style\Borders;
 use PhpOffice\PhpSpreadsheet\Style\Fill;
 use PhpOffice\PhpSpreadsheet\Style\Font;
+use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use SimpleXMLElement;
 use XMLReader;
@@ -431,15 +432,35 @@ class Gnumeric extends BaseReader
         }
     }
 
+    private function printInformation(SimpleXMLElement $sheet)
+    {
+        if (!$this->readDataOnly && isset($sheet->PrintInformation)) {
+            $printInformation = $sheet->PrintInformation[0];
+            $scale = $printInformation->Scale->attributes()['percentage'];
+            $pageOrder = (string) $printInformation->order;
+            $orientation = (string) $printInformation->orientation;
+            $horizontalCentered = (bool) $printInformation->hcenter;
+            $verticalCentered = (bool) $printInformation->vcenter;
+
+            $this->spreadsheet->getActiveSheet()->getPageSetup()
+                ->setPageOrder($pageOrder === 'r_then_d' ? PageSetup::PAGEORDER_OVER_THEN_DOWN : PageSetup::PAGEORDER_DOWN_THEN_OVER)
+                ->setScale((int) $scale)
+                ->setOrientation($orientation ?? PageSetup::ORIENTATION_DEFAULT)
+                ->setHorizontalCentered($horizontalCentered)
+                ->setVerticalCentered($verticalCentered);
+        }
+    }
+
     private function sheetMargins(SimpleXMLElement $sheet): void
     {
         if (!$this->readDataOnly && isset($sheet->PrintInformation, $sheet->PrintInformation->Margins)) {
             foreach ($sheet->PrintInformation->Margins->children($this->gnm, true) as $key => $margin) {
                 $marginAttributes = $margin->attributes();
-                $marginSize = 72 / 100; //    Default
+                $marginSize = $marginAttributes['Points'] ?? 72 / 100; //    Default
                 switch ($marginAttributes['PrefUnit']) {
+                    case 'inch':
                     case 'mm':
-                        $marginSize = (int) ($marginAttributes['Points']) / 100;
+                        $marginSize = ($marginAttributes['Points']) / 100;
 
                         break;
                 }
@@ -513,6 +534,7 @@ class Gnumeric extends BaseReader
             //        name in line with the formula, not the reverse
             $this->spreadsheet->getActiveSheet()->setTitle($worksheetName, false, false);
 
+            $this->printInformation($sheet);
             $this->sheetMargins($sheet);
 
             foreach ($sheet->Cells->Cell as $cell) {

From c288c11d0150521e9383cc9cfa217f6891bf733b Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Wed, 1 Jul 2020 20:06:36 +0200
Subject: [PATCH 073/153] Failed to avoid the void trap

---
 src/PhpSpreadsheet/Reader/Gnumeric.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpSpreadsheet/Reader/Gnumeric.php b/src/PhpSpreadsheet/Reader/Gnumeric.php
index 4d4988e9..d96d562e 100644
--- a/src/PhpSpreadsheet/Reader/Gnumeric.php
+++ b/src/PhpSpreadsheet/Reader/Gnumeric.php
@@ -432,7 +432,7 @@ class Gnumeric extends BaseReader
         }
     }
 
-    private function printInformation(SimpleXMLElement $sheet)
+    private function printInformation(SimpleXMLElement $sheet): void
     {
         if (!$this->readDataOnly && isset($sheet->PrintInformation)) {
             $printInformation = $sheet->PrintInformation[0];

From aecef1372f9582153b42df9b0e4fb8d67f5ef21c Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Fri, 3 Jul 2020 19:26:57 +0200
Subject: [PATCH 074/153] Read Ods Margins

---
 src/PhpSpreadsheet/Reader/Ods.php             |  6 -----
 .../Reader/Ods/PageSettings.php               | 27 +++++++++++++++++++
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/PhpSpreadsheet/Reader/Ods.php b/src/PhpSpreadsheet/Reader/Ods.php
index ad87192f..4f164b6f 100644
--- a/src/PhpSpreadsheet/Reader/Ods.php
+++ b/src/PhpSpreadsheet/Reader/Ods.php
@@ -25,12 +25,6 @@ use ZipArchive;
 
 class Ods extends BaseReader
 {
-    private $pageLayoutStyles = [];
-
-    private $masterStylesCrossReference = [];
-
-    private $masterPrintStylesCrossReference = [];
-
     /**
      * Create a new Ods Reader instance.
      */
diff --git a/src/PhpSpreadsheet/Reader/Ods/PageSettings.php b/src/PhpSpreadsheet/Reader/Ods/PageSettings.php
index 4a1fc065..05095752 100644
--- a/src/PhpSpreadsheet/Reader/Ods/PageSettings.php
+++ b/src/PhpSpreadsheet/Reader/Ods/PageSettings.php
@@ -12,6 +12,8 @@ class PageSettings
 
     private $stylesNs;
 
+    private $stylesFo;
+
     private $pageLayoutStyles = [];
 
     private $masterStylesCrossReference = [];
@@ -29,6 +31,7 @@ class PageSettings
     {
         $this->officeNs = $styleDom->lookupNamespaceUri('office');
         $this->stylesNs = $styleDom->lookupNamespaceUri('style');
+        $this->stylesFo = $styleDom->lookupNamespaceUri('fo');
     }
 
     private function readPageSettingStyles(DOMDocument $styleDom): void
@@ -44,6 +47,16 @@ class PageSettings
             $styleScale = $pageLayoutProperties->getAttributeNS($this->stylesNs, 'scale-to');
             $stylePrintOrder = $pageLayoutProperties->getAttributeNS($this->stylesNs, 'print-page-order');
             $centered = $pageLayoutProperties->getAttributeNS($this->stylesNs, 'table-centering');
+            $marginLeft = $pageLayoutProperties->getAttributeNS($this->stylesFo, 'margin-left');
+            $marginRight = $pageLayoutProperties->getAttributeNS($this->stylesFo, 'margin-right');
+            $marginTop = $pageLayoutProperties->getAttributeNS($this->stylesFo, 'margin-top');
+            $marginBottom = $pageLayoutProperties->getAttributeNS($this->stylesFo, 'margin-bottom');
+            $header = $styleSet->getElementsByTagNameNS($this->stylesNs, 'header-style')[0];
+            $headerProperties = $header->getElementsByTagNameNS($this->stylesNs, 'header-footer-properties')[0];
+            $marginHeader = $headerProperties->getAttributeNS($this->stylesFo, 'min-height');
+            $footer = $styleSet->getElementsByTagNameNS($this->stylesNs, 'footer-style')[0];
+            $footerProperties = $footer->getElementsByTagNameNS($this->stylesNs, 'header-footer-properties')[0];
+            $marginFooter = $footerProperties->getAttributeNS($this->stylesFo, 'min-height');
 
             $this->pageLayoutStyles[$styleName] = (object) [
                 'orientation' => $styleOrientation,
@@ -51,6 +64,12 @@ class PageSettings
                 'printOrder' => $stylePrintOrder,
                 'horizontalCentered' => $centered === 'horizontal' || $centered === 'both',
                 'verticalCentered' => $centered === 'vertical' || $centered === 'both',
+                'marginLeft' => round((float) $marginLeft ?? 0.7, 5),
+                'marginRight' => round((float) $marginRight ?? 0.7, 5),
+                'marginTop' => round((float) $marginTop ?? 0.7, 5),
+                'marginBottom' => round((float) $marginBottom ?? 0.7, 5),
+                'marginHeader' => round((float) $marginHeader ?? 0.0, 5),
+                'marginFooter' => round((float) $marginFooter ?? 0.0, 5),
             ];
         }
     }
@@ -106,5 +125,13 @@ class PageSettings
             ->setScale((int) trim($printSettings->scale, '%'))
             ->setHorizontalCentered($printSettings->horizontalCentered)
             ->setVerticalCentered($printSettings->verticalCentered);
+
+        $worksheet->getPageMargins()
+            ->setLeft($printSettings->marginLeft)
+            ->setRight($printSettings->marginRight)
+            ->setTop($printSettings->marginTop)
+            ->setBottom($printSettings->marginBottom)
+            ->setHeader($printSettings->marginHeader)
+            ->setFooter($printSettings->marginFooter);
     }
 }

From 84ba21400c5043b7bc68addbc7a6fc8ba7f6a2d7 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Sat, 4 Jul 2020 00:28:16 +0200
Subject: [PATCH 075/153] Fix datatype conversion for Gnumeric values

---
 src/PhpSpreadsheet/Reader/Gnumeric.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/PhpSpreadsheet/Reader/Gnumeric.php b/src/PhpSpreadsheet/Reader/Gnumeric.php
index d96d562e..8375b37e 100644
--- a/src/PhpSpreadsheet/Reader/Gnumeric.php
+++ b/src/PhpSpreadsheet/Reader/Gnumeric.php
@@ -436,18 +436,18 @@ class Gnumeric extends BaseReader
     {
         if (!$this->readDataOnly && isset($sheet->PrintInformation)) {
             $printInformation = $sheet->PrintInformation[0];
-            $scale = $printInformation->Scale->attributes()['percentage'];
+            $scale = (string) $printInformation->Scale->attributes()['percentage'];
             $pageOrder = (string) $printInformation->order;
             $orientation = (string) $printInformation->orientation;
-            $horizontalCentered = (bool) $printInformation->hcenter;
-            $verticalCentered = (bool) $printInformation->vcenter;
+            $horizontalCentered = (string) $printInformation->hcenter->attributes()['value'];
+            $verticalCentered = (string) $printInformation->vcenter->attributes()['value'];
 
             $this->spreadsheet->getActiveSheet()->getPageSetup()
                 ->setPageOrder($pageOrder === 'r_then_d' ? PageSetup::PAGEORDER_OVER_THEN_DOWN : PageSetup::PAGEORDER_DOWN_THEN_OVER)
                 ->setScale((int) $scale)
                 ->setOrientation($orientation ?? PageSetup::ORIENTATION_DEFAULT)
-                ->setHorizontalCentered($horizontalCentered)
-                ->setVerticalCentered($verticalCentered);
+                ->setHorizontalCentered((bool) $horizontalCentered)
+                ->setVerticalCentered((bool) $verticalCentered);
         }
     }
 

From 8629337101fef7bf51fb7e062080de510438a94b Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Sun, 5 Jul 2020 16:22:35 +0200
Subject: [PATCH 076/153] Retrieving print/page setup for the Xml Reader

---
 src/PhpSpreadsheet/Reader/Gnumeric.php        | 106 ++++++++-----
 .../Reader/Ods/PageSettings.php               |  18 ++-
 src/PhpSpreadsheet/Reader/Xml.php             | 102 ++++++++++++
 src/PhpSpreadsheet/Worksheet/PageMargins.php  |  30 ++++
 src/PhpSpreadsheet/Worksheet/PageSetup.php    |   6 +-
 .../Reader/Gnumeric/PageSetupTest.php         | 147 +++++++++++++++++
 .../Reader/Ods/PageSetupTest.php              | 149 ++++++++++++++++++
 .../Reader/Xls/PageSetupTest.php              | 149 ++++++++++++++++++
 .../Reader/Xlsx/PageSetupTest.php             | 149 ++++++++++++++++++
 .../Reader/Xml/PageSetupTest.php              | 148 +++++++++++++++++
 .../Worksheet/PageMarginsTest.php             |  89 +++++++++++
 11 files changed, 1045 insertions(+), 48 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Reader/Gnumeric/PageSetupTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Reader/Ods/PageSetupTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Reader/Xls/PageSetupTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Reader/Xlsx/PageSetupTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Worksheet/PageMarginsTest.php

diff --git a/src/PhpSpreadsheet/Reader/Gnumeric.php b/src/PhpSpreadsheet/Reader/Gnumeric.php
index 8375b37e..32105477 100644
--- a/src/PhpSpreadsheet/Reader/Gnumeric.php
+++ b/src/PhpSpreadsheet/Reader/Gnumeric.php
@@ -17,6 +17,7 @@ use PhpOffice\PhpSpreadsheet\Style\Border;
 use PhpOffice\PhpSpreadsheet\Style\Borders;
 use PhpOffice\PhpSpreadsheet\Style\Fill;
 use PhpOffice\PhpSpreadsheet\Style\Font;
+use PhpOffice\PhpSpreadsheet\Worksheet\PageMargins;
 use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use SimpleXMLElement;
@@ -24,6 +25,8 @@ use XMLReader;
 
 class Gnumeric extends BaseReader
 {
+    private const UOM_CONVERSION_POINTS_TO_CENTIMETERS = 0.03527777778;
+
     /**
      * Shared Expressions.
      *
@@ -402,6 +405,72 @@ class Gnumeric extends BaseReader
         }
     }
 
+    private function printInformation(SimpleXMLElement $sheet): void
+    {
+        if (!$this->readDataOnly && isset($sheet->PrintInformation)) {
+            $printInformation = $sheet->PrintInformation[0];
+            $scale = (string) $printInformation->Scale->attributes()['percentage'];
+            $pageOrder = (string) $printInformation->order;
+            $orientation = (string) $printInformation->orientation;
+            $horizontalCentered = (string) $printInformation->hcenter->attributes()['value'];
+            $verticalCentered = (string) $printInformation->vcenter->attributes()['value'];
+
+            $this->spreadsheet->getActiveSheet()->getPageSetup()
+                ->setPageOrder($pageOrder === 'r_then_d' ? PageSetup::PAGEORDER_OVER_THEN_DOWN : PageSetup::PAGEORDER_DOWN_THEN_OVER)
+                ->setScale((int) $scale)
+                ->setOrientation($orientation ?? PageSetup::ORIENTATION_DEFAULT)
+                ->setHorizontalCentered((bool) $horizontalCentered)
+                ->setVerticalCentered((bool) $verticalCentered);
+        }
+    }
+
+    private function sheetMargins(SimpleXMLElement $sheet): void
+    {
+        if (!$this->readDataOnly && isset($sheet->PrintInformation, $sheet->PrintInformation->Margins)) {
+            $marginSet = [
+                // Default Settings
+                'top' => 0.75,
+                'header' => 0.3,
+                'left' => 0.7,
+                'right' => 0.7,
+                'bottom' => 0.75,
+                'footer' => 0.3,
+            ];
+
+            foreach ($sheet->PrintInformation->Margins->children($this->gnm, true) as $key => $margin) {
+                $marginAttributes = $margin->attributes();
+                $marginSize = ($marginAttributes['Points']) ?? 72; //    Default is 72pt
+                // Convert value in points to inches
+                $marginSize = PageMargins::fromPoints((float) $marginSize);
+                $marginSet[$key] = $marginSize;
+            }
+
+            foreach ($marginSet as $key => $marginSize) {
+                // Gnumeric is quirky in the way it displays the header/footer values:
+                //    header is actually the sum of top and header; footer is actually the sum of bottom and footer
+                //    then top is actually the header value, and bottom is actually the footer value
+                switch ($key) {
+                    case 'left':
+                    case 'right':
+                        $this->sheetMargin($key, $marginSize);
+                        break;
+                    case 'top':
+                        $this->sheetMargin($key, $marginSet['header'] ?? 0);
+                        break;
+                    case 'bottom':
+                        $this->sheetMargin($key, $marginSet['footer'] ?? 0);
+                        break;
+                    case 'header':
+                        $this->sheetMargin($key, ($marginSet['top'] ?? 0) - $marginSize);
+                        break;
+                    case 'footer':
+                        $this->sheetMargin($key, ($marginSet['bottom'] ?? 0) - $marginSize);
+                        break;
+                }
+            }
+        }
+    }
+
     private function sheetMargin(string $key, float $marginSize): void
     {
         switch ($key) {
@@ -432,43 +501,6 @@ class Gnumeric extends BaseReader
         }
     }
 
-    private function printInformation(SimpleXMLElement $sheet): void
-    {
-        if (!$this->readDataOnly && isset($sheet->PrintInformation)) {
-            $printInformation = $sheet->PrintInformation[0];
-            $scale = (string) $printInformation->Scale->attributes()['percentage'];
-            $pageOrder = (string) $printInformation->order;
-            $orientation = (string) $printInformation->orientation;
-            $horizontalCentered = (string) $printInformation->hcenter->attributes()['value'];
-            $verticalCentered = (string) $printInformation->vcenter->attributes()['value'];
-
-            $this->spreadsheet->getActiveSheet()->getPageSetup()
-                ->setPageOrder($pageOrder === 'r_then_d' ? PageSetup::PAGEORDER_OVER_THEN_DOWN : PageSetup::PAGEORDER_DOWN_THEN_OVER)
-                ->setScale((int) $scale)
-                ->setOrientation($orientation ?? PageSetup::ORIENTATION_DEFAULT)
-                ->setHorizontalCentered((bool) $horizontalCentered)
-                ->setVerticalCentered((bool) $verticalCentered);
-        }
-    }
-
-    private function sheetMargins(SimpleXMLElement $sheet): void
-    {
-        if (!$this->readDataOnly && isset($sheet->PrintInformation, $sheet->PrintInformation->Margins)) {
-            foreach ($sheet->PrintInformation->Margins->children($this->gnm, true) as $key => $margin) {
-                $marginAttributes = $margin->attributes();
-                $marginSize = $marginAttributes['Points'] ?? 72 / 100; //    Default
-                switch ($marginAttributes['PrefUnit']) {
-                    case 'inch':
-                    case 'mm':
-                        $marginSize = ($marginAttributes['Points']) / 100;
-
-                        break;
-                }
-                $this->sheetMargin($key, (float) $marginSize);
-            }
-        }
-    }
-
     private function processComments(SimpleXMLElement $sheet): void
     {
         if ((!$this->readDataOnly) && (isset($sheet->Objects))) {
diff --git a/src/PhpSpreadsheet/Reader/Ods/PageSettings.php b/src/PhpSpreadsheet/Reader/Ods/PageSettings.php
index 05095752..77341aab 100644
--- a/src/PhpSpreadsheet/Reader/Ods/PageSettings.php
+++ b/src/PhpSpreadsheet/Reader/Ods/PageSettings.php
@@ -47,6 +47,7 @@ class PageSettings
             $styleScale = $pageLayoutProperties->getAttributeNS($this->stylesNs, 'scale-to');
             $stylePrintOrder = $pageLayoutProperties->getAttributeNS($this->stylesNs, 'print-page-order');
             $centered = $pageLayoutProperties->getAttributeNS($this->stylesNs, 'table-centering');
+
             $marginLeft = $pageLayoutProperties->getAttributeNS($this->stylesFo, 'margin-left');
             $marginRight = $pageLayoutProperties->getAttributeNS($this->stylesFo, 'margin-right');
             $marginTop = $pageLayoutProperties->getAttributeNS($this->stylesFo, 'margin-top');
@@ -59,17 +60,18 @@ class PageSettings
             $marginFooter = $footerProperties->getAttributeNS($this->stylesFo, 'min-height');
 
             $this->pageLayoutStyles[$styleName] = (object) [
-                'orientation' => $styleOrientation,
-                'scale' => $styleScale,
+                'orientation' => $styleOrientation ?: PageSetup::ORIENTATION_DEFAULT,
+                'scale' => $styleScale ?: 100,
                 'printOrder' => $stylePrintOrder,
                 'horizontalCentered' => $centered === 'horizontal' || $centered === 'both',
                 'verticalCentered' => $centered === 'vertical' || $centered === 'both',
-                'marginLeft' => round((float) $marginLeft ?? 0.7, 5),
-                'marginRight' => round((float) $marginRight ?? 0.7, 5),
-                'marginTop' => round((float) $marginTop ?? 0.7, 5),
-                'marginBottom' => round((float) $marginBottom ?? 0.7, 5),
-                'marginHeader' => round((float) $marginHeader ?? 0.0, 5),
-                'marginFooter' => round((float) $marginFooter ?? 0.0, 5),
+                // margin size is already stored in inches, so no UOM conversion is required
+                'marginLeft' => (float) $marginLeft ?? 0.7,
+                'marginRight' => (float) $marginRight ?? 0.7,
+                'marginTop' => (float) $marginTop ?? 0.3,
+                'marginBottom' => (float) $marginBottom ?? 0.3,
+                'marginHeader' => (float) $marginHeader ?? 0.45,
+                'marginFooter' => (float) $marginFooter ?? 0.45,
             ];
         }
     }
diff --git a/src/PhpSpreadsheet/Reader/Xml.php b/src/PhpSpreadsheet/Reader/Xml.php
index f9ad5475..9ea0a82d 100644
--- a/src/PhpSpreadsheet/Reader/Xml.php
+++ b/src/PhpSpreadsheet/Reader/Xml.php
@@ -15,6 +15,7 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Style\Alignment;
 use PhpOffice\PhpSpreadsheet\Style\Border;
 use PhpOffice\PhpSpreadsheet\Style\Font;
+use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
 use SimpleXMLElement;
 
 /**
@@ -626,6 +627,27 @@ class Xml extends BaseReader
 
                     ++$rowID;
                 }
+
+                $xml_x = $worksheet->children($namespaces['x']);
+                if (isset($xml_x->WorksheetOptions)) {
+                    $printSettings = $this->pageSetup($xml_x, $namespaces, $this->getPrintDefaults());
+                    $printSettings = $this->printSetup($xml_x, $namespaces, $printSettings);
+
+                    $spreadsheet->getActiveSheet()->getPageSetup()
+                        ->setPaperSize($printSettings->paperSize)
+                        ->setOrientation($printSettings->orientation)
+                        ->setScale($printSettings->scale)
+                        ->setVerticalCentered($printSettings->verticalCentered)
+                        ->setHorizontalCentered($printSettings->horizontalCentered)
+                        ->setPageOrder($printSettings->printOrder);
+                    $spreadsheet->getActiveSheet()->getPageMargins()
+                        ->setTop($printSettings->topMargin)
+                        ->setHeader($printSettings->headerMargin)
+                        ->setLeft($printSettings->leftMargin)
+                        ->setRight($printSettings->rightMargin)
+                        ->setBottom($printSettings->bottomMargin)
+                        ->setFooter($printSettings->footerMargin);
+                }
             }
             ++$worksheetID;
         }
@@ -855,4 +877,84 @@ class Xml extends BaseReader
             }
         }
     }
+
+    private function getPrintDefaults()
+    {
+        return (object) [
+            'paperSize' => 9,
+            'orientation' => PageSetup::ORIENTATION_DEFAULT,
+            'scale' => 100,
+            'horizontalCentered' => false,
+            'verticalCentered' => false,
+            'printOrder' => PageSetup::PAGEORDER_DOWN_THEN_OVER,
+            'topMargin' => 0.75,
+            'headerMargin' => 0.3,
+            'leftMargin' => 0.7,
+            'rightMargin' => 0.7,
+            'bottomMargin' => 0.75,
+            'footerMargin' => 0.3,
+        ];
+    }
+
+    private function pageSetup(SimpleXMLElement $xmlX, array $namespaces, \stdClass $printDefaults): \stdClass
+    {
+        if (isset($xmlX->WorksheetOptions->PageSetup)) {
+            foreach ($xmlX->WorksheetOptions->PageSetup as $pageSetupData) {
+                foreach ($pageSetupData as $pageSetupKey => $pageSetupValue) {
+                    $pageSetupAttributes = $pageSetupValue->attributes($namespaces['x']);
+                    switch ($pageSetupKey) {
+                        case 'Layout':
+                            $printDefaults->orientation = (string) strtolower($pageSetupAttributes->Orientation) ?: PageSetup::ORIENTATION_PORTRAIT;
+                            $printDefaults->horizontalCentered = (bool)$pageSetupAttributes->CenterHorizontal ?: false;
+                            $printDefaults->verticalCentered = (bool)$pageSetupAttributes->CenterVertical ?: false;
+
+                            break;
+                        case 'Header':
+                            $printDefaults->headerMargin = (float)$pageSetupAttributes->Margin ?: 1.0;
+
+                            break;
+                        case 'Footer':
+                            $printDefaults->footerMargin = (float)$pageSetupAttributes->Margin ?: 1.0;
+
+                            break;
+                        case 'PageMargins':
+                            $printDefaults->leftMargin = (float) $pageSetupAttributes->Left ?: 1.0;
+                            $printDefaults->rightMargin = (float) $pageSetupAttributes->Right ?: 1.0;
+                            $printDefaults->topMargin = (float) $pageSetupAttributes->Top ?: 1.0;
+                            $printDefaults->bottomMargin = (float) $pageSetupAttributes->Bottom ?: 1.0;
+
+                            break;
+                    }
+                }
+            }
+        }
+
+        return $printDefaults;
+    }
+
+    private function printSetup(SimpleXMLElement $xmlX, array $namespaces, \stdClass $printDefaults): \stdClass
+    {
+        if (isset($xmlX->WorksheetOptions->Print)) {
+            foreach ($xmlX->WorksheetOptions->Print as $printData) {
+                foreach ($printData as $printKey => $printValue) {
+                    switch ($printKey) {
+                        case 'LeftToRight':
+                            $printDefaults->printOrder = PageSetup::PAGEORDER_OVER_THEN_DOWN;
+
+                            break;
+                        case 'PaperSizeIndex':
+                            $printDefaults->paperSize = (int) $printValue ?: 9;
+
+                            break;
+                        case 'Scale':
+                            $printDefaults->scale = (int) $printValue ?: 100;
+
+                            break;
+                    }
+                }
+            }
+        }
+
+        return $printDefaults;
+    }
 }
diff --git a/src/PhpSpreadsheet/Worksheet/PageMargins.php b/src/PhpSpreadsheet/Worksheet/PageMargins.php
index 9ebfb648..d59c6afd 100644
--- a/src/PhpSpreadsheet/Worksheet/PageMargins.php
+++ b/src/PhpSpreadsheet/Worksheet/PageMargins.php
@@ -211,4 +211,34 @@ class PageMargins
             }
         }
     }
+
+    public static function fromCentimeters($value): float
+    {
+        return $value / 2.54;
+    }
+
+    public static function toCentimeters($value): float
+    {
+        return $value * 2.54;
+    }
+
+    public static function fromMillimeters($value): float
+    {
+        return $value / 25.4;
+    }
+
+    public static function toMillimeters($value): float
+    {
+        return $value * 25.4;
+    }
+
+    public static function fromPoints($value): float
+    {
+        return $value / 72;
+    }
+
+    public static function toPoints($value): float
+    {
+        return $value * 72;
+    }
 }
diff --git a/src/PhpSpreadsheet/Worksheet/PageSetup.php b/src/PhpSpreadsheet/Worksheet/PageSetup.php
index 290b8349..d8d5098f 100644
--- a/src/PhpSpreadsheet/Worksheet/PageSetup.php
+++ b/src/PhpSpreadsheet/Worksheet/PageSetup.php
@@ -249,7 +249,7 @@ class PageSetup
      */
     private $firstPageNumber;
 
-    private $pageOrder;
+    private $pageOrder = self::PAGEORDER_DOWN_THEN_OVER;
 
     /**
      * Create a new PageSetup.
@@ -823,7 +823,7 @@ class PageSetup
         return $this->setFirstPageNumber(null);
     }
 
-    public function getPageOrder(): ?string
+    public function getPageOrder(): string
     {
         return $this->pageOrder;
     }
@@ -831,7 +831,7 @@ class PageSetup
     public function setPageOrder(?string $pageOrder): self
     {
         if ($pageOrder === null || $pageOrder === self::PAGEORDER_DOWN_THEN_OVER || $pageOrder === self::PAGEORDER_OVER_THEN_DOWN) {
-            $this->pageOrder = $pageOrder;
+            $this->pageOrder = $pageOrder ?? self::PAGEORDER_DOWN_THEN_OVER;
         }
 
         return $this;
diff --git a/tests/PhpSpreadsheetTests/Reader/Gnumeric/PageSetupTest.php b/tests/PhpSpreadsheetTests/Reader/Gnumeric/PageSetupTest.php
new file mode 100644
index 00000000..057dbf69
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Reader/Gnumeric/PageSetupTest.php
@@ -0,0 +1,147 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Gnumeric;
+
+use PhpOffice\PhpSpreadsheet\Reader\Gnumeric;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
+use PHPUnit\Framework\TestCase;
+
+class PageSetupTest extends TestCase
+{
+    private const MARGIN_PRECISION = 0.001;
+
+    /**
+     * @var Spreadsheet $spreadsheet
+     */
+    private $spreadsheet;
+
+    public function setup(): void
+    {
+        $filename = 'tests/data/Reader/Gnumeric/PageSetup.gnumeric';
+        $reader = new Gnumeric();
+        $this->spreadsheet = $reader->load($filename);
+    }
+
+    public function testPageSetup()
+    {
+        $assertions = $this->pageSetupAssertions();
+
+        foreach ($this->spreadsheet->getAllSheets() as $worksheet) {
+            if (!array_key_exists($worksheet->getTitle(), $assertions)) {
+                continue;
+            }
+
+            $sheetAssertions = $assertions[$worksheet->getTitle()];
+            foreach ($sheetAssertions as $test => $expectedResult) {
+                $testMethodName = 'get' . ucfirst($test);
+                $actualResult = $worksheet->getPageSetup()->$testMethodName();
+                $this->assertSame(
+                    $expectedResult,
+                    $actualResult,
+                    "Failed assertion for Worksheet '{$worksheet->getTitle()}' {$test}"
+                );
+            }
+        }
+    }
+
+    public function testPageMargins()
+    {
+        $assertions = $this->pageMarginAssertions();
+
+        foreach ($this->spreadsheet->getAllSheets() as $worksheet) {
+            if (!array_key_exists($worksheet->getTitle(), $assertions)) {
+                continue;
+            }
+
+            $sheetAssertions = $assertions[$worksheet->getTitle()];
+            foreach ($sheetAssertions as $test => $expectedResult) {
+                $testMethodName = 'get' . ucfirst($test);
+                $actualResult = $worksheet->getPageMargins()->$testMethodName();
+                $this->assertEqualsWithDelta(
+                    $expectedResult,
+                    $actualResult,
+                    self::MARGIN_PRECISION,
+                    "Failed assertion for Worksheet '{$worksheet->getTitle()}' {$test} margin"
+                );
+            }
+        }
+    }
+
+    public function pageSetupAssertions()
+    {
+        return [
+            'Sheet1' => [
+                'orientation' => PageSetup::ORIENTATION_PORTRAIT,
+                'scale' => 75,
+                'horizontalCentered' => true,
+                'verticalCentered' => false,
+                'pageOrder' => PageSetup::PAGEORDER_DOWN_THEN_OVER,
+            ],
+            'Sheet2' => [
+                'orientation' => PageSetup::ORIENTATION_LANDSCAPE,
+                'scale' => 100,
+                'horizontalCentered' => false,
+                'verticalCentered' => true,
+                'pageOrder' => PageSetup::PAGEORDER_OVER_THEN_DOWN,
+            ],
+            'Sheet3' => [
+                'orientation' => PageSetup::ORIENTATION_PORTRAIT,
+                'scale' => 90,
+                'horizontalCentered' => true,
+                'verticalCentered' => true,
+                'pageOrder' => PageSetup::PAGEORDER_DOWN_THEN_OVER,
+            ],
+            'Sheet4' => [
+                // Default Settings
+                'orientation' => PageSetup::ORIENTATION_PORTRAIT,
+                'scale' => 100,
+                'horizontalCentered' => false,
+                'verticalCentered' => false,
+                'pageOrder' => PageSetup::PAGEORDER_DOWN_THEN_OVER,
+            ],
+        ];
+    }
+
+    public function pageMarginAssertions()
+    {
+        return [
+            'Sheet1' => [
+                // Here the values are in inches
+                'top' => 0.315,
+                'header' => 0.630,
+                'left' => 0.512,
+                'right' => 0.512,
+                'bottom' => 0.315,
+                'footer' => 0.433,
+            ],
+            'Sheet2' => [
+                // Here the values are in inches
+                'top' => 0.315,
+                'header' => 0.433,
+                'left' => 0.709,
+                'right' => 0.709,
+                'bottom' => 0.315,
+                'footer' => 0.433,
+            ],
+            'Sheet3' => [
+                // Here the values are in inches
+                'top' => 0.512,
+                'header' => 0.433,
+                'left' => 0.709,
+                'right' => 0.709,
+                'bottom' => 0.512,
+                'footer' => 0.433,
+            ],
+            'Sheet4' => [
+                // Default Settings (in inches)
+                'top' => 0.3,
+                'header' => 0.45,
+                'left' => 0.7,
+                'right' => 0.7,
+                'bottom' => 0.3,
+                'footer' => 0.45,
+            ],
+        ];
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Reader/Ods/PageSetupTest.php b/tests/PhpSpreadsheetTests/Reader/Ods/PageSetupTest.php
new file mode 100644
index 00000000..74eaae8f
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Reader/Ods/PageSetupTest.php
@@ -0,0 +1,149 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Ods;
+
+use PhpOffice\PhpSpreadsheet\Reader\Ods;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
+use PHPUnit\Framework\TestCase;
+
+class PageSetupTest extends TestCase
+{
+    private const MARGIN_PRECISION = 0.00000001;
+
+    private const MARGIN_UNIT_CONVERSION = 2.54;         // Inches to cm
+
+    /**
+     * @var Spreadsheet $spreadsheet
+     */
+    private $spreadsheet;
+
+    public function setup(): void
+    {
+        $filename = 'tests/data/Reader/Ods/PageSetup.ods';
+        $reader = new Ods();
+        $this->spreadsheet = $reader->load($filename);
+    }
+
+    public function testPageSetup()
+    {
+        $assertions = $this->pageSetupAssertions();
+
+        foreach ($this->spreadsheet->getAllSheets() as $worksheet) {
+            if (!array_key_exists($worksheet->getTitle(), $assertions)) {
+                continue;
+            }
+
+            $sheetAssertions = $assertions[$worksheet->getTitle()];
+            foreach ($sheetAssertions as $test => $expectedResult) {
+                $testMethodName = 'get' . ucfirst($test);
+                $actualResult = $worksheet->getPageSetup()->$testMethodName();
+                $this->assertSame(
+                    $expectedResult,
+                    $actualResult,
+                    "Failed assertion for Worksheet '{$worksheet->getTitle()}' {$test}"
+                );
+            }
+        }
+    }
+
+    public function testPageMargins()
+    {
+        $assertions = $this->pageMarginAssertions();
+
+        foreach ($this->spreadsheet->getAllSheets() as $worksheet) {
+            if (!array_key_exists($worksheet->getTitle(), $assertions)) {
+                continue;
+            }
+
+            $sheetAssertions = $assertions[$worksheet->getTitle()];
+            foreach ($sheetAssertions as $test => $expectedResult) {
+                $testMethodName = 'get' . ucfirst($test);
+                $actualResult = $worksheet->getPageMargins()->$testMethodName();
+                $this->assertEqualsWithDelta(
+                    $expectedResult,
+                    $actualResult,
+                    self::MARGIN_PRECISION,
+                    "Failed assertion for Worksheet '{$worksheet->getTitle()}' {$test} margin"
+                );
+            }
+        }
+    }
+
+    public function pageSetupAssertions()
+    {
+        return [
+            'Sheet1' => [
+                'orientation' => PageSetup::ORIENTATION_PORTRAIT,
+                'scale' => 75,
+                'horizontalCentered' => true,
+                'verticalCentered' => false,
+                'pageOrder' => PageSetup::PAGEORDER_DOWN_THEN_OVER,
+            ],
+            'Sheet2' => [
+                'orientation' => PageSetup::ORIENTATION_LANDSCAPE,
+                'scale' => 100,
+                'horizontalCentered' => false,
+                'verticalCentered' => true,
+                'pageOrder' => PageSetup::PAGEORDER_OVER_THEN_DOWN,
+            ],
+            'Sheet3' => [
+                'orientation' => PageSetup::ORIENTATION_PORTRAIT,
+                'scale' => 90,
+                'horizontalCentered' => true,
+                'verticalCentered' => true,
+                'pageOrder' => PageSetup::PAGEORDER_DOWN_THEN_OVER,
+            ],
+            'Sheet4' => [
+                // Default Settings
+                'orientation' => PageSetup::ORIENTATION_DEFAULT,
+                'scale' => 100,
+                'horizontalCentered' => false,
+                'verticalCentered' => false,
+                'pageOrder' => PageSetup::PAGEORDER_DOWN_THEN_OVER,
+            ],
+        ];
+    }
+
+    public function pageMarginAssertions()
+    {
+        return [
+            'Sheet1' => [
+                // Here the values are in cm
+                'top' => 0.8 / self::MARGIN_UNIT_CONVERSION,
+                'header' => 1.6 / self::MARGIN_UNIT_CONVERSION,
+                'left' => 1.3 / self::MARGIN_UNIT_CONVERSION,
+                'right' => 1.3 / self::MARGIN_UNIT_CONVERSION,
+                'bottom' => 0.8 / self::MARGIN_UNIT_CONVERSION,
+                'footer' => 1.1 / self::MARGIN_UNIT_CONVERSION,
+            ],
+            'Sheet2' => [
+                // Here the values are in cm
+                'top' => 0.8 / self::MARGIN_UNIT_CONVERSION,
+                'header' => 1.1 / self::MARGIN_UNIT_CONVERSION,
+                'left' => 1.8 / self::MARGIN_UNIT_CONVERSION,
+                'right' => 1.8 / self::MARGIN_UNIT_CONVERSION,
+                'bottom' => 0.8 / self::MARGIN_UNIT_CONVERSION,
+                'footer' => 1.1 / self::MARGIN_UNIT_CONVERSION,
+            ],
+            'Sheet3' => [
+                // Here the values are in cm
+                'top' => 1.3 / self::MARGIN_UNIT_CONVERSION,
+                'header' => 1.1 / self::MARGIN_UNIT_CONVERSION,
+                'left' => 1.8 / self::MARGIN_UNIT_CONVERSION,
+                'right' => 1.8 / self::MARGIN_UNIT_CONVERSION,
+                'bottom' => 1.3 / self::MARGIN_UNIT_CONVERSION,
+                'footer' => 1.1 / self::MARGIN_UNIT_CONVERSION,
+            ],
+            'Sheet4' => [
+                // Default Settings (already in inches)
+                'top' => 0.3,
+                'header' => 0.45,
+                'left' => 0.7,
+                'right' => 0.7,
+                'bottom' => 0.3,
+                'footer' => 0.45,
+            ],
+        ];
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Reader/Xls/PageSetupTest.php b/tests/PhpSpreadsheetTests/Reader/Xls/PageSetupTest.php
new file mode 100644
index 00000000..2cfbbb3f
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Reader/Xls/PageSetupTest.php
@@ -0,0 +1,149 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xls;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xls;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
+use PHPUnit\Framework\TestCase;
+
+class PageSetupTest extends TestCase
+{
+    private const MARGIN_PRECISION = 0.00000001;
+
+    private const MARGIN_UNIT_CONVERSION = 2.54;         // Inches to cm
+
+    /**
+     * @var Spreadsheet $spreadsheet
+     */
+    private $spreadsheet;
+
+    public function setup(): void
+    {
+        $filename = 'tests/data/Reader/XLS/PageSetup.xls';
+        $reader = new Xls();
+        $this->spreadsheet = $reader->load($filename);
+    }
+
+    public function testPageSetup()
+    {
+        $assertions = $this->pageSetupAssertions();
+
+        foreach ($this->spreadsheet->getAllSheets() as $worksheet) {
+            if (!array_key_exists($worksheet->getTitle(), $assertions)) {
+                continue;
+            }
+
+            $sheetAssertions = $assertions[$worksheet->getTitle()];
+            foreach ($sheetAssertions as $test => $expectedResult) {
+                $testMethodName = 'get' . ucfirst($test);
+                $actualResult = $worksheet->getPageSetup()->$testMethodName();
+                $this->assertSame(
+                    $expectedResult,
+                    $actualResult,
+                    "Failed assertion for Worksheet '{$worksheet->getTitle()}' {$test}"
+                );
+            }
+        }
+    }
+
+    public function testPageMargins()
+    {
+        $assertions = $this->pageMarginAssertions();
+
+        foreach ($this->spreadsheet->getAllSheets() as $worksheet) {
+            if (!array_key_exists($worksheet->getTitle(), $assertions)) {
+                continue;
+            }
+
+            $sheetAssertions = $assertions[$worksheet->getTitle()];
+            foreach ($sheetAssertions as $test => $expectedResult) {
+                $testMethodName = 'get' . ucfirst($test);
+                $actualResult = $worksheet->getPageMargins()->$testMethodName();
+                $this->assertEqualsWithDelta(
+                    $expectedResult,
+                    $actualResult,
+                    self::MARGIN_PRECISION,
+                    "Failed assertion for Worksheet '{$worksheet->getTitle()}' {$test} margin"
+                );
+            }
+        }
+    }
+
+    public function pageSetupAssertions()
+    {
+        return [
+            'Sheet1' => [
+                'orientation' => PageSetup::ORIENTATION_PORTRAIT,
+                'scale' => 75,
+                'horizontalCentered' => true,
+                'verticalCentered' => false,
+                'pageOrder' => PageSetup::PAGEORDER_DOWN_THEN_OVER,
+            ],
+            'Sheet2' => [
+                'orientation' => PageSetup::ORIENTATION_LANDSCAPE,
+                'scale' => 100,
+                'horizontalCentered' => false,
+                'verticalCentered' => true,
+                'pageOrder' => PageSetup::PAGEORDER_OVER_THEN_DOWN,
+            ],
+            'Sheet3' => [
+                'orientation' => PageSetup::ORIENTATION_PORTRAIT,
+                'scale' => 90,
+                'horizontalCentered' => true,
+                'verticalCentered' => true,
+                'pageOrder' => PageSetup::PAGEORDER_DOWN_THEN_OVER,
+            ],
+            'Sheet4' => [
+                // Default Settings
+                'orientation' => PageSetup::ORIENTATION_DEFAULT,
+                'scale' => 100,
+                'horizontalCentered' => false,
+                'verticalCentered' => false,
+                'pageOrder' => PageSetup::PAGEORDER_DOWN_THEN_OVER,
+            ],
+        ];
+    }
+
+    public function pageMarginAssertions()
+    {
+        return [
+            'Sheet1' => [
+                // Here the values are in cm, so we convert to inches for comparison with internal uom
+                'top' => 2.4 / self::MARGIN_UNIT_CONVERSION,
+                'header' => 0.8 / self::MARGIN_UNIT_CONVERSION,
+                'left' => 1.3 / self::MARGIN_UNIT_CONVERSION,
+                'right' => 1.3 / self::MARGIN_UNIT_CONVERSION,
+                'bottom' => 1.9 / self::MARGIN_UNIT_CONVERSION,
+                'footer' => 0.8 / self::MARGIN_UNIT_CONVERSION,
+            ],
+            'Sheet2' => [
+                // Here the values are in cm, so we convert to inches for comparison with internal uom
+                'top' => 1.9 / self::MARGIN_UNIT_CONVERSION,
+                'header' => 0.8 / self::MARGIN_UNIT_CONVERSION,
+                'left' => 1.8 / self::MARGIN_UNIT_CONVERSION,
+                'right' => 1.8 / self::MARGIN_UNIT_CONVERSION,
+                'bottom' => 1.9 / self::MARGIN_UNIT_CONVERSION,
+                'footer' => 0.8 / self::MARGIN_UNIT_CONVERSION,
+            ],
+            'Sheet3' => [
+                // Here the values are in cm, so we convert to inches for comparison with internal uom
+                'top' => 2.4 / self::MARGIN_UNIT_CONVERSION,
+                'header' => 1.3 / self::MARGIN_UNIT_CONVERSION,
+                'left' => 1.8 / self::MARGIN_UNIT_CONVERSION,
+                'right' => 1.8 / self::MARGIN_UNIT_CONVERSION,
+                'bottom' => 2.4 / self::MARGIN_UNIT_CONVERSION,
+                'footer' => 1.3 / self::MARGIN_UNIT_CONVERSION,
+            ],
+            'Sheet4' => [
+                // Default Settings (already in inches for comparison)
+                'top' => 0.75,
+                'header' => 0.3,
+                'left' => 0.7,
+                'right' => 0.7,
+                'bottom' => 0.75,
+                'footer' => 0.3,
+            ],
+        ];
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/PageSetupTest.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/PageSetupTest.php
new file mode 100644
index 00000000..a5b287fe
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/PageSetupTest.php
@@ -0,0 +1,149 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
+use PHPUnit\Framework\TestCase;
+
+class PageSetupTest extends TestCase
+{
+    private const MARGIN_PRECISION = 0.00000001;
+
+    private const MARGIN_UNIT_CONVERSION = 2.54;         // Inches to cm
+
+    /**
+     * @var Spreadsheet $spreadsheet
+     */
+    private $spreadsheet;
+
+    public function setup(): void
+    {
+        $filename = 'tests/data/Reader/XLSX/PageSetup.xlsx';
+        $reader = new Xlsx();
+        $this->spreadsheet = $reader->load($filename);
+    }
+
+    public function testPageSetup()
+    {
+        $assertions = $this->pageSetupAssertions();
+
+        foreach ($this->spreadsheet->getAllSheets() as $worksheet) {
+            if (!array_key_exists($worksheet->getTitle(), $assertions)) {
+                continue;
+            }
+
+            $sheetAssertions = $assertions[$worksheet->getTitle()];
+            foreach ($sheetAssertions as $test => $expectedResult) {
+                $testMethodName = 'get' . ucfirst($test);
+                $actualResult = $worksheet->getPageSetup()->$testMethodName();
+                $this->assertSame(
+                    $expectedResult,
+                    $actualResult,
+                    "Failed assertion for Worksheet '{$worksheet->getTitle()}' {$test}"
+                );
+            }
+        }
+    }
+
+    public function testPageMargins()
+    {
+        $assertions = $this->pageMarginAssertions();
+
+        foreach ($this->spreadsheet->getAllSheets() as $worksheet) {
+            if (!array_key_exists($worksheet->getTitle(), $assertions)) {
+                continue;
+            }
+
+            $sheetAssertions = $assertions[$worksheet->getTitle()];
+            foreach ($sheetAssertions as $test => $expectedResult) {
+                $testMethodName = 'get' . ucfirst($test);
+                $actualResult = $worksheet->getPageMargins()->$testMethodName();
+                $this->assertEqualsWithDelta(
+                    $expectedResult,
+                    $actualResult,
+                    self::MARGIN_PRECISION,
+                    "Failed assertion for Worksheet '{$worksheet->getTitle()}' {$test} margin"
+                );
+            }
+        }
+    }
+
+    public function pageSetupAssertions()
+    {
+        return [
+            'Sheet1' => [
+                'orientation' => PageSetup::ORIENTATION_PORTRAIT,
+                'scale' => 75,
+                'horizontalCentered' => true,
+                'verticalCentered' => false,
+                'pageOrder' => PageSetup::PAGEORDER_DOWN_THEN_OVER,
+            ],
+            'Sheet2' => [
+                'orientation' => PageSetup::ORIENTATION_LANDSCAPE,
+                'scale' => 100,
+                'horizontalCentered' => false,
+                'verticalCentered' => true,
+                'pageOrder' => PageSetup::PAGEORDER_OVER_THEN_DOWN,
+            ],
+            'Sheet3' => [
+                'orientation' => PageSetup::ORIENTATION_PORTRAIT,
+                'scale' => 90,
+                'horizontalCentered' => true,
+                'verticalCentered' => true,
+                'pageOrder' => PageSetup::PAGEORDER_DOWN_THEN_OVER,
+            ],
+            'Sheet4' => [
+                // Default Settings
+                'orientation' => PageSetup::ORIENTATION_DEFAULT,
+                'scale' => 100,
+                'horizontalCentered' => false,
+                'verticalCentered' => false,
+                'pageOrder' => PageSetup::PAGEORDER_DOWN_THEN_OVER,
+            ],
+        ];
+    }
+
+    public function pageMarginAssertions()
+    {
+        return [
+            'Sheet1' => [
+                // Here the values are in cm, so we convert to inches for comparison with internal uom
+                'top' => 2.4 / self::MARGIN_UNIT_CONVERSION,
+                'header' => 0.8 / self::MARGIN_UNIT_CONVERSION,
+                'left' => 1.3 / self::MARGIN_UNIT_CONVERSION,
+                'right' => 1.3 / self::MARGIN_UNIT_CONVERSION,
+                'bottom' => 1.9 / self::MARGIN_UNIT_CONVERSION,
+                'footer' => 0.8 / self::MARGIN_UNIT_CONVERSION,
+            ],
+            'Sheet2' => [
+                // Here the values are in cm, so we convert to inches for comparison with internal uom
+                'top' => 1.9 / self::MARGIN_UNIT_CONVERSION,
+                'header' => 0.8 / self::MARGIN_UNIT_CONVERSION,
+                'left' => 1.8 / self::MARGIN_UNIT_CONVERSION,
+                'right' => 1.8 / self::MARGIN_UNIT_CONVERSION,
+                'bottom' => 1.9 / self::MARGIN_UNIT_CONVERSION,
+                'footer' => 0.8 / self::MARGIN_UNIT_CONVERSION,
+            ],
+            'Sheet3' => [
+                // Here the values are in cm, so we convert to inches for comparison with internal uom
+                'top' => 2.4 / self::MARGIN_UNIT_CONVERSION,
+                'header' => 1.3 / self::MARGIN_UNIT_CONVERSION,
+                'left' => 1.8 / self::MARGIN_UNIT_CONVERSION,
+                'right' => 1.8 / self::MARGIN_UNIT_CONVERSION,
+                'bottom' => 2.4 / self::MARGIN_UNIT_CONVERSION,
+                'footer' => 1.3 / self::MARGIN_UNIT_CONVERSION,
+            ],
+            'Sheet4' => [
+                // Default Settings (already in inches for comparison)
+                'top' => 0.75,
+                'header' => 0.3,
+                'left' => 0.7,
+                'right' => 0.7,
+                'bottom' => 0.75,
+                'footer' => 0.3,
+            ],
+        ];
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php b/tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php
new file mode 100644
index 00000000..8b934be6
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php
@@ -0,0 +1,148 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xml;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xml;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
+use PHPUnit\Framework\TestCase;
+
+class PageSetupTest extends TestCase
+{
+    private const MARGIN_PRECISION = 0.000001;
+
+    private const MARGIN_UNIT_CONVERSION = 2.54;         // Inches to cm
+    /**
+     * @var Spreadsheet $spreadsheet
+     */
+    private $spreadsheet;
+
+    public function setup(): void
+    {
+        $filename = 'tests/data/Reader/Xml/PageSetup.xml';
+        $reader = new Xml();
+        $this->spreadsheet = $reader->load($filename);
+    }
+
+    public function testPageSetup()
+    {
+        $assertions = $this->pageSetupAssertions();
+
+        foreach ($this->spreadsheet->getAllSheets() as $worksheet) {
+            if (!array_key_exists($worksheet->getTitle(), $assertions)) {
+                continue;
+            }
+
+            $sheetAssertions = $assertions[$worksheet->getTitle()];
+            foreach ($sheetAssertions as $test => $expectedResult) {
+                $testMethodName = 'get' . ucfirst($test);
+                $actualResult = $worksheet->getPageSetup()->$testMethodName();
+                $this->assertSame(
+                    $expectedResult,
+                    $actualResult,
+                    "Failed assertion for Worksheet '{$worksheet->getTitle()}' {$test}"
+                );
+            }
+        }
+    }
+
+    public function testPageMargins()
+    {
+        $assertions = $this->pageMarginAssertions();
+
+        foreach ($this->spreadsheet->getAllSheets() as $worksheet) {
+            if (!array_key_exists($worksheet->getTitle(), $assertions)) {
+                continue;
+            }
+
+            $sheetAssertions = $assertions[$worksheet->getTitle()];
+            foreach ($sheetAssertions as $test => $expectedResult) {
+                $testMethodName = 'get' . ucfirst($test);
+                $actualResult = $worksheet->getPageMargins()->$testMethodName();
+                $this->assertEqualsWithDelta(
+                    $expectedResult,
+                    $actualResult,
+                    self::MARGIN_PRECISION,
+                    "Failed assertion for Worksheet '{$worksheet->getTitle()}' {$test} margin"
+                );
+            }
+        }
+    }
+
+    public function pageSetupAssertions()
+    {
+        return [
+            'Sheet1' => [
+                'orientation' => PageSetup::ORIENTATION_PORTRAIT,
+                'scale' => 75,
+                'horizontalCentered' => true,
+                'verticalCentered' => false,
+                'pageOrder' => PageSetup::PAGEORDER_DOWN_THEN_OVER,
+            ],
+            'Sheet2' => [
+                'orientation' => PageSetup::ORIENTATION_LANDSCAPE,
+                'scale' => 100,
+                'horizontalCentered' => false,
+                'verticalCentered' => true,
+                'pageOrder' => PageSetup::PAGEORDER_OVER_THEN_DOWN,
+            ],
+            'Sheet3' => [
+                'orientation' => PageSetup::ORIENTATION_PORTRAIT,
+                'scale' => 90,
+                'horizontalCentered' => true,
+                'verticalCentered' => true,
+                'pageOrder' => PageSetup::PAGEORDER_DOWN_THEN_OVER,
+            ],
+            'Sheet4' => [
+                // Default Settings
+                'orientation' => PageSetup::ORIENTATION_DEFAULT,
+                'scale' => 100,
+                'horizontalCentered' => false,
+                'verticalCentered' => false,
+                'pageOrder' => PageSetup::PAGEORDER_DOWN_THEN_OVER,
+            ],
+        ];
+    }
+
+    public function pageMarginAssertions()
+    {
+        return [
+            'Sheet1' => [
+                // Here the values are in cm, so we convert to inches for comparison with internal uom
+                'top' => 2.4 / self::MARGIN_UNIT_CONVERSION,
+                'header' => 0.8 / self::MARGIN_UNIT_CONVERSION,
+                'left' => 1.3 / self::MARGIN_UNIT_CONVERSION,
+                'right' => 1.3 / self::MARGIN_UNIT_CONVERSION,
+                'bottom' => 1.9 / self::MARGIN_UNIT_CONVERSION,
+                'footer' => 0.8 / self::MARGIN_UNIT_CONVERSION,
+            ],
+            'Sheet2' => [
+                // Here the values are in cm, so we convert to inches for comparison with internal uom
+                'top' => 1.9 / self::MARGIN_UNIT_CONVERSION,
+                'header' => 0.8 / self::MARGIN_UNIT_CONVERSION,
+                'left' => 1.8 / self::MARGIN_UNIT_CONVERSION,
+                'right' => 1.8 / self::MARGIN_UNIT_CONVERSION,
+                'bottom' => 1.9 / self::MARGIN_UNIT_CONVERSION,
+                'footer' => 0.8 / self::MARGIN_UNIT_CONVERSION,
+            ],
+            'Sheet3' => [
+                // Here the values are in cm, so we convert to inches for comparison with internal uom
+                'top' => 2.4 / self::MARGIN_UNIT_CONVERSION,
+                'header' => 1.3 / self::MARGIN_UNIT_CONVERSION,
+                'left' => 1.8 / self::MARGIN_UNIT_CONVERSION,
+                'right' => 1.8 / self::MARGIN_UNIT_CONVERSION,
+                'bottom' => 2.4 / self::MARGIN_UNIT_CONVERSION,
+                'footer' => 1.3 / self::MARGIN_UNIT_CONVERSION,
+            ],
+            'Sheet4' => [
+                // Default Settings (already in inches for comparison)
+                'top' => 0.75,
+                'header' => 0.3,
+                'left' => 0.7,
+                'right' => 0.7,
+                'bottom' => 0.75,
+                'footer' => 0.3,
+            ],
+        ];
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Worksheet/PageMarginsTest.php b/tests/PhpSpreadsheetTests/Worksheet/PageMarginsTest.php
new file mode 100644
index 00000000..b9713707
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Worksheet/PageMarginsTest.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Worksheet;
+
+use PhpOffice\PhpSpreadsheet\Worksheet\PageMargins;
+use PHPUnit\Framework\TestCase;
+
+class PageMarginsTest extends TestCase
+{
+    /**
+     * @dataProvider providerPointsAndInches
+     */
+    public function testPointsToInches(float $value, float $expectedResult): void
+    {
+        $actualResult = PageMargins::fromPoints($value);
+        self::assertSame($expectedResult, $actualResult);
+    }
+
+    /**
+     * @dataProvider providerPointsAndInches
+     */
+    public function testInchesToPoints(float $expectedResult, float $value): void
+    {
+        $actualResult = PageMargins::toPoints($value);
+        self::assertSame($expectedResult, $actualResult);
+    }
+
+    /**
+     * @dataProvider providerCentimetersAndInches
+     */
+    public function testCentimetersToInches(float $value, float $expectedResult): void
+    {
+        $actualResult = PageMargins::fromCentimeters($value);
+        self::assertSame($expectedResult, $actualResult);
+    }
+
+    /**
+     * @dataProvider providerCentimetersAndInches
+     */
+    public function testPointsToCentimeters(float $expectedResult, float $value): void
+    {
+        $actualResult = PageMargins::toCentimeters($value);
+        self::assertSame($expectedResult, $actualResult);
+    }
+
+    /**
+     * @dataProvider providerMillimetersAndInches
+     */
+    public function testMillimetersToInches(float $value, float $expectedResult): void
+    {
+        $actualResult = PageMargins::fromMillimeters($value);
+        self::assertSame($expectedResult, $actualResult);
+    }
+
+    /**
+     * @dataProvider providerMillimetersAndInches
+     */
+    public function testPointsToMillimeters(float $expectedResult, float $value): void
+    {
+        $actualResult = PageMargins::toMillimeters($value);
+        self::assertSame($expectedResult, $actualResult);
+    }
+
+    public function providerPointsAndInches()
+    {
+        return [
+            [36, 0.5],
+            [72, 1.0],
+            [90, 1.25],
+            [144, 2.0],
+        ];
+    }
+
+    public function providerCentimetersAndInches()
+    {
+        return [
+            [1.27, 0.5],
+            [2.54, 1.0],
+        ];
+    }
+
+    public function providerMillimetersAndInches()
+    {
+        return [
+            [12.7, 0.5],
+            [25.4, 1.0],
+        ];
+    }
+}

From d009347e25d1a008d0f47a50e29db94f415dae64 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Sun, 5 Jul 2020 16:28:46 +0200
Subject: [PATCH 077/153] Forgot to check in the test files for the unit tests

---
 tests/data/Reader/Gnumeric/PageSetup.gnumeric | Bin 0 -> 2347 bytes
 tests/data/Reader/Ods/PageSetup.ods           | Bin 0 -> 4814 bytes
 tests/data/Reader/XLS/PageSetup.xls           | Bin 0 -> 34816 bytes
 tests/data/Reader/XLSX/PageSetup.xlsx         | Bin 0 -> 15225 bytes
 tests/data/Reader/Xml/PageSetup.xml           | 250 ++++++++++++++++++
 5 files changed, 250 insertions(+)
 create mode 100644 tests/data/Reader/Gnumeric/PageSetup.gnumeric
 create mode 100644 tests/data/Reader/Ods/PageSetup.ods
 create mode 100644 tests/data/Reader/XLS/PageSetup.xls
 create mode 100644 tests/data/Reader/XLSX/PageSetup.xlsx
 create mode 100644 tests/data/Reader/Xml/PageSetup.xml

diff --git a/tests/data/Reader/Gnumeric/PageSetup.gnumeric b/tests/data/Reader/Gnumeric/PageSetup.gnumeric
new file mode 100644
index 0000000000000000000000000000000000000000..53359154866fec0215c55f3144d34ea5444f4014
GIT binary patch
literal 2347
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
R-<r^U^%qh)<$tS0003*BgDwC7

literal 0
HcmV?d00001

diff --git a/tests/data/Reader/Ods/PageSetup.ods b/tests/data/Reader/Ods/PageSetup.ods
new file mode 100644
index 0000000000000000000000000000000000000000..1bf5f0041d0f76c05a2b3da6edd35cce766215e5
GIT binary patch
literal 4814
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

literal 0
HcmV?d00001

diff --git a/tests/data/Reader/XLS/PageSetup.xls b/tests/data/Reader/XLS/PageSetup.xls
new file mode 100644
index 0000000000000000000000000000000000000000..559d05326f7887f1c31f07f70c82e30a8f858e62
GIT binary patch
literal 34816
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
KD1S#5|NjHI|Fawb

literal 0
HcmV?d00001

diff --git a/tests/data/Reader/XLSX/PageSetup.xlsx b/tests/data/Reader/XLSX/PageSetup.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..327423fc054359215fdc91a106de4d88ebbf2034
GIT binary patch
literal 15225
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

literal 0
HcmV?d00001

diff --git a/tests/data/Reader/Xml/PageSetup.xml b/tests/data/Reader/Xml/PageSetup.xml
new file mode 100644
index 00000000..8f996a93
--- /dev/null
+++ b/tests/data/Reader/Xml/PageSetup.xml
@@ -0,0 +1,250 @@
+<?xml version="1.0"?>
+<?mso-application progid="Excel.Sheet"?>
+<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:o="urn:schemas-microsoft-com:office:office"
+ xmlns:x="urn:schemas-microsoft-com:office:excel"
+ xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:html="http://www.w3.org/TR/REC-html40">
+ <DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+  <Author>Mark Baker</Author>
+  <LastAuthor>Mark Baker</LastAuthor>
+  <LastPrinted>2020-07-04T11:51:41Z</LastPrinted>
+  <Created>2020-06-29T17:37:00Z</Created>
+  <LastSaved>2020-07-04T11:52:32Z</LastSaved>
+  <Version>16.00</Version>
+ </DocumentProperties>
+ <OfficeDocumentSettings xmlns="urn:schemas-microsoft-com:office:office">
+  <AllowPNG/>
+ </OfficeDocumentSettings>
+ <ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+  <WindowHeight>13170</WindowHeight>
+  <WindowWidth>21600</WindowWidth>
+  <WindowTopX>2145</WindowTopX>
+  <WindowTopY>2145</WindowTopY>
+  <ProtectStructure>False</ProtectStructure>
+  <ProtectWindows>False</ProtectWindows>
+ </ExcelWorkbook>
+ <Styles>
+  <Style ss:ID="Default" ss:Name="Normal">
+   <Alignment ss:Vertical="Bottom"/>
+   <Borders/>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"/>
+   <Interior/>
+   <NumberFormat/>
+   <Protection/>
+  </Style>
+ </Styles>
+ <Worksheet ss:Name="Sheet1">
+  <Table ss:ExpandedColumnCount="3" ss:ExpandedRowCount="5" x:FullColumns="1"
+   x:FullRows="1" ss:DefaultColumnWidth="51" ss:DefaultRowHeight="14.25">
+   <Row ss:AutoFitHeight="0">
+    <Cell><Data ss:Type="Number">1</Data></Cell>
+    <Cell><Data ss:Type="Number">2</Data></Cell>
+    <Cell><Data ss:Type="Number">3</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0">
+    <Cell><Data ss:Type="Number">4</Data></Cell>
+    <Cell><Data ss:Type="Number">5</Data></Cell>
+    <Cell><Data ss:Type="Number">6</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0">
+    <Cell><Data ss:Type="Number">7</Data></Cell>
+    <Cell><Data ss:Type="Number">8</Data></Cell>
+    <Cell><Data ss:Type="Number">9</Data></Cell>
+   </Row>
+   <Row ss:Index="5" ss:AutoFitHeight="0">
+    <Cell ss:Formula="=SUM(R[-3]C:R[-3]C[2],R[-4]C[1]:R[-2]C[1])"><Data
+      ss:Type="Number">30</Data></Cell>
+    <Cell ss:Formula="=COUNT(R[-3]C[-1]:R[-3]C[1],R[-4]C:R[-2]C)"><Data
+      ss:Type="Number">6</Data></Cell>
+   </Row>
+  </Table>
+  <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+   <PageSetup>
+    <Layout x:CenterHorizontal="1"/>
+    <Header x:Margin="0.31496062992125984"/>
+    <Footer x:Margin="0.31496062992125984"/>
+    <PageMargins x:Bottom="0.74803149606299213" x:Left="0.51181102362204722"
+     x:Right="0.51181102362204722" x:Top="0.94488188976377963"/>
+   </PageSetup>
+   <Unsynced/>
+   <Print>
+    <ValidPrinterInfo/>
+    <PaperSizeIndex>9</PaperSizeIndex>
+    <Scale>75</Scale>
+    <VerticalResolution>0</VerticalResolution>
+   </Print>
+   <Selected/>
+   <Panes>
+    <Pane>
+     <Number>3</Number>
+     <RangeSelection>R1C1:R5C3</RangeSelection>
+    </Pane>
+   </Panes>
+   <ProtectObjects>False</ProtectObjects>
+   <ProtectScenarios>False</ProtectScenarios>
+  </WorksheetOptions>
+ </Worksheet>
+ <Worksheet ss:Name="Sheet2">
+  <Table ss:ExpandedColumnCount="3" ss:ExpandedRowCount="5" x:FullColumns="1"
+   x:FullRows="1" ss:DefaultColumnWidth="51" ss:DefaultRowHeight="14.25">
+   <Row ss:AutoFitHeight="0">
+    <Cell><Data ss:Type="Number">1</Data></Cell>
+    <Cell><Data ss:Type="Number">2</Data></Cell>
+    <Cell><Data ss:Type="Number">3</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0">
+    <Cell><Data ss:Type="Number">4</Data></Cell>
+    <Cell><Data ss:Type="Number">5</Data></Cell>
+    <Cell><Data ss:Type="Number">6</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0">
+    <Cell><Data ss:Type="Number">7</Data></Cell>
+    <Cell><Data ss:Type="Number">8</Data></Cell>
+    <Cell><Data ss:Type="Number">9</Data></Cell>
+   </Row>
+   <Row ss:Index="5" ss:AutoFitHeight="0">
+    <Cell ss:Formula="=SUM(R1C1:R1C3,R3C1:R3C3,R1C1:R3C1,R1C3:R3C3)"><Data
+      ss:Type="Number">60</Data></Cell>
+    <Cell ss:Formula="=COUNT(R1C1:R1C3,R3C1:R3C3,R1C1:R3C1,R1C3:R3C3)"><Data
+      ss:Type="Number">12</Data></Cell>
+   </Row>
+  </Table>
+  <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+   <PageSetup>
+    <Layout x:Orientation="Landscape" x:CenterVertical="1"/>
+    <Header x:Margin="0.31496062992125984"/>
+    <Footer x:Margin="0.31496062992125984"/>
+    <PageMargins x:Bottom="0.74803149606299213" x:Left="0.70866141732283472"
+     x:Right="0.70866141732283472" x:Top="0.74803149606299213"/>
+   </PageSetup>
+   <Unsynced/>
+   <Print>
+    <LeftToRight/>
+    <ValidPrinterInfo/>
+    <PaperSizeIndex>9</PaperSizeIndex>
+    <VerticalResolution>0</VerticalResolution>
+   </Print>
+   <Panes>
+    <Pane>
+     <Number>3</Number>
+     <RangeSelection>R1C1:R5C3</RangeSelection>
+    </Pane>
+   </Panes>
+   <ProtectObjects>False</ProtectObjects>
+   <ProtectScenarios>False</ProtectScenarios>
+  </WorksheetOptions>
+ </Worksheet>
+ <Worksheet ss:Name="Sheet3">
+  <Names>
+   <NamedRange ss:Name="Print_Area" ss:RefersTo="=Sheet3!R1C1:R5C3"/>
+  </Names>
+  <Table ss:ExpandedColumnCount="3" ss:ExpandedRowCount="5" x:FullColumns="1"
+   x:FullRows="1" ss:DefaultColumnWidth="51" ss:DefaultRowHeight="14.25">
+   <Row ss:AutoFitHeight="0">
+    <Cell><Data ss:Type="Number">1</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell><Data ss:Type="Number">2</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell><Data ss:Type="Number">3</Data><NamedCell ss:Name="Print_Area"/></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0">
+    <Cell><Data ss:Type="Number">4</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell><Data ss:Type="Number">5</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell><Data ss:Type="Number">6</Data><NamedCell ss:Name="Print_Area"/></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0">
+    <Cell><Data ss:Type="Number">7</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell><Data ss:Type="Number">8</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell><Data ss:Type="Number">9</Data><NamedCell ss:Name="Print_Area"/></Cell>
+   </Row>
+   <Row ss:Index="5" ss:AutoFitHeight="0">
+    <Cell ss:Formula="=SUM(R1C1:R1C3,R3C1:R3C3,R1C1:R3C1,R1C3:R3C3)"><Data
+      ss:Type="Number">60</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:Formula="=COUNT(R1C1:R1C3,R3C1:R3C3,R1C1:R3C1,R1C3:R3C3)"><Data
+      ss:Type="Number">12</Data><NamedCell ss:Name="Print_Area"/></Cell>
+   </Row>
+  </Table>
+  <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+   <PageSetup>
+    <Layout x:CenterHorizontal="1" x:CenterVertical="1"/>
+    <Header x:Margin="0.51181102362204722"/>
+    <Footer x:Margin="0.51181102362204722"/>
+    <PageMargins x:Bottom="0.94488188976377963" x:Left="0.70866141732283472"
+     x:Right="0.70866141732283472" x:Top="0.94488188976377963"/>
+   </PageSetup>
+   <Unsynced/>
+   <Print>
+    <ValidPrinterInfo/>
+    <PaperSizeIndex>9</PaperSizeIndex>
+    <Scale>90</Scale>
+    <VerticalResolution>0</VerticalResolution>
+   </Print>
+   <FreezePanes/>
+   <FrozenNoSplit/>
+   <SplitHorizontal>1</SplitHorizontal>
+   <TopRowBottomPane>1</TopRowBottomPane>
+   <SplitVertical>1</SplitVertical>
+   <LeftColumnRightPane>1</LeftColumnRightPane>
+   <ActivePane>0</ActivePane>
+   <Panes>
+    <Pane>
+     <Number>3</Number>
+    </Pane>
+    <Pane>
+     <Number>1</Number>
+    </Pane>
+    <Pane>
+     <Number>2</Number>
+    </Pane>
+    <Pane>
+     <Number>0</Number>
+     <ActiveRow>0</ActiveRow>
+     <ActiveCol>0</ActiveCol>
+     <RangeSelection>R1C1:R5C3</RangeSelection>
+    </Pane>
+   </Panes>
+   <ProtectObjects>False</ProtectObjects>
+   <ProtectScenarios>False</ProtectScenarios>
+  </WorksheetOptions>
+ </Worksheet>
+ <Worksheet ss:Name="Sheet4">
+  <Table ss:ExpandedColumnCount="3" ss:ExpandedRowCount="5" x:FullColumns="1"
+   x:FullRows="1" ss:DefaultColumnWidth="51" ss:DefaultRowHeight="14.25">
+   <Row>
+    <Cell><Data ss:Type="Number">1</Data></Cell>
+    <Cell><Data ss:Type="Number">2</Data></Cell>
+    <Cell><Data ss:Type="Number">3</Data></Cell>
+   </Row>
+   <Row>
+    <Cell><Data ss:Type="Number">4</Data></Cell>
+    <Cell><Data ss:Type="Number">5</Data></Cell>
+    <Cell><Data ss:Type="Number">6</Data></Cell>
+   </Row>
+   <Row>
+    <Cell><Data ss:Type="Number">7</Data></Cell>
+    <Cell><Data ss:Type="Number">8</Data></Cell>
+    <Cell><Data ss:Type="Number">9</Data></Cell>
+   </Row>
+   <Row ss:Index="5">
+    <Cell ss:Formula="=SUM(R1C1:R1C3,R3C1:R3C3,R1C1:R3C1,R1C3:R3C3)"><Data
+      ss:Type="Number">60</Data></Cell>
+    <Cell ss:Formula="=COUNT(R1C1:R1C3,R3C1:R3C3,R1C1:R3C1,R1C3:R3C3)"><Data
+      ss:Type="Number">12</Data></Cell>
+   </Row>
+  </Table>
+  <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+   <PageSetup>
+    <Header x:Margin="0.3"/>
+    <Footer x:Margin="0.3"/>
+    <PageMargins x:Bottom="0.75" x:Left="0.7" x:Right="0.7" x:Top="0.75"/>
+   </PageSetup>
+   <Panes>
+    <Pane>
+     <Number>3</Number>
+     <RangeSelection>R1C1:R5C3</RangeSelection>
+    </Pane>
+   </Panes>
+   <ProtectObjects>False</ProtectObjects>
+   <ProtectScenarios>False</ProtectScenarios>
+  </WorksheetOptions>
+ </Worksheet>
+</Workbook>

From 3997dcc3af1c9b7459e20d1348c9d9b52eb432f4 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Sun, 5 Jul 2020 16:39:47 +0200
Subject: [PATCH 078/153] Not sure why PHP 7.4 should suddenly have decided to
 report a notice in a totally unrelated part of the Xml Reader

---
 src/PhpSpreadsheet/Reader/Xml.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpSpreadsheet/Reader/Xml.php b/src/PhpSpreadsheet/Reader/Xml.php
index 9ea0a82d..cefcd336 100644
--- a/src/PhpSpreadsheet/Reader/Xml.php
+++ b/src/PhpSpreadsheet/Reader/Xml.php
@@ -570,7 +570,7 @@ class Xml extends BaseReader
                                                     $columnReference = $columnNumber;
                                                 }
                                                 //    Bracketed C references are relative to the current column
-                                                if ($columnReference[0] == '[') {
+                                                if (is_string($columnReference) && $columnReference[0] == '[') {
                                                     $columnReference = $columnNumber + trim($columnReference, '[]');
                                                 }
                                                 $A1CellReference = Coordinate::stringFromColumnIndex($columnReference) . $rowReference;

From e89196f65b130b16e3d5b16470b54873935bc437 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Sun, 5 Jul 2020 17:05:44 +0200
Subject: [PATCH 079/153] phpcs fixes, although I thought I'd successfully
 added the pre-commit hook to pick those up before the commit, guess the
 problem is running from Windoze, so I'll have to address that

---
 src/PhpSpreadsheet/Reader/Gnumeric.php               |  5 +++++
 src/PhpSpreadsheet/Reader/Xml.php                    | 11 ++++++-----
 .../Reader/Gnumeric/PageSetupTest.php                | 12 ++++++------
 .../PhpSpreadsheetTests/Reader/Ods/PageSetupTest.php | 12 ++++++------
 .../PhpSpreadsheetTests/Reader/Xls/PageSetupTest.php | 12 ++++++------
 .../Reader/Xlsx/PageSetupTest.php                    | 12 ++++++------
 .../PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php | 12 ++++++------
 7 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/src/PhpSpreadsheet/Reader/Gnumeric.php b/src/PhpSpreadsheet/Reader/Gnumeric.php
index 32105477..7c735a41 100644
--- a/src/PhpSpreadsheet/Reader/Gnumeric.php
+++ b/src/PhpSpreadsheet/Reader/Gnumeric.php
@@ -453,18 +453,23 @@ class Gnumeric extends BaseReader
                     case 'left':
                     case 'right':
                         $this->sheetMargin($key, $marginSize);
+
                         break;
                     case 'top':
                         $this->sheetMargin($key, $marginSet['header'] ?? 0);
+
                         break;
                     case 'bottom':
                         $this->sheetMargin($key, $marginSet['footer'] ?? 0);
+
                         break;
                     case 'header':
                         $this->sheetMargin($key, ($marginSet['top'] ?? 0) - $marginSize);
+
                         break;
                     case 'footer':
                         $this->sheetMargin($key, ($marginSet['bottom'] ?? 0) - $marginSize);
+
                         break;
                 }
             }
diff --git a/src/PhpSpreadsheet/Reader/Xml.php b/src/PhpSpreadsheet/Reader/Xml.php
index cefcd336..33712e96 100644
--- a/src/PhpSpreadsheet/Reader/Xml.php
+++ b/src/PhpSpreadsheet/Reader/Xml.php
@@ -17,6 +17,7 @@ use PhpOffice\PhpSpreadsheet\Style\Border;
 use PhpOffice\PhpSpreadsheet\Style\Font;
 use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
 use SimpleXMLElement;
+use stdClass;
 
 /**
  * Reader for SpreadsheetML, the XML schema for Microsoft Office Excel 2003.
@@ -905,16 +906,16 @@ class Xml extends BaseReader
                     switch ($pageSetupKey) {
                         case 'Layout':
                             $printDefaults->orientation = (string) strtolower($pageSetupAttributes->Orientation) ?: PageSetup::ORIENTATION_PORTRAIT;
-                            $printDefaults->horizontalCentered = (bool)$pageSetupAttributes->CenterHorizontal ?: false;
-                            $printDefaults->verticalCentered = (bool)$pageSetupAttributes->CenterVertical ?: false;
+                            $printDefaults->horizontalCentered = (bool) $pageSetupAttributes->CenterHorizontal ?: false;
+                            $printDefaults->verticalCentered = (bool) $pageSetupAttributes->CenterVertical ?: false;
 
                             break;
                         case 'Header':
-                            $printDefaults->headerMargin = (float)$pageSetupAttributes->Margin ?: 1.0;
+                            $printDefaults->headerMargin = (float) $pageSetupAttributes->Margin ?: 1.0;
 
                             break;
                         case 'Footer':
-                            $printDefaults->footerMargin = (float)$pageSetupAttributes->Margin ?: 1.0;
+                            $printDefaults->footerMargin = (float) $pageSetupAttributes->Margin ?: 1.0;
 
                             break;
                         case 'PageMargins':
@@ -932,7 +933,7 @@ class Xml extends BaseReader
         return $printDefaults;
     }
 
-    private function printSetup(SimpleXMLElement $xmlX, array $namespaces, \stdClass $printDefaults): \stdClass
+    private function printSetup(SimpleXMLElement $xmlX, array $namespaces, stdClass $printDefaults): stdClass
     {
         if (isset($xmlX->WorksheetOptions->Print)) {
             foreach ($xmlX->WorksheetOptions->Print as $printData) {
diff --git a/tests/PhpSpreadsheetTests/Reader/Gnumeric/PageSetupTest.php b/tests/PhpSpreadsheetTests/Reader/Gnumeric/PageSetupTest.php
index 057dbf69..4eb9d5bd 100644
--- a/tests/PhpSpreadsheetTests/Reader/Gnumeric/PageSetupTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Gnumeric/PageSetupTest.php
@@ -12,18 +12,18 @@ class PageSetupTest extends TestCase
     private const MARGIN_PRECISION = 0.001;
 
     /**
-     * @var Spreadsheet $spreadsheet
+     * @var Spreadsheet
      */
     private $spreadsheet;
 
-    public function setup(): void
+    protected function setup(): void
     {
         $filename = 'tests/data/Reader/Gnumeric/PageSetup.gnumeric';
         $reader = new Gnumeric();
         $this->spreadsheet = $reader->load($filename);
     }
 
-    public function testPageSetup()
+    public function testPageSetup(): void
     {
         $assertions = $this->pageSetupAssertions();
 
@@ -36,7 +36,7 @@ class PageSetupTest extends TestCase
             foreach ($sheetAssertions as $test => $expectedResult) {
                 $testMethodName = 'get' . ucfirst($test);
                 $actualResult = $worksheet->getPageSetup()->$testMethodName();
-                $this->assertSame(
+                self::assertSame(
                     $expectedResult,
                     $actualResult,
                     "Failed assertion for Worksheet '{$worksheet->getTitle()}' {$test}"
@@ -45,7 +45,7 @@ class PageSetupTest extends TestCase
         }
     }
 
-    public function testPageMargins()
+    public function testPageMargins(): void
     {
         $assertions = $this->pageMarginAssertions();
 
@@ -58,7 +58,7 @@ class PageSetupTest extends TestCase
             foreach ($sheetAssertions as $test => $expectedResult) {
                 $testMethodName = 'get' . ucfirst($test);
                 $actualResult = $worksheet->getPageMargins()->$testMethodName();
-                $this->assertEqualsWithDelta(
+                self::assertEqualsWithDelta(
                     $expectedResult,
                     $actualResult,
                     self::MARGIN_PRECISION,
diff --git a/tests/PhpSpreadsheetTests/Reader/Ods/PageSetupTest.php b/tests/PhpSpreadsheetTests/Reader/Ods/PageSetupTest.php
index 74eaae8f..e17c5da4 100644
--- a/tests/PhpSpreadsheetTests/Reader/Ods/PageSetupTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Ods/PageSetupTest.php
@@ -14,18 +14,18 @@ class PageSetupTest extends TestCase
     private const MARGIN_UNIT_CONVERSION = 2.54;         // Inches to cm
 
     /**
-     * @var Spreadsheet $spreadsheet
+     * @var Spreadsheet
      */
     private $spreadsheet;
 
-    public function setup(): void
+    protected function setup(): void
     {
         $filename = 'tests/data/Reader/Ods/PageSetup.ods';
         $reader = new Ods();
         $this->spreadsheet = $reader->load($filename);
     }
 
-    public function testPageSetup()
+    public function testPageSetup(): void
     {
         $assertions = $this->pageSetupAssertions();
 
@@ -38,7 +38,7 @@ class PageSetupTest extends TestCase
             foreach ($sheetAssertions as $test => $expectedResult) {
                 $testMethodName = 'get' . ucfirst($test);
                 $actualResult = $worksheet->getPageSetup()->$testMethodName();
-                $this->assertSame(
+                self::assertSame(
                     $expectedResult,
                     $actualResult,
                     "Failed assertion for Worksheet '{$worksheet->getTitle()}' {$test}"
@@ -47,7 +47,7 @@ class PageSetupTest extends TestCase
         }
     }
 
-    public function testPageMargins()
+    public function testPageMargins(): void
     {
         $assertions = $this->pageMarginAssertions();
 
@@ -60,7 +60,7 @@ class PageSetupTest extends TestCase
             foreach ($sheetAssertions as $test => $expectedResult) {
                 $testMethodName = 'get' . ucfirst($test);
                 $actualResult = $worksheet->getPageMargins()->$testMethodName();
-                $this->assertEqualsWithDelta(
+                self::assertEqualsWithDelta(
                     $expectedResult,
                     $actualResult,
                     self::MARGIN_PRECISION,
diff --git a/tests/PhpSpreadsheetTests/Reader/Xls/PageSetupTest.php b/tests/PhpSpreadsheetTests/Reader/Xls/PageSetupTest.php
index 2cfbbb3f..5947d1b5 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xls/PageSetupTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xls/PageSetupTest.php
@@ -14,18 +14,18 @@ class PageSetupTest extends TestCase
     private const MARGIN_UNIT_CONVERSION = 2.54;         // Inches to cm
 
     /**
-     * @var Spreadsheet $spreadsheet
+     * @var Spreadsheet
      */
     private $spreadsheet;
 
-    public function setup(): void
+    protected function setup(): void
     {
         $filename = 'tests/data/Reader/XLS/PageSetup.xls';
         $reader = new Xls();
         $this->spreadsheet = $reader->load($filename);
     }
 
-    public function testPageSetup()
+    public function testPageSetup(): void
     {
         $assertions = $this->pageSetupAssertions();
 
@@ -38,7 +38,7 @@ class PageSetupTest extends TestCase
             foreach ($sheetAssertions as $test => $expectedResult) {
                 $testMethodName = 'get' . ucfirst($test);
                 $actualResult = $worksheet->getPageSetup()->$testMethodName();
-                $this->assertSame(
+                self::assertSame(
                     $expectedResult,
                     $actualResult,
                     "Failed assertion for Worksheet '{$worksheet->getTitle()}' {$test}"
@@ -47,7 +47,7 @@ class PageSetupTest extends TestCase
         }
     }
 
-    public function testPageMargins()
+    public function testPageMargins(): void
     {
         $assertions = $this->pageMarginAssertions();
 
@@ -60,7 +60,7 @@ class PageSetupTest extends TestCase
             foreach ($sheetAssertions as $test => $expectedResult) {
                 $testMethodName = 'get' . ucfirst($test);
                 $actualResult = $worksheet->getPageMargins()->$testMethodName();
-                $this->assertEqualsWithDelta(
+                self::assertEqualsWithDelta(
                     $expectedResult,
                     $actualResult,
                     self::MARGIN_PRECISION,
diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/PageSetupTest.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/PageSetupTest.php
index a5b287fe..cd1bd174 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xlsx/PageSetupTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/PageSetupTest.php
@@ -14,18 +14,18 @@ class PageSetupTest extends TestCase
     private const MARGIN_UNIT_CONVERSION = 2.54;         // Inches to cm
 
     /**
-     * @var Spreadsheet $spreadsheet
+     * @var Spreadsheet
      */
     private $spreadsheet;
 
-    public function setup(): void
+    protected function setup(): void
     {
         $filename = 'tests/data/Reader/XLSX/PageSetup.xlsx';
         $reader = new Xlsx();
         $this->spreadsheet = $reader->load($filename);
     }
 
-    public function testPageSetup()
+    public function testPageSetup(): void
     {
         $assertions = $this->pageSetupAssertions();
 
@@ -38,7 +38,7 @@ class PageSetupTest extends TestCase
             foreach ($sheetAssertions as $test => $expectedResult) {
                 $testMethodName = 'get' . ucfirst($test);
                 $actualResult = $worksheet->getPageSetup()->$testMethodName();
-                $this->assertSame(
+                self::assertSame(
                     $expectedResult,
                     $actualResult,
                     "Failed assertion for Worksheet '{$worksheet->getTitle()}' {$test}"
@@ -47,7 +47,7 @@ class PageSetupTest extends TestCase
         }
     }
 
-    public function testPageMargins()
+    public function testPageMargins(): void
     {
         $assertions = $this->pageMarginAssertions();
 
@@ -60,7 +60,7 @@ class PageSetupTest extends TestCase
             foreach ($sheetAssertions as $test => $expectedResult) {
                 $testMethodName = 'get' . ucfirst($test);
                 $actualResult = $worksheet->getPageMargins()->$testMethodName();
-                $this->assertEqualsWithDelta(
+                self::assertEqualsWithDelta(
                     $expectedResult,
                     $actualResult,
                     self::MARGIN_PRECISION,
diff --git a/tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php b/tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php
index 8b934be6..ab664720 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php
@@ -13,18 +13,18 @@ class PageSetupTest extends TestCase
 
     private const MARGIN_UNIT_CONVERSION = 2.54;         // Inches to cm
     /**
-     * @var Spreadsheet $spreadsheet
+     * @var Spreadsheet
      */
     private $spreadsheet;
 
-    public function setup(): void
+    protected function setup(): void
     {
         $filename = 'tests/data/Reader/Xml/PageSetup.xml';
         $reader = new Xml();
         $this->spreadsheet = $reader->load($filename);
     }
 
-    public function testPageSetup()
+    public function testPageSetup(): void
     {
         $assertions = $this->pageSetupAssertions();
 
@@ -37,7 +37,7 @@ class PageSetupTest extends TestCase
             foreach ($sheetAssertions as $test => $expectedResult) {
                 $testMethodName = 'get' . ucfirst($test);
                 $actualResult = $worksheet->getPageSetup()->$testMethodName();
-                $this->assertSame(
+                self::assertSame(
                     $expectedResult,
                     $actualResult,
                     "Failed assertion for Worksheet '{$worksheet->getTitle()}' {$test}"
@@ -46,7 +46,7 @@ class PageSetupTest extends TestCase
         }
     }
 
-    public function testPageMargins()
+    public function testPageMargins(): void
     {
         $assertions = $this->pageMarginAssertions();
 
@@ -59,7 +59,7 @@ class PageSetupTest extends TestCase
             foreach ($sheetAssertions as $test => $expectedResult) {
                 $testMethodName = 'get' . ucfirst($test);
                 $actualResult = $worksheet->getPageMargins()->$testMethodName();
-                $this->assertEqualsWithDelta(
+                self::assertEqualsWithDelta(
                     $expectedResult,
                     $actualResult,
                     self::MARGIN_PRECISION,

From cf6769eab1a7d8a6b36877df294e1f10cbf72dc1 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Sun, 5 Jul 2020 17:17:56 +0200
Subject: [PATCH 080/153] Hopefully a final phpcs fix before I start looking at
 how to run a pre-commit hook on Windows 10

---
 src/PhpSpreadsheet/Reader/Xml.php                      | 2 +-
 tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/PhpSpreadsheet/Reader/Xml.php b/src/PhpSpreadsheet/Reader/Xml.php
index 33712e96..2f6a2160 100644
--- a/src/PhpSpreadsheet/Reader/Xml.php
+++ b/src/PhpSpreadsheet/Reader/Xml.php
@@ -897,7 +897,7 @@ class Xml extends BaseReader
         ];
     }
 
-    private function pageSetup(SimpleXMLElement $xmlX, array $namespaces, \stdClass $printDefaults): \stdClass
+    private function pageSetup(SimpleXMLElement $xmlX, array $namespaces, stdClass $printDefaults): stdClass
     {
         if (isset($xmlX->WorksheetOptions->PageSetup)) {
             foreach ($xmlX->WorksheetOptions->PageSetup as $pageSetupData) {
diff --git a/tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php b/tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php
index ab664720..92100b04 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php
@@ -12,6 +12,7 @@ class PageSetupTest extends TestCase
     private const MARGIN_PRECISION = 0.000001;
 
     private const MARGIN_UNIT_CONVERSION = 2.54;         // Inches to cm
+
     /**
      * @var Spreadsheet
      */

From 961dc693d181617b1e7835c49af922ecc8ebca8c Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Sun, 5 Jul 2020 17:35:13 +0200
Subject: [PATCH 081/153] Improve SCrutinizer happiness

---
 src/PhpSpreadsheet/Reader/Xml.php            | 4 ++--
 src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/PhpSpreadsheet/Reader/Xml.php b/src/PhpSpreadsheet/Reader/Xml.php
index 2f6a2160..768498c2 100644
--- a/src/PhpSpreadsheet/Reader/Xml.php
+++ b/src/PhpSpreadsheet/Reader/Xml.php
@@ -632,7 +632,7 @@ class Xml extends BaseReader
                 $xml_x = $worksheet->children($namespaces['x']);
                 if (isset($xml_x->WorksheetOptions)) {
                     $printSettings = $this->pageSetup($xml_x, $namespaces, $this->getPrintDefaults());
-                    $printSettings = $this->printSetup($xml_x, $namespaces, $printSettings);
+                    $printSettings = $this->printSetup($xml_x, $printSettings);
 
                     $spreadsheet->getActiveSheet()->getPageSetup()
                         ->setPaperSize($printSettings->paperSize)
@@ -933,7 +933,7 @@ class Xml extends BaseReader
         return $printDefaults;
     }
 
-    private function printSetup(SimpleXMLElement $xmlX, array $namespaces, stdClass $printDefaults): stdClass
+    private function printSetup(SimpleXMLElement $xmlX, stdClass $printDefaults): stdClass
     {
         if (isset($xmlX->WorksheetOptions->Print)) {
             foreach ($xmlX->WorksheetOptions->Print as $printData) {
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php b/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
index 2a8a3add..759d9611 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
@@ -875,9 +875,7 @@ class Worksheet extends WriterPart
             $objWriter->writeAttribute('firstPageNumber', $pSheet->getPageSetup()->getFirstPageNumber());
             $objWriter->writeAttribute('useFirstPageNumber', '1');
         }
-        if ($pSheet->getPageSetup()->getPageOrder() !== null) {
-            $objWriter->writeAttribute('pageOrder', $pSheet->getPageSetup()->getPageOrder());
-        }
+        $objWriter->writeAttribute('pageOrder', $pSheet->getPageSetup()->getPageOrder());
 
         $getUnparsedLoadedData = $pSheet->getParent()->getUnparsedLoadedData();
         if (isset($getUnparsedLoadedData['sheets'][$pSheet->getCodeName()]['pageSetupRelId'])) {

From 586b36b44014f34ac515003cba0ce2b58f6f999d Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Sun, 5 Jul 2020 18:11:14 +0200
Subject: [PATCH 082/153] Refactor Xml PageSettings into a separate loader
 class

---
 src/PhpSpreadsheet/Reader/Xml.php             | 105 +--------------
 .../Reader/Xml/PageSettings.php               | 120 ++++++++++++++++++
 2 files changed, 124 insertions(+), 101 deletions(-)
 create mode 100644 src/PhpSpreadsheet/Reader/Xml/PageSettings.php

diff --git a/src/PhpSpreadsheet/Reader/Xml.php b/src/PhpSpreadsheet/Reader/Xml.php
index 768498c2..fc2f5108 100644
--- a/src/PhpSpreadsheet/Reader/Xml.php
+++ b/src/PhpSpreadsheet/Reader/Xml.php
@@ -6,6 +6,7 @@ use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
 use PhpOffice\PhpSpreadsheet\Document\Properties;
 use PhpOffice\PhpSpreadsheet\Reader\Security\XmlScanner;
+use PhpOffice\PhpSpreadsheet\Reader\Xml\PageSettings;
 use PhpOffice\PhpSpreadsheet\RichText\RichText;
 use PhpOffice\PhpSpreadsheet\Settings;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
@@ -15,9 +16,7 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Style\Alignment;
 use PhpOffice\PhpSpreadsheet\Style\Border;
 use PhpOffice\PhpSpreadsheet\Style\Font;
-use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
 use SimpleXMLElement;
-use stdClass;
 
 /**
  * Reader for SpreadsheetML, the XML schema for Microsoft Office Excel 2003.
@@ -629,25 +628,9 @@ class Xml extends BaseReader
                     ++$rowID;
                 }
 
-                $xml_x = $worksheet->children($namespaces['x']);
-                if (isset($xml_x->WorksheetOptions)) {
-                    $printSettings = $this->pageSetup($xml_x, $namespaces, $this->getPrintDefaults());
-                    $printSettings = $this->printSetup($xml_x, $printSettings);
-
-                    $spreadsheet->getActiveSheet()->getPageSetup()
-                        ->setPaperSize($printSettings->paperSize)
-                        ->setOrientation($printSettings->orientation)
-                        ->setScale($printSettings->scale)
-                        ->setVerticalCentered($printSettings->verticalCentered)
-                        ->setHorizontalCentered($printSettings->horizontalCentered)
-                        ->setPageOrder($printSettings->printOrder);
-                    $spreadsheet->getActiveSheet()->getPageMargins()
-                        ->setTop($printSettings->topMargin)
-                        ->setHeader($printSettings->headerMargin)
-                        ->setLeft($printSettings->leftMargin)
-                        ->setRight($printSettings->rightMargin)
-                        ->setBottom($printSettings->bottomMargin)
-                        ->setFooter($printSettings->footerMargin);
+                $xmlX = $worksheet->children($namespaces['x']);
+                if (isset($xmlX->WorksheetOptions)) {
+                    (new PageSettings($xmlX, $namespaces))->loadPageSettings($spreadsheet);
                 }
             }
             ++$worksheetID;
@@ -878,84 +861,4 @@ class Xml extends BaseReader
             }
         }
     }
-
-    private function getPrintDefaults()
-    {
-        return (object) [
-            'paperSize' => 9,
-            'orientation' => PageSetup::ORIENTATION_DEFAULT,
-            'scale' => 100,
-            'horizontalCentered' => false,
-            'verticalCentered' => false,
-            'printOrder' => PageSetup::PAGEORDER_DOWN_THEN_OVER,
-            'topMargin' => 0.75,
-            'headerMargin' => 0.3,
-            'leftMargin' => 0.7,
-            'rightMargin' => 0.7,
-            'bottomMargin' => 0.75,
-            'footerMargin' => 0.3,
-        ];
-    }
-
-    private function pageSetup(SimpleXMLElement $xmlX, array $namespaces, stdClass $printDefaults): stdClass
-    {
-        if (isset($xmlX->WorksheetOptions->PageSetup)) {
-            foreach ($xmlX->WorksheetOptions->PageSetup as $pageSetupData) {
-                foreach ($pageSetupData as $pageSetupKey => $pageSetupValue) {
-                    $pageSetupAttributes = $pageSetupValue->attributes($namespaces['x']);
-                    switch ($pageSetupKey) {
-                        case 'Layout':
-                            $printDefaults->orientation = (string) strtolower($pageSetupAttributes->Orientation) ?: PageSetup::ORIENTATION_PORTRAIT;
-                            $printDefaults->horizontalCentered = (bool) $pageSetupAttributes->CenterHorizontal ?: false;
-                            $printDefaults->verticalCentered = (bool) $pageSetupAttributes->CenterVertical ?: false;
-
-                            break;
-                        case 'Header':
-                            $printDefaults->headerMargin = (float) $pageSetupAttributes->Margin ?: 1.0;
-
-                            break;
-                        case 'Footer':
-                            $printDefaults->footerMargin = (float) $pageSetupAttributes->Margin ?: 1.0;
-
-                            break;
-                        case 'PageMargins':
-                            $printDefaults->leftMargin = (float) $pageSetupAttributes->Left ?: 1.0;
-                            $printDefaults->rightMargin = (float) $pageSetupAttributes->Right ?: 1.0;
-                            $printDefaults->topMargin = (float) $pageSetupAttributes->Top ?: 1.0;
-                            $printDefaults->bottomMargin = (float) $pageSetupAttributes->Bottom ?: 1.0;
-
-                            break;
-                    }
-                }
-            }
-        }
-
-        return $printDefaults;
-    }
-
-    private function printSetup(SimpleXMLElement $xmlX, stdClass $printDefaults): stdClass
-    {
-        if (isset($xmlX->WorksheetOptions->Print)) {
-            foreach ($xmlX->WorksheetOptions->Print as $printData) {
-                foreach ($printData as $printKey => $printValue) {
-                    switch ($printKey) {
-                        case 'LeftToRight':
-                            $printDefaults->printOrder = PageSetup::PAGEORDER_OVER_THEN_DOWN;
-
-                            break;
-                        case 'PaperSizeIndex':
-                            $printDefaults->paperSize = (int) $printValue ?: 9;
-
-                            break;
-                        case 'Scale':
-                            $printDefaults->scale = (int) $printValue ?: 100;
-
-                            break;
-                    }
-                }
-            }
-        }
-
-        return $printDefaults;
-    }
 }
diff --git a/src/PhpSpreadsheet/Reader/Xml/PageSettings.php b/src/PhpSpreadsheet/Reader/Xml/PageSettings.php
new file mode 100644
index 00000000..17883661
--- /dev/null
+++ b/src/PhpSpreadsheet/Reader/Xml/PageSettings.php
@@ -0,0 +1,120 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Xml;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
+use SimpleXMLElement;
+use stdClass;
+
+class PageSettings
+{
+    /**
+     * @var stdClass
+     */
+    private $printSettings;
+
+    public function __construct(SimpleXMLElement $xmlX, array $namespaces)
+    {
+        $printSettings = $this->pageSetup($xmlX, $namespaces, $this->getPrintDefaults());
+        $this->printSettings = $this->printSetup($xmlX, $printSettings);
+    }
+
+    public function loadPageSettings(Spreadsheet $spreadsheet): void
+    {
+        $spreadsheet->getActiveSheet()->getPageSetup()
+            ->setPaperSize($this->printSettings->paperSize)
+            ->setOrientation($this->printSettings->orientation)
+            ->setScale($this->printSettings->scale)
+            ->setVerticalCentered($this->printSettings->verticalCentered)
+            ->setHorizontalCentered($this->printSettings->horizontalCentered)
+            ->setPageOrder($this->printSettings->printOrder);
+        $spreadsheet->getActiveSheet()->getPageMargins()
+            ->setTop($this->printSettings->topMargin)
+            ->setHeader($this->printSettings->headerMargin)
+            ->setLeft($this->printSettings->leftMargin)
+            ->setRight($this->printSettings->rightMargin)
+            ->setBottom($this->printSettings->bottomMargin)
+            ->setFooter($this->printSettings->footerMargin);
+    }
+
+    private function getPrintDefaults()
+    {
+        return (object) [
+            'paperSize' => 9,
+            'orientation' => PageSetup::ORIENTATION_DEFAULT,
+            'scale' => 100,
+            'horizontalCentered' => false,
+            'verticalCentered' => false,
+            'printOrder' => PageSetup::PAGEORDER_DOWN_THEN_OVER,
+            'topMargin' => 0.75,
+            'headerMargin' => 0.3,
+            'leftMargin' => 0.7,
+            'rightMargin' => 0.7,
+            'bottomMargin' => 0.75,
+            'footerMargin' => 0.3,
+        ];
+    }
+
+    private function pageSetup(SimpleXMLElement $xmlX, array $namespaces, stdClass $printDefaults): stdClass
+    {
+        if (isset($xmlX->WorksheetOptions->PageSetup)) {
+            foreach ($xmlX->WorksheetOptions->PageSetup as $pageSetupData) {
+                foreach ($pageSetupData as $pageSetupKey => $pageSetupValue) {
+                    $pageSetupAttributes = $pageSetupValue->attributes($namespaces['x']);
+                    switch ($pageSetupKey) {
+                        case 'Layout':
+                            $printDefaults->orientation = (string) strtolower($pageSetupAttributes->Orientation) ?: PageSetup::ORIENTATION_PORTRAIT;
+                            $printDefaults->horizontalCentered = (bool) $pageSetupAttributes->CenterHorizontal ?: false;
+                            $printDefaults->verticalCentered = (bool) $pageSetupAttributes->CenterVertical ?: false;
+
+                            break;
+                        case 'Header':
+                            $printDefaults->headerMargin = (float) $pageSetupAttributes->Margin ?: 1.0;
+
+                            break;
+                        case 'Footer':
+                            $printDefaults->footerMargin = (float) $pageSetupAttributes->Margin ?: 1.0;
+
+                            break;
+                        case 'PageMargins':
+                            $printDefaults->leftMargin = (float) $pageSetupAttributes->Left ?: 1.0;
+                            $printDefaults->rightMargin = (float) $pageSetupAttributes->Right ?: 1.0;
+                            $printDefaults->topMargin = (float) $pageSetupAttributes->Top ?: 1.0;
+                            $printDefaults->bottomMargin = (float) $pageSetupAttributes->Bottom ?: 1.0;
+
+                            break;
+                    }
+                }
+            }
+        }
+
+        return $printDefaults;
+    }
+
+    private function printSetup(SimpleXMLElement $xmlX, stdClass $printDefaults): stdClass
+    {
+        if (isset($xmlX->WorksheetOptions->Print)) {
+            foreach ($xmlX->WorksheetOptions->Print as $printData) {
+                foreach ($printData as $printKey => $printValue) {
+                    switch ($printKey) {
+                        case 'LeftToRight':
+                            $printDefaults->printOrder = PageSetup::PAGEORDER_OVER_THEN_DOWN;
+
+                            break;
+                        case 'PaperSizeIndex':
+                            $printDefaults->paperSize = (int) $printValue ?: 9;
+
+                            break;
+                        case 'Scale':
+                            $printDefaults->scale = (int) $printValue ?: 100;
+
+                            break;
+                    }
+                }
+            }
+        }
+
+        return $printDefaults;
+    }
+}

From 6cbb622a9e81b12a94ba0f494f478f1037a9a252 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Sun, 5 Jul 2020 18:25:39 +0200
Subject: [PATCH 083/153] Minor refactoring

---
 .../Reader/Xml/PageSettings.php               | 24 +++++++++++++------
 .../Reader/Ods/PageSetupTest.php              |  2 +-
 .../Reader/Xls/PageSetupTest.php              |  2 +-
 .../Reader/Xlsx/PageSetupTest.php             |  2 +-
 .../Reader/Xml/PageSetupTest.php              |  2 +-
 5 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/PhpSpreadsheet/Reader/Xml/PageSettings.php b/src/PhpSpreadsheet/Reader/Xml/PageSettings.php
index 17883661..d07e55ae 100644
--- a/src/PhpSpreadsheet/Reader/Xml/PageSettings.php
+++ b/src/PhpSpreadsheet/Reader/Xml/PageSettings.php
@@ -64,9 +64,7 @@ class PageSettings
                     $pageSetupAttributes = $pageSetupValue->attributes($namespaces['x']);
                     switch ($pageSetupKey) {
                         case 'Layout':
-                            $printDefaults->orientation = (string) strtolower($pageSetupAttributes->Orientation) ?: PageSetup::ORIENTATION_PORTRAIT;
-                            $printDefaults->horizontalCentered = (bool) $pageSetupAttributes->CenterHorizontal ?: false;
-                            $printDefaults->verticalCentered = (bool) $pageSetupAttributes->CenterVertical ?: false;
+                            $this->setLayout($printDefaults, $pageSetupAttributes);
 
                             break;
                         case 'Header':
@@ -78,10 +76,7 @@ class PageSettings
 
                             break;
                         case 'PageMargins':
-                            $printDefaults->leftMargin = (float) $pageSetupAttributes->Left ?: 1.0;
-                            $printDefaults->rightMargin = (float) $pageSetupAttributes->Right ?: 1.0;
-                            $printDefaults->topMargin = (float) $pageSetupAttributes->Top ?: 1.0;
-                            $printDefaults->bottomMargin = (float) $pageSetupAttributes->Bottom ?: 1.0;
+                            $this->setMargins($printDefaults, $pageSetupAttributes);
 
                             break;
                     }
@@ -117,4 +112,19 @@ class PageSettings
 
         return $printDefaults;
     }
+
+    private function setLayout(stdClass $printDefaults, SimpleXMLElement $pageSetupAttributes): void
+    {
+        $printDefaults->orientation = (string)strtolower($pageSetupAttributes->Orientation) ?: PageSetup::ORIENTATION_PORTRAIT;
+        $printDefaults->horizontalCentered = (bool)$pageSetupAttributes->CenterHorizontal ?: false;
+        $printDefaults->verticalCentered = (bool)$pageSetupAttributes->CenterVertical ?: false;
+    }
+
+    private function setMargins(stdClass $printDefaults, SimpleXMLElement $pageSetupAttributes): void
+    {
+        $printDefaults->leftMargin = (float)$pageSetupAttributes->Left ?: 1.0;
+        $printDefaults->rightMargin = (float)$pageSetupAttributes->Right ?: 1.0;
+        $printDefaults->topMargin = (float)$pageSetupAttributes->Top ?: 1.0;
+        $printDefaults->bottomMargin = (float)$pageSetupAttributes->Bottom ?: 1.0;
+    }
 }
diff --git a/tests/PhpSpreadsheetTests/Reader/Ods/PageSetupTest.php b/tests/PhpSpreadsheetTests/Reader/Ods/PageSetupTest.php
index e17c5da4..a8e681d4 100644
--- a/tests/PhpSpreadsheetTests/Reader/Ods/PageSetupTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Ods/PageSetupTest.php
@@ -11,7 +11,7 @@ class PageSetupTest extends TestCase
 {
     private const MARGIN_PRECISION = 0.00000001;
 
-    private const MARGIN_UNIT_CONVERSION = 2.54;         // Inches to cm
+    private const MARGIN_UNIT_CONVERSION = 2.54; // Inches to cm
 
     /**
      * @var Spreadsheet
diff --git a/tests/PhpSpreadsheetTests/Reader/Xls/PageSetupTest.php b/tests/PhpSpreadsheetTests/Reader/Xls/PageSetupTest.php
index 5947d1b5..a5282405 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xls/PageSetupTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xls/PageSetupTest.php
@@ -11,7 +11,7 @@ class PageSetupTest extends TestCase
 {
     private const MARGIN_PRECISION = 0.00000001;
 
-    private const MARGIN_UNIT_CONVERSION = 2.54;         // Inches to cm
+    private const MARGIN_UNIT_CONVERSION = 2.54; // Inches to cm
 
     /**
      * @var Spreadsheet
diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/PageSetupTest.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/PageSetupTest.php
index cd1bd174..3efb581a 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xlsx/PageSetupTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/PageSetupTest.php
@@ -11,7 +11,7 @@ class PageSetupTest extends TestCase
 {
     private const MARGIN_PRECISION = 0.00000001;
 
-    private const MARGIN_UNIT_CONVERSION = 2.54;         // Inches to cm
+    private const MARGIN_UNIT_CONVERSION = 2.54; // Inches to cm
 
     /**
      * @var Spreadsheet
diff --git a/tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php b/tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php
index 92100b04..d6313281 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php
@@ -11,7 +11,7 @@ class PageSetupTest extends TestCase
 {
     private const MARGIN_PRECISION = 0.000001;
 
-    private const MARGIN_UNIT_CONVERSION = 2.54;         // Inches to cm
+    private const MARGIN_UNIT_CONVERSION = 2.54; // Inches to cm
 
     /**
      * @var Spreadsheet

From f3fc321177bd780e833dc4c71da3e5793f0e977a Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Sun, 5 Jul 2020 18:32:40 +0200
Subject: [PATCH 084/153] Gah! Using PHPStorm refactor changes the formatting,
 so valid code suddenly triggers in phpcs

---
 src/PhpSpreadsheet/Reader/Xml/PageSettings.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/PhpSpreadsheet/Reader/Xml/PageSettings.php b/src/PhpSpreadsheet/Reader/Xml/PageSettings.php
index d07e55ae..72604dcd 100644
--- a/src/PhpSpreadsheet/Reader/Xml/PageSettings.php
+++ b/src/PhpSpreadsheet/Reader/Xml/PageSettings.php
@@ -115,16 +115,16 @@ class PageSettings
 
     private function setLayout(stdClass $printDefaults, SimpleXMLElement $pageSetupAttributes): void
     {
-        $printDefaults->orientation = (string)strtolower($pageSetupAttributes->Orientation) ?: PageSetup::ORIENTATION_PORTRAIT;
-        $printDefaults->horizontalCentered = (bool)$pageSetupAttributes->CenterHorizontal ?: false;
-        $printDefaults->verticalCentered = (bool)$pageSetupAttributes->CenterVertical ?: false;
+        $printDefaults->orientation = (string) strtolower($pageSetupAttributes->Orientation) ?: PageSetup::ORIENTATION_PORTRAIT;
+        $printDefaults->horizontalCentered = (bool) $pageSetupAttributes->CenterHorizontal ?: false;
+        $printDefaults->verticalCentered = (bool) $pageSetupAttributes->CenterVertical ?: false;
     }
 
     private function setMargins(stdClass $printDefaults, SimpleXMLElement $pageSetupAttributes): void
     {
-        $printDefaults->leftMargin = (float)$pageSetupAttributes->Left ?: 1.0;
-        $printDefaults->rightMargin = (float)$pageSetupAttributes->Right ?: 1.0;
-        $printDefaults->topMargin = (float)$pageSetupAttributes->Top ?: 1.0;
-        $printDefaults->bottomMargin = (float)$pageSetupAttributes->Bottom ?: 1.0;
+        $printDefaults->leftMargin = (float) $pageSetupAttributes->Left ?: 1.0;
+        $printDefaults->rightMargin = (float) $pageSetupAttributes->Right ?: 1.0;
+        $printDefaults->topMargin = (float) $pageSetupAttributes->Top ?: 1.0;
+        $printDefaults->bottomMargin = (float) $pageSetupAttributes->Bottom ?: 1.0;
     }
 }

From c6de56e4cf3701afb53f342af92ddfd7a884b20e Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Sun, 5 Jul 2020 20:21:54 +0200
Subject: [PATCH 085/153] Minor refactoring

---
 src/PhpSpreadsheet/Reader/Gnumeric.php | 69 +++++++++++++++-----------
 1 file changed, 40 insertions(+), 29 deletions(-)

diff --git a/src/PhpSpreadsheet/Reader/Gnumeric.php b/src/PhpSpreadsheet/Reader/Gnumeric.php
index 7c735a41..cbc22beb 100644
--- a/src/PhpSpreadsheet/Reader/Gnumeric.php
+++ b/src/PhpSpreadsheet/Reader/Gnumeric.php
@@ -437,41 +437,52 @@ class Gnumeric extends BaseReader
                 'footer' => 0.3,
             ];
 
-            foreach ($sheet->PrintInformation->Margins->children($this->gnm, true) as $key => $margin) {
-                $marginAttributes = $margin->attributes();
-                $marginSize = ($marginAttributes['Points']) ?? 72; //    Default is 72pt
-                // Convert value in points to inches
-                $marginSize = PageMargins::fromPoints((float) $marginSize);
-                $marginSet[$key] = $marginSize;
-            }
+            $marginSet = $this->buildMarginSet($sheet, $marginSet);
+            $this->adjustMargins($marginSet);
+        }
+    }
 
-            foreach ($marginSet as $key => $marginSize) {
-                // Gnumeric is quirky in the way it displays the header/footer values:
-                //    header is actually the sum of top and header; footer is actually the sum of bottom and footer
-                //    then top is actually the header value, and bottom is actually the footer value
-                switch ($key) {
-                    case 'left':
-                    case 'right':
-                        $this->sheetMargin($key, $marginSize);
+    private function buildMarginSet(SimpleXMLElement $sheet, array $marginSet): array
+    {
+        foreach ($sheet->PrintInformation->Margins->children($this->gnm, true) as $key => $margin) {
+            $marginAttributes = $margin->attributes();
+            $marginSize = ($marginAttributes['Points']) ?? 72; //    Default is 72pt
+            // Convert value in points to inches
+            $marginSize = PageMargins::fromPoints((float)$marginSize);
+            $marginSet[$key] = $marginSize;
+        }
 
-                        break;
-                    case 'top':
-                        $this->sheetMargin($key, $marginSet['header'] ?? 0);
+        return $marginSet;
+    }
 
-                        break;
-                    case 'bottom':
-                        $this->sheetMargin($key, $marginSet['footer'] ?? 0);
+    private function adjustMargins(array $marginSet): void
+    {
+        foreach ($marginSet as $key => $marginSize) {
+            // Gnumeric is quirky in the way it displays the header/footer values:
+            //    header is actually the sum of top and header; footer is actually the sum of bottom and footer
+            //    then top is actually the header value, and bottom is actually the footer value
+            switch ($key) {
+                case 'left':
+                case 'right':
+                    $this->sheetMargin($key, $marginSize);
 
-                        break;
-                    case 'header':
-                        $this->sheetMargin($key, ($marginSet['top'] ?? 0) - $marginSize);
+                    break;
+                case 'top':
+                    $this->sheetMargin($key, $marginSet['header'] ?? 0);
 
-                        break;
-                    case 'footer':
-                        $this->sheetMargin($key, ($marginSet['bottom'] ?? 0) - $marginSize);
+                    break;
+                case 'bottom':
+                    $this->sheetMargin($key, $marginSet['footer'] ?? 0);
 
-                        break;
-                }
+                    break;
+                case 'header':
+                    $this->sheetMargin($key, ($marginSet['top'] ?? 0) - $marginSize);
+
+                    break;
+                case 'footer':
+                    $this->sheetMargin($key, ($marginSet['bottom'] ?? 0) - $marginSize);
+
+                    break;
             }
         }
     }

From d4094c0b58643d96972c5c770153fa00a2e066c5 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Sun, 5 Jul 2020 20:43:59 +0200
Subject: [PATCH 086/153] Minor refactoring

---
 src/PhpSpreadsheet/Reader/Gnumeric.php        | 122 +--------------
 .../Reader/Gnumeric/PageSetup.php             | 143 ++++++++++++++++++
 2 files changed, 149 insertions(+), 116 deletions(-)
 create mode 100644 src/PhpSpreadsheet/Reader/Gnumeric/PageSetup.php

diff --git a/src/PhpSpreadsheet/Reader/Gnumeric.php b/src/PhpSpreadsheet/Reader/Gnumeric.php
index cbc22beb..a29a2b9d 100644
--- a/src/PhpSpreadsheet/Reader/Gnumeric.php
+++ b/src/PhpSpreadsheet/Reader/Gnumeric.php
@@ -5,6 +5,7 @@ namespace PhpOffice\PhpSpreadsheet\Reader;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
 use PhpOffice\PhpSpreadsheet\NamedRange;
+use PhpOffice\PhpSpreadsheet\Reader\Gnumeric\PageSetup;
 use PhpOffice\PhpSpreadsheet\Reader\Security\XmlScanner;
 use PhpOffice\PhpSpreadsheet\ReferenceHelper;
 use PhpOffice\PhpSpreadsheet\RichText\RichText;
@@ -17,8 +18,6 @@ use PhpOffice\PhpSpreadsheet\Style\Border;
 use PhpOffice\PhpSpreadsheet\Style\Borders;
 use PhpOffice\PhpSpreadsheet\Style\Fill;
 use PhpOffice\PhpSpreadsheet\Style\Font;
-use PhpOffice\PhpSpreadsheet\Worksheet\PageMargins;
-use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use SimpleXMLElement;
 use XMLReader;
@@ -405,118 +404,6 @@ class Gnumeric extends BaseReader
         }
     }
 
-    private function printInformation(SimpleXMLElement $sheet): void
-    {
-        if (!$this->readDataOnly && isset($sheet->PrintInformation)) {
-            $printInformation = $sheet->PrintInformation[0];
-            $scale = (string) $printInformation->Scale->attributes()['percentage'];
-            $pageOrder = (string) $printInformation->order;
-            $orientation = (string) $printInformation->orientation;
-            $horizontalCentered = (string) $printInformation->hcenter->attributes()['value'];
-            $verticalCentered = (string) $printInformation->vcenter->attributes()['value'];
-
-            $this->spreadsheet->getActiveSheet()->getPageSetup()
-                ->setPageOrder($pageOrder === 'r_then_d' ? PageSetup::PAGEORDER_OVER_THEN_DOWN : PageSetup::PAGEORDER_DOWN_THEN_OVER)
-                ->setScale((int) $scale)
-                ->setOrientation($orientation ?? PageSetup::ORIENTATION_DEFAULT)
-                ->setHorizontalCentered((bool) $horizontalCentered)
-                ->setVerticalCentered((bool) $verticalCentered);
-        }
-    }
-
-    private function sheetMargins(SimpleXMLElement $sheet): void
-    {
-        if (!$this->readDataOnly && isset($sheet->PrintInformation, $sheet->PrintInformation->Margins)) {
-            $marginSet = [
-                // Default Settings
-                'top' => 0.75,
-                'header' => 0.3,
-                'left' => 0.7,
-                'right' => 0.7,
-                'bottom' => 0.75,
-                'footer' => 0.3,
-            ];
-
-            $marginSet = $this->buildMarginSet($sheet, $marginSet);
-            $this->adjustMargins($marginSet);
-        }
-    }
-
-    private function buildMarginSet(SimpleXMLElement $sheet, array $marginSet): array
-    {
-        foreach ($sheet->PrintInformation->Margins->children($this->gnm, true) as $key => $margin) {
-            $marginAttributes = $margin->attributes();
-            $marginSize = ($marginAttributes['Points']) ?? 72; //    Default is 72pt
-            // Convert value in points to inches
-            $marginSize = PageMargins::fromPoints((float)$marginSize);
-            $marginSet[$key] = $marginSize;
-        }
-
-        return $marginSet;
-    }
-
-    private function adjustMargins(array $marginSet): void
-    {
-        foreach ($marginSet as $key => $marginSize) {
-            // Gnumeric is quirky in the way it displays the header/footer values:
-            //    header is actually the sum of top and header; footer is actually the sum of bottom and footer
-            //    then top is actually the header value, and bottom is actually the footer value
-            switch ($key) {
-                case 'left':
-                case 'right':
-                    $this->sheetMargin($key, $marginSize);
-
-                    break;
-                case 'top':
-                    $this->sheetMargin($key, $marginSet['header'] ?? 0);
-
-                    break;
-                case 'bottom':
-                    $this->sheetMargin($key, $marginSet['footer'] ?? 0);
-
-                    break;
-                case 'header':
-                    $this->sheetMargin($key, ($marginSet['top'] ?? 0) - $marginSize);
-
-                    break;
-                case 'footer':
-                    $this->sheetMargin($key, ($marginSet['bottom'] ?? 0) - $marginSize);
-
-                    break;
-            }
-        }
-    }
-
-    private function sheetMargin(string $key, float $marginSize): void
-    {
-        switch ($key) {
-            case 'top':
-                $this->spreadsheet->getActiveSheet()->getPageMargins()->setTop($marginSize);
-
-                break;
-            case 'bottom':
-                $this->spreadsheet->getActiveSheet()->getPageMargins()->setBottom($marginSize);
-
-                break;
-            case 'left':
-                $this->spreadsheet->getActiveSheet()->getPageMargins()->setLeft($marginSize);
-
-                break;
-            case 'right':
-                $this->spreadsheet->getActiveSheet()->getPageMargins()->setRight($marginSize);
-
-                break;
-            case 'header':
-                $this->spreadsheet->getActiveSheet()->getPageMargins()->setHeader($marginSize);
-
-                break;
-            case 'footer':
-                $this->spreadsheet->getActiveSheet()->getPageMargins()->setFooter($marginSize);
-
-                break;
-        }
-    }
-
     private function processComments(SimpleXMLElement $sheet): void
     {
         if ((!$this->readDataOnly) && (isset($sheet->Objects))) {
@@ -582,8 +469,11 @@ class Gnumeric extends BaseReader
             //        name in line with the formula, not the reverse
             $this->spreadsheet->getActiveSheet()->setTitle($worksheetName, false, false);
 
-            $this->printInformation($sheet);
-            $this->sheetMargins($sheet);
+            if (!$this->readDataOnly) {
+                (new PageSetup($this->spreadsheet, $this->gnm))
+                    ->printInformation($sheet)
+                    ->sheetMargins($sheet);
+            }
 
             foreach ($sheet->Cells->Cell as $cell) {
                 $cellAttributes = $cell->attributes();
diff --git a/src/PhpSpreadsheet/Reader/Gnumeric/PageSetup.php b/src/PhpSpreadsheet/Reader/Gnumeric/PageSetup.php
new file mode 100644
index 00000000..dbe30061
--- /dev/null
+++ b/src/PhpSpreadsheet/Reader/Gnumeric/PageSetup.php
@@ -0,0 +1,143 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Reader\Gnumeric;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\PageMargins;
+use PhpOffice\PhpSpreadsheet\Worksheet\PageSetup as WorksheetPageSetup;
+use SimpleXMLElement;
+
+class PageSetup
+{
+    /**
+     * @var Spreadsheet
+     */
+    private $spreadsheet;
+
+    /**
+     * @var string
+     */
+    private $gnm;
+
+    public function __construct(Spreadsheet $spreadsheet, $gnm)
+    {
+        $this->spreadsheet = $spreadsheet;
+        $this->gnm = $gnm;
+    }
+
+    public function printInformation(SimpleXMLElement $sheet): self
+    {
+        if (isset($sheet->PrintInformation)) {
+            $printInformation = $sheet->PrintInformation[0];
+            $scale = (string) $printInformation->Scale->attributes()['percentage'];
+            $pageOrder = (string) $printInformation->order;
+            $orientation = (string) $printInformation->orientation;
+            $horizontalCentered = (string) $printInformation->hcenter->attributes()['value'];
+            $verticalCentered = (string) $printInformation->vcenter->attributes()['value'];
+
+            $this->spreadsheet->getActiveSheet()->getPageSetup()
+                ->setPageOrder($pageOrder === 'r_then_d' ? WorksheetPageSetup::PAGEORDER_OVER_THEN_DOWN : WorksheetPageSetup::PAGEORDER_DOWN_THEN_OVER)
+                ->setScale((int) $scale)
+                ->setOrientation($orientation ?? WorksheetPageSetup::ORIENTATION_DEFAULT)
+                ->setHorizontalCentered((bool) $horizontalCentered)
+                ->setVerticalCentered((bool) $verticalCentered);
+        }
+
+        return $this;
+    }
+
+    public function sheetMargins(SimpleXMLElement $sheet): self
+    {
+        if (isset($sheet->PrintInformation, $sheet->PrintInformation->Margins)) {
+            $marginSet = [
+                // Default Settings
+                'top' => 0.75,
+                'header' => 0.3,
+                'left' => 0.7,
+                'right' => 0.7,
+                'bottom' => 0.75,
+                'footer' => 0.3,
+            ];
+
+            $marginSet = $this->buildMarginSet($sheet, $marginSet);
+            $this->adjustMargins($marginSet);
+        }
+
+        return $this;
+    }
+
+    private function buildMarginSet(SimpleXMLElement $sheet, array $marginSet): array
+    {
+        foreach ($sheet->PrintInformation->Margins->children($this->gnm, true) as $key => $margin) {
+            $marginAttributes = $margin->attributes();
+            $marginSize = ($marginAttributes['Points']) ?? 72; //    Default is 72pt
+            // Convert value in points to inches
+            $marginSize = PageMargins::fromPoints((float) $marginSize);
+            $marginSet[$key] = $marginSize;
+        }
+
+        return $marginSet;
+    }
+
+    private function adjustMargins(array $marginSet): void
+    {
+        foreach ($marginSet as $key => $marginSize) {
+            // Gnumeric is quirky in the way it displays the header/footer values:
+            //    header is actually the sum of top and header; footer is actually the sum of bottom and footer
+            //    then top is actually the header value, and bottom is actually the footer value
+            switch ($key) {
+                case 'left':
+                case 'right':
+                    $this->sheetMargin($key, $marginSize);
+
+                    break;
+                case 'top':
+                    $this->sheetMargin($key, $marginSet['header'] ?? 0);
+
+                    break;
+                case 'bottom':
+                    $this->sheetMargin($key, $marginSet['footer'] ?? 0);
+
+                    break;
+                case 'header':
+                    $this->sheetMargin($key, ($marginSet['top'] ?? 0) - $marginSize);
+
+                    break;
+                case 'footer':
+                    $this->sheetMargin($key, ($marginSet['bottom'] ?? 0) - $marginSize);
+
+                    break;
+            }
+        }
+    }
+
+    private function sheetMargin(string $key, float $marginSize): void
+    {
+        switch ($key) {
+            case 'top':
+                $this->spreadsheet->getActiveSheet()->getPageMargins()->setTop($marginSize);
+
+                break;
+            case 'bottom':
+                $this->spreadsheet->getActiveSheet()->getPageMargins()->setBottom($marginSize);
+
+                break;
+            case 'left':
+                $this->spreadsheet->getActiveSheet()->getPageMargins()->setLeft($marginSize);
+
+                break;
+            case 'right':
+                $this->spreadsheet->getActiveSheet()->getPageMargins()->setRight($marginSize);
+
+                break;
+            case 'header':
+                $this->spreadsheet->getActiveSheet()->getPageMargins()->setHeader($marginSize);
+
+                break;
+            case 'footer':
+                $this->spreadsheet->getActiveSheet()->getPageMargins()->setFooter($marginSize);
+
+                break;
+        }
+    }
+}

From 47eb3e9f1293b316a270fd796814cd22c035010f Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Sun, 5 Jul 2020 21:05:21 +0200
Subject: [PATCH 087/153] Update Change Log

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48ee6293..16de8dca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Added
 
-- nothing
+- Implemented Page Order for Xlsx and Xls Readers, and provided Page Settings (Orientation, Scale, Horizontal/Vertical Centering, Page Order, Margins) support for Ods, Gnumeric and Xls Readers [#1559](https://github.com/PHPOffice/PhpSpreadsheet/pull/1559)
 
 ### Fixed
 

From b89968d20627805b7340a927588c2b9a7353f31b Mon Sep 17 00:00:00 2001
From: Mark Baker <mark@lange.demon.co.uk>
Date: Tue, 14 Jul 2020 10:58:50 +0200
Subject: [PATCH 088/153] Additional Unit Tests (#1582)

---
 .../ReferenceHelperTest.php                   | 17 +++++
 tests/data/ReferenceHelperFormulaUpdates.php  | 74 +++++++++++++++++++
 2 files changed, 91 insertions(+)
 create mode 100644 tests/data/ReferenceHelperFormulaUpdates.php

diff --git a/tests/PhpSpreadsheetTests/ReferenceHelperTest.php b/tests/PhpSpreadsheetTests/ReferenceHelperTest.php
index 374b63c9..08462b5b 100644
--- a/tests/PhpSpreadsheetTests/ReferenceHelperTest.php
+++ b/tests/PhpSpreadsheetTests/ReferenceHelperTest.php
@@ -95,4 +95,21 @@ class ReferenceHelperTest extends TestCase
             self::assertEquals($columnExpectedResult[$key], $value);
         }
     }
+
+    /**
+     * @dataProvider providerFormulaUpdates
+     */
+    public function testUpdateFormula(string $formula, int $insertRows, int $insertColumns, string $worksheet, string $expectedResult): void
+    {
+        $referenceHelper = ReferenceHelper::getInstance();
+
+        $result = $referenceHelper->updateFormulaReferences($formula, 'A1', $insertRows, $insertColumns, $worksheet);
+
+        self::assertSame($expectedResult, $result);
+    }
+
+    public function providerFormulaUpdates(): array
+    {
+        return require 'tests/data/ReferenceHelperFormulaUpdates.php';
+    }
 }
diff --git a/tests/data/ReferenceHelperFormulaUpdates.php b/tests/data/ReferenceHelperFormulaUpdates.php
new file mode 100644
index 00000000..b97b8a35
--- /dev/null
+++ b/tests/data/ReferenceHelperFormulaUpdates.php
@@ -0,0 +1,74 @@
+<?php
+
+return [
+    [
+        '=SUM(C3:E5)',
+        -2,
+        -2,
+        '2020',
+        '=SUM(A1:C3)',
+    ],
+    [
+        '=SUM(2020!C3:E5,2019!C3:E5)',
+        -2,
+        -2,
+        '2020',
+        '=SUM(2020!A1:C3,2019!C3:E5)',
+    ],
+    [
+        '=SUM(2020!3:5,2019!3:5)',
+        -2,
+        -2,
+        '2020',
+        '=SUM(2020!1:3,2019!3:5)',
+    ],
+    [
+        '=SUM(2020!C:E,2019!C:E)',
+        -2,
+        -2,
+        '2020',
+        '=SUM(2020!A:C,2019!C:E)',
+    ],
+    [
+        "=IF('2020'!\$B1=\"\",\"-\",(('2020'!\$B1/'2019'!\$B1)-1))",
+        2,
+        2,
+        '2019',
+        "=IF('2020'!\$B1=\"\",\"-\",(('2020'!\$B1/'2019'!\$B3)-1))",
+    ],
+    [
+        "=IF('2020'!B$1=\"\",\"-\",(('2020'!B$1/'2019'!B$1)-1))",
+        2,
+        2,
+        '2019',
+        "=IF('2020'!B\$1=\"\",\"-\",(('2020'!B\$1/'2019'!D\$1)-1))",
+    ],
+    [
+        "=IF('2020'!Z$1=\"\",\"-\",(('2020'!Z$1/'2019'!Z$1)-1))",
+        2,
+        2,
+        '2019',
+        "=IF('2020'!Z\$1=\"\",\"-\",(('2020'!Z\$1/'2019'!AB\$1)-1))",
+    ],
+    [
+        "=IF('2020'!\$B1=\"\",\"-\",(('2020'!\$B1/'2019'!\$B1)-1))",
+        2,
+        2,
+        '2020',
+        "=IF('2020'!\$B3=\"\",\"-\",(('2020'!\$B3/'2019'!\$B1)-1))",
+    ],
+    [
+        "=IF('2020'!B$1=\"\",\"-\",(('2020'!B$1/'2019'!B$1)-1))",
+        2,
+        2,
+        '2020',
+        "=IF('2020'!D\$1=\"\",\"-\",(('2020'!D\$1/'2019'!B\$1)-1))",
+    ],
+    [
+        "=IF('2020'!Z$1=\"\",\"-\",(('2020'!Z$1/'2019'!Z$1)-1))",
+        2,
+        2,
+        '2020',
+        "=IF('2020'!AB\$1=\"\",\"-\",(('2020'!AB\$1/'2019'!Z\$1)-1))",
+    ],
+];

From 165034ad7074006ad0942f99751c48067e304fca Mon Sep 17 00:00:00 2001
From: oleibman <eclipsechasers2@yahoo.com>
Date: Wed, 15 Jul 2020 04:23:00 -0700
Subject: [PATCH 089/153] Restoring State After Static Changes in Tests (#1571)

This request does not change any source code, only tests.

For a change on which I was working, a test passed when run on its own,
but failed when run as part of the full test suite. It turned out that
an existing test had changed a static value,
thousands separator in this case, and failed to restore it.
The test turned out to be AdvancedBinderTest.

The search for the offending test was more difficult than it should have
been because 26 test scripts which had nothing to do with thousands
separator nevertheless changed that value. They all changed
decimal separator, currency code, and compatibility mode as well,
again for no reason. I changed all of those to eliminate those operations.

I changed the following tests, which actually do change the static
properties identified above for a reason, to restore them as part of teardown.
- CalculationTest sets compatibilityMode and locale
- DayTest sets compatibilityMode, returnDateType, and excelCalendar
- CountTest sets compatibilityMode
- FunctionsTest sets compatibilityMode and returnDateType
- AdvancedValueBinderTest sets currencyCode, decimalSeparator, thousandsSeparator
- StringHelperTest sets currencyCode, decimalSeparator, thousandsSeparator
- NumberFormatTest sets currencyCode, decimalSeparator, thousandsSeparator
- HtmlNumberFormatTest sets currencyCode, decimalSeparator, thousandsSeparator
---
 .../Calculation/CalculationTest.php           | 10 +++++++-
 .../Functions/DateTime/DayTest.php            | 16 +++++++++++++
 .../Functions/Statistical/CountTest.php       |  8 +++++++
 .../Functions/TextData/CharTest.php           | 18 ---------------
 .../Functions/TextData/CleanTest.php          | 18 ---------------
 .../Functions/TextData/CodeTest.php           | 18 ---------------
 .../Functions/TextData/ConcatenateTest.php    | 18 ---------------
 .../Functions/TextData/DollarTest.php         | 18 ---------------
 .../Functions/TextData/ExactTest.php          | 22 ------------------
 .../Functions/TextData/FindTest.php           | 18 ---------------
 .../Functions/TextData/FixedTest.php          | 18 ---------------
 .../Functions/TextData/LeftTest.php           | 18 ---------------
 .../Functions/TextData/LenTest.php            | 18 ---------------
 .../Functions/TextData/LowerTest.php          | 18 ---------------
 .../Functions/TextData/MidTest.php            | 18 ---------------
 .../Functions/TextData/NumberValueTest.php    | 18 ---------------
 .../Functions/TextData/ProperTest.php         | 18 ---------------
 .../Functions/TextData/ReplaceTest.php        | 18 ---------------
 .../Functions/TextData/RightTest.php          | 18 ---------------
 .../Functions/TextData/SearchTest.php         | 18 ---------------
 .../Functions/TextData/SubstituteTest.php     | 18 ---------------
 .../Calculation/Functions/TextData/TTest.php  | 18 ---------------
 .../Functions/TextData/TextJoinTest.php       | 18 ---------------
 .../Functions/TextData/TextTest.php           | 23 -------------------
 .../Functions/TextData/TrimTest.php           | 18 ---------------
 .../Functions/TextData/UpperTest.php          | 18 ---------------
 .../Functions/TextData/ValueTest.php          | 21 +++++++++--------
 .../Calculation/FunctionsTest.php             | 10 ++++++--
 .../Cell/AdvancedValueBinderTest.php          | 20 ++++++++++++++++
 .../Shared/StringHelperTest.php               | 16 +++++++++++++
 .../Style/NumberFormatTest.php                | 16 +++++++++++++
 .../Writer/Html/HtmlNumberFormatTest.php      |  5 ++++
 32 files changed, 110 insertions(+), 435 deletions(-)

diff --git a/tests/PhpSpreadsheetTests/Calculation/CalculationTest.php b/tests/PhpSpreadsheetTests/Calculation/CalculationTest.php
index 80431c4d..8e339207 100644
--- a/tests/PhpSpreadsheetTests/Calculation/CalculationTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/CalculationTest.php
@@ -9,15 +9,23 @@ use PHPUnit\Framework\TestCase;
 
 class CalculationTest extends TestCase
 {
+    private $compatibilityMode;
+
+    private $locale;
+
     protected function setUp(): void
     {
+        $this->compatibilityMode = Functions::getCompatibilityMode();
+        $calculation = Calculation::getInstance();
+        $this->locale = $calculation->getLocale();
         Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
     }
 
     protected function tearDown(): void
     {
+        Functions::setCompatibilityMode($this->compatibilityMode);
         $calculation = Calculation::getInstance();
-        $calculation->setLocale('en_us');
+        $calculation->setLocale($this->locale);
     }
 
     /**
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DayTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DayTest.php
index 8f4639eb..482e068d 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DayTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DayTest.php
@@ -9,13 +9,29 @@ use PHPUnit\Framework\TestCase;
 
 class DayTest extends TestCase
 {
+    private $compatibilityMode;
+
+    private $returnDateType;
+
+    private $excelCalendar;
+
     protected function setUp(): void
     {
+        $this->compatibilityMode = Functions::getCompatibilityMode();
+        $this->returnDateType = Functions::getReturnDateType();
+        $this->excelCalendar = Date::getExcelCalendar();
         Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
         Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
         Date::setExcelCalendar(Date::CALENDAR_WINDOWS_1900);
     }
 
+    protected function tearDown(): void
+    {
+        Functions::setCompatibilityMode($this->compatibilityMode);
+        Functions::setReturnDateType($this->returnDateType);
+        Date::setExcelCalendar($this->excelCalendar);
+    }
+
     /**
      * @dataProvider providerDAY
      *
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountTest.php
index 26e621ec..65b698e3 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CountTest.php
@@ -8,11 +8,19 @@ use PHPUnit\Framework\TestCase;
 
 class CountTest extends TestCase
 {
+    private $compatibilityMode;
+
     protected function setUp(): void
     {
+        $this->compatibilityMode = Functions::getCompatibilityMode();
         Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
     }
 
+    protected function tearDown(): void
+    {
+        Functions::setCompatibilityMode($this->compatibilityMode);
+    }
+
     /**
      * @dataProvider providerBasicCOUNT
      *
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/CharTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/CharTest.php
index 70ea7526..cf22df02 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/CharTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/CharTest.php
@@ -2,29 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\TextData;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\TextData;
-use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PHPUnit\Framework\TestCase;
 
 class CharTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
-    protected function tearDown(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
     /**
      * @dataProvider providerCHAR
      *
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/CleanTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/CleanTest.php
index 6aedb599..31dcc5e6 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/CleanTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/CleanTest.php
@@ -2,29 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\TextData;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\TextData;
-use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PHPUnit\Framework\TestCase;
 
 class CleanTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
-    protected function tearDown(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
     /**
      * @dataProvider providerCLEAN
      *
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/CodeTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/CodeTest.php
index ec9f26d6..9c19f347 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/CodeTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/CodeTest.php
@@ -2,29 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\TextData;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\TextData;
-use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PHPUnit\Framework\TestCase;
 
 class CodeTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
-    protected function tearDown(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
     /**
      * @dataProvider providerCODE
      *
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ConcatenateTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ConcatenateTest.php
index 18a2d684..068e7d8f 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ConcatenateTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ConcatenateTest.php
@@ -2,29 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\TextData;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\TextData;
-use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PHPUnit\Framework\TestCase;
 
 class ConcatenateTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
-    protected function tearDown(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
     /**
      * @dataProvider providerCONCATENATE
      *
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/DollarTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/DollarTest.php
index 4a0f6013..1d482589 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/DollarTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/DollarTest.php
@@ -2,29 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\TextData;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\TextData;
-use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PHPUnit\Framework\TestCase;
 
 class DollarTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
-    protected function tearDown(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
     /**
      * @dataProvider providerDOLLAR
      *
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ExactTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ExactTest.php
index 09d45a32..92d3935c 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ExactTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ExactTest.php
@@ -2,29 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\TextData;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\TextData;
-use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PHPUnit\Framework\TestCase;
 
 class ExactTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
-    protected function tearDown(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
     /**
      * @dataProvider providerEXACT
      *
@@ -33,10 +15,6 @@ class ExactTest extends TestCase
      */
     public function testEXACT($expectedResult, ...$args): void
     {
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(' ');
-        StringHelper::setCurrencyCode('$');
-
         $result = TextData::EXACT(...$args);
         self::assertSame($expectedResult, $result);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/FindTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/FindTest.php
index 38203a33..d4b1b77d 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/FindTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/FindTest.php
@@ -2,29 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\TextData;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\TextData;
-use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PHPUnit\Framework\TestCase;
 
 class FindTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
-    protected function tearDown(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
     /**
      * @dataProvider providerFIND
      *
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/FixedTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/FixedTest.php
index 53e6a513..0cbaf80c 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/FixedTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/FixedTest.php
@@ -2,29 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\TextData;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\TextData;
-use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PHPUnit\Framework\TestCase;
 
 class FixedTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
-    protected function tearDown(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
     /**
      * @dataProvider providerFIXED
      *
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/LeftTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/LeftTest.php
index 9a033ae7..e69a3fa0 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/LeftTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/LeftTest.php
@@ -2,29 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\TextData;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\TextData;
-use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PHPUnit\Framework\TestCase;
 
 class LeftTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
-    protected function tearDown(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
     /**
      * @dataProvider providerLEFT
      *
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/LenTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/LenTest.php
index af784163..bca2b389 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/LenTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/LenTest.php
@@ -2,29 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\TextData;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\TextData;
-use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PHPUnit\Framework\TestCase;
 
 class LenTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
-    protected function tearDown(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
     /**
      * @dataProvider providerLEN
      *
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/LowerTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/LowerTest.php
index 6ad522d8..9ba677c7 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/LowerTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/LowerTest.php
@@ -2,29 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\TextData;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\TextData;
-use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PHPUnit\Framework\TestCase;
 
 class LowerTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
-    protected function tearDown(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
     /**
      * @dataProvider providerLOWER
      *
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/MidTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/MidTest.php
index df02575f..4c19248a 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/MidTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/MidTest.php
@@ -2,29 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\TextData;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\TextData;
-use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PHPUnit\Framework\TestCase;
 
 class MidTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
-    protected function tearDown(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
     /**
      * @dataProvider providerMID
      *
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/NumberValueTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/NumberValueTest.php
index 006e4ce1..c186bb0b 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/NumberValueTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/NumberValueTest.php
@@ -2,29 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\TextData;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\TextData;
-use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PHPUnit\Framework\TestCase;
 
 class NumberValueTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
-    protected function tearDown(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
     /**
      * @dataProvider providerNUMBERVALUE
      *
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ProperTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ProperTest.php
index d799b395..aae0e696 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ProperTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ProperTest.php
@@ -2,29 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\TextData;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\TextData;
-use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PHPUnit\Framework\TestCase;
 
 class ProperTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
-    protected function tearDown(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
     /**
      * @dataProvider providerPROPER
      *
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ReplaceTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ReplaceTest.php
index ff3d58bb..ff9236e6 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ReplaceTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ReplaceTest.php
@@ -2,29 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\TextData;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\TextData;
-use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PHPUnit\Framework\TestCase;
 
 class ReplaceTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
-    protected function tearDown(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
     /**
      * @dataProvider providerREPLACE
      *
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/RightTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/RightTest.php
index a89ea6ed..50fc86dc 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/RightTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/RightTest.php
@@ -2,29 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\TextData;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\TextData;
-use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PHPUnit\Framework\TestCase;
 
 class RightTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
-    protected function tearDown(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
     /**
      * @dataProvider providerRIGHT
      *
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/SearchTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/SearchTest.php
index 919ec0fb..7bb92e83 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/SearchTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/SearchTest.php
@@ -2,29 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\TextData;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\TextData;
-use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PHPUnit\Framework\TestCase;
 
 class SearchTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
-    protected function tearDown(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
     /**
      * @dataProvider providerSEARCH
      *
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/SubstituteTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/SubstituteTest.php
index d1884fd8..2a9d1012 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/SubstituteTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/SubstituteTest.php
@@ -2,29 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\TextData;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\TextData;
-use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PHPUnit\Framework\TestCase;
 
 class SubstituteTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
-    protected function tearDown(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
     /**
      * @dataProvider providerSUBSTITUTE
      *
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TTest.php
index 1ce989b4..c7606c05 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TTest.php
@@ -2,29 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\TextData;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\TextData;
-use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PHPUnit\Framework\TestCase;
 
 class TTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
-    protected function tearDown(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
     /**
      * @dataProvider providerT
      *
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextJoinTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextJoinTest.php
index 7eec585c..e8fb404d 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextJoinTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextJoinTest.php
@@ -2,29 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\TextData;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\TextData;
-use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PHPUnit\Framework\TestCase;
 
 class TextJoinTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
-    protected function tearDown(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
     /**
      * @dataProvider providerTEXTJOIN
      *
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextTest.php
index eab517cc..8d7b238b 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TextTest.php
@@ -2,29 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\TextData;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\TextData;
-use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PHPUnit\Framework\TestCase;
 
 class TextTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
-    protected function tearDown(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
     /**
      * @dataProvider providerTEXT
      *
@@ -32,11 +14,6 @@ class TextTest extends TestCase
      */
     public function testTEXT($expectedResult, ...$args): void
     {
-        //    Enforce decimal and thousands separator values to UK/US, and currency code to USD
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-
         $result = TextData::TEXTFORMAT(...$args);
         self::assertEquals($expectedResult, $result);
     }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TrimTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TrimTest.php
index 24ede75f..91890ded 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TrimTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/TrimTest.php
@@ -2,29 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\TextData;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\TextData;
-use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PHPUnit\Framework\TestCase;
 
 class TrimTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
-    protected function tearDown(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
     /**
      * @dataProvider providerTRIM
      *
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/UpperTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/UpperTest.php
index 1600f37c..13fb0b86 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/UpperTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/UpperTest.php
@@ -2,29 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\TextData;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\TextData;
-use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PHPUnit\Framework\TestCase;
 
 class UpperTest extends TestCase
 {
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
-    protected function tearDown(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
-    }
-
     /**
      * @dataProvider providerUPPER
      *
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ValueTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ValueTest.php
index a5083b22..355193de 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ValueTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/TextData/ValueTest.php
@@ -2,27 +2,30 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\TextData;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\TextData;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PHPUnit\Framework\TestCase;
 
 class ValueTest extends TestCase
 {
+    private $currencyCode;
+
+    private $decimalSeparator;
+
+    private $thousandsSeparator;
+
     protected function setUp(): void
     {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
+        $this->currencyCode = StringHelper::getCurrencyCode();
+        $this->decimalSeparator = StringHelper::getDecimalSeparator();
+        $this->thousandsSeparator = StringHelper::getThousandsSeparator();
     }
 
     protected function tearDown(): void
     {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        StringHelper::setDecimalSeparator('.');
-        StringHelper::setThousandsSeparator(',');
-        StringHelper::setCurrencyCode('$');
+        StringHelper::setCurrencyCode($this->currencyCode);
+        StringHelper::setDecimalSeparator($this->decimalSeparator);
+        StringHelper::setThousandsSeparator($this->thousandsSeparator);
     }
 
     /**
diff --git a/tests/PhpSpreadsheetTests/Calculation/FunctionsTest.php b/tests/PhpSpreadsheetTests/Calculation/FunctionsTest.php
index 4412215a..dfa01822 100644
--- a/tests/PhpSpreadsheetTests/Calculation/FunctionsTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/FunctionsTest.php
@@ -10,16 +10,22 @@ use PHPUnit\Framework\TestCase;
 
 class FunctionsTest extends TestCase
 {
+    private $compatibilityMode;
+
+    private $returnDate;
+
     protected function setUp(): void
     {
+        $this->compatibilityMode = Functions::getCompatibilityMode();
+        $this->returnDate = Functions::getReturnDateType();
         Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
         Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
     }
 
     protected function tearDown(): void
     {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
-        Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
+        Functions::setCompatibilityMode($this->compatibilityMode);
+        Functions::setReturnDateType($this->returnDate);
     }
 
     public function testCompatibilityMode(): void
diff --git a/tests/PhpSpreadsheetTests/Cell/AdvancedValueBinderTest.php b/tests/PhpSpreadsheetTests/Cell/AdvancedValueBinderTest.php
index 936092d4..630a2944 100644
--- a/tests/PhpSpreadsheetTests/Cell/AdvancedValueBinderTest.php
+++ b/tests/PhpSpreadsheetTests/Cell/AdvancedValueBinderTest.php
@@ -13,6 +13,26 @@ use PHPUnit\Framework\TestCase;
 
 class AdvancedValueBinderTest extends TestCase
 {
+    private $currencyCode;
+
+    private $decimalSeparator;
+
+    private $thousandsSeparator;
+
+    protected function setUp(): void
+    {
+        $this->currencyCode = StringHelper::getCurrencyCode();
+        $this->decimalSeparator = StringHelper::getDecimalSeparator();
+        $this->thousandsSeparator = StringHelper::getThousandsSeparator();
+    }
+
+    protected function tearDown(): void
+    {
+        StringHelper::setCurrencyCode($this->currencyCode);
+        StringHelper::setDecimalSeparator($this->decimalSeparator);
+        StringHelper::setThousandsSeparator($this->thousandsSeparator);
+    }
+
     public function provider()
     {
         $currencyUSD = NumberFormat::FORMAT_CURRENCY_USD_SIMPLE;
diff --git a/tests/PhpSpreadsheetTests/Shared/StringHelperTest.php b/tests/PhpSpreadsheetTests/Shared/StringHelperTest.php
index b11bf764..41ed0b21 100644
--- a/tests/PhpSpreadsheetTests/Shared/StringHelperTest.php
+++ b/tests/PhpSpreadsheetTests/Shared/StringHelperTest.php
@@ -7,14 +7,30 @@ use PHPUnit\Framework\TestCase;
 
 class StringHelperTest extends TestCase
 {
+    private $currencyCode;
+
+    private $decimalSeparator;
+
+    private $thousandsSeparator;
+
     protected function setUp(): void
     {
         parent::setUp();
+        $this->currencyCode = StringHelper::getCurrencyCode();
+        $this->decimalSeparator = StringHelper::getDecimalSeparator();
+        $this->thousandsSeparator = StringHelper::getThousandsSeparator();
 
         // Reset Currency Code
         StringHelper::setCurrencyCode(null);
     }
 
+    protected function tearDown(): void
+    {
+        StringHelper::setCurrencyCode($this->currencyCode);
+        StringHelper::setDecimalSeparator($this->decimalSeparator);
+        StringHelper::setThousandsSeparator($this->thousandsSeparator);
+    }
+
     public function testGetIsIconvEnabled(): void
     {
         $result = StringHelper::getIsIconvEnabled();
diff --git a/tests/PhpSpreadsheetTests/Style/NumberFormatTest.php b/tests/PhpSpreadsheetTests/Style/NumberFormatTest.php
index e995eded..6bf7db04 100644
--- a/tests/PhpSpreadsheetTests/Style/NumberFormatTest.php
+++ b/tests/PhpSpreadsheetTests/Style/NumberFormatTest.php
@@ -8,12 +8,28 @@ use PHPUnit\Framework\TestCase;
 
 class NumberFormatTest extends TestCase
 {
+    private $currencyCode;
+
+    private $decimalSeparator;
+
+    private $thousandsSeparator;
+
     protected function setUp(): void
     {
+        $this->currencyCode = StringHelper::getCurrencyCode();
+        $this->decimalSeparator = StringHelper::getDecimalSeparator();
+        $this->thousandsSeparator = StringHelper::getThousandsSeparator();
         StringHelper::setDecimalSeparator('.');
         StringHelper::setThousandsSeparator(',');
     }
 
+    protected function tearDown(): void
+    {
+        StringHelper::setCurrencyCode($this->currencyCode);
+        StringHelper::setDecimalSeparator($this->decimalSeparator);
+        StringHelper::setThousandsSeparator($this->thousandsSeparator);
+    }
+
     /**
      * @dataProvider providerNumberFormat
      *
diff --git a/tests/PhpSpreadsheetTests/Writer/Html/HtmlNumberFormatTest.php b/tests/PhpSpreadsheetTests/Writer/Html/HtmlNumberFormatTest.php
index 9d306fa0..340e820b 100644
--- a/tests/PhpSpreadsheetTests/Writer/Html/HtmlNumberFormatTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Html/HtmlNumberFormatTest.php
@@ -10,12 +10,16 @@ use PhpOffice\PhpSpreadsheetTests\Functional;
 
 class HtmlNumberFormatTest extends Functional\AbstractFunctional
 {
+    private $currency;
+
     private $decsep;
 
     private $thosep;
 
     protected function setUp(): void
     {
+        $this->currency = StringHelper::getCurrencyCode();
+        StringHelper::setCurrencyCode('$');
         $this->decsep = StringHelper::getDecimalSeparator();
         StringHelper::setDecimalSeparator('.');
         $this->thosep = StringHelper::getThousandsSeparator();
@@ -24,6 +28,7 @@ class HtmlNumberFormatTest extends Functional\AbstractFunctional
 
     protected function tearDown(): void
     {
+        StringHelper::setCurrencyCode($this->currency);
         StringHelper::setDecimalSeparator($this->decsep);
         StringHelper::setThousandsSeparator($this->thosep);
     }

From 7cb4884b96174eb611621635e6fb603ef54178f7 Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Sun, 19 Jul 2020 11:33:01 +0900
Subject: [PATCH 090/153] WEBSERVICE is HTTP client agnostic

HTTP client must be configured via `Settings::setHttpClient()`. This is
a small breaking change, but only for the very few people who started using
WEBSERVICE from last version.

Fixes #1562
Closes #1568
---
 CHANGELOG.md                                  |   2 +-
 composer.json                                 |   3 +-
 composer.lock                                 | 312 ++++--------------
 docs/topics/settings.md                       |  17 +
 src/PhpSpreadsheet/Calculation/Web.php        |   6 +-
 src/PhpSpreadsheet/Settings.php               |  48 ++-
 .../Functions/Web/WebServiceTest.php          |  79 +++--
 tests/data/Calculation/Web/WEBSERVICE.php     |  10 +-
 8 files changed, 180 insertions(+), 297 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48ee6293..4d45ebac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Fixed
 
-- nothing
+- WEBSERVICE is HTTP client agnostic and must be configured via `Settings::setHttpClient()` [#1562](https://github.com/PHPOffice/PhpSpreadsheet/issues/1562)
 
 ### Changed
 
diff --git a/composer.json b/composer.json
index d4810ce6..d0379949 100644
--- a/composer.json
+++ b/composer.json
@@ -57,7 +57,8 @@
         "markbaker/complex": "^1.4",
         "markbaker/matrix": "^1.2",
         "psr/simple-cache": "^1.0",
-        "guzzlehttp/guzzle": "^7.0"
+        "psr/http-client": "^1.0",
+        "psr/http-factory": "^1.0"
     },
     "require-dev": {
         "dompdf/dompdf": "^0.8.5",
diff --git a/composer.lock b/composer.lock
index 99de82bf..266608f2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,211 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b7ea4dea7ce2e1c2299029fe978d2173",
+    "content-hash": "931b86c12c78e665f1766ea922f95e0b",
     "packages": [
-        {
-            "name": "guzzlehttp/guzzle",
-            "version": "7.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "2d9d3c186a6637a43193e66b097c50e4451eaab2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/2d9d3c186a6637a43193e66b097c50e4451eaab2",
-                "reference": "2d9d3c186a6637a43193e66b097c50e4451eaab2",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": "*",
-                "guzzlehttp/promises": "^1.0",
-                "guzzlehttp/psr7": "^1.6.1",
-                "php": "^7.2.5",
-                "psr/http-client": "^1.0"
-            },
-            "provide": {
-                "psr/http-client-implementation": "1.0"
-            },
-            "require-dev": {
-                "ergebnis/composer-normalize": "^2.0",
-                "ext-curl": "*",
-                "php-http/client-integration-tests": "dev-phpunit8",
-                "phpunit/phpunit": "^8.5.5",
-                "psr/log": "^1.1"
-            },
-            "suggest": {
-                "ext-curl": "Required for CURL handler support",
-                "ext-intl": "Required for Internationalized Domain Name (IDN) support",
-                "psr/log": "Required for using the Log middleware"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "7.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\": "src/"
-                },
-                "files": [
-                    "src/functions_include.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                },
-                {
-                    "name": "Márk Sági-Kazár",
-                    "email": "mark.sagikazar@gmail.com",
-                    "homepage": "https://sagikazarmark.hu"
-                }
-            ],
-            "description": "Guzzle is a PHP HTTP client library",
-            "homepage": "http://guzzlephp.org/",
-            "keywords": [
-                "client",
-                "curl",
-                "framework",
-                "http",
-                "http client",
-                "psr-18",
-                "psr-7",
-                "rest",
-                "web service"
-            ],
-            "time": "2020-06-27T10:33:25+00:00"
-        },
-        {
-            "name": "guzzlehttp/promises",
-            "version": "v1.3.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/promises.git",
-                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
-                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Promise\\": "src/"
-                },
-                "files": [
-                    "src/functions_include.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                }
-            ],
-            "description": "Guzzle promises library",
-            "keywords": [
-                "promise"
-            ],
-            "time": "2016-12-20T10:07:11+00:00"
-        },
-        {
-            "name": "guzzlehttp/psr7",
-            "version": "1.6.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/psr7.git",
-                "reference": "239400de7a173fe9901b9ac7c06497751f00727a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a",
-                "reference": "239400de7a173fe9901b9ac7c06497751f00727a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.0",
-                "psr/http-message": "~1.0",
-                "ralouphie/getallheaders": "^2.0.5 || ^3.0.0"
-            },
-            "provide": {
-                "psr/http-message-implementation": "1.0"
-            },
-            "require-dev": {
-                "ext-zlib": "*",
-                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
-            },
-            "suggest": {
-                "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.6-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Psr7\\": "src/"
-                },
-                "files": [
-                    "src/functions_include.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                },
-                {
-                    "name": "Tobias Schultze",
-                    "homepage": "https://github.com/Tobion"
-                }
-            ],
-            "description": "PSR-7 message implementation that also provides common utility methods",
-            "keywords": [
-                "http",
-                "message",
-                "psr-7",
-                "request",
-                "response",
-                "stream",
-                "uri",
-                "url"
-            ],
-            "time": "2019-07-01T23:21:34+00:00"
-        },
         {
             "name": "maennchen/zipstream-php",
             "version": "2.1.0",
@@ -482,20 +279,20 @@
         },
         {
             "name": "psr/http-client",
-            "version": "1.0.0",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-client.git",
-                "reference": "496a823ef742b632934724bf769560c2a5c7c44e"
+                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-client/zipball/496a823ef742b632934724bf769560c2a5c7c44e",
-                "reference": "496a823ef742b632934724bf769560c2a5c7c44e",
+                "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
+                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0",
+                "php": "^7.0 || ^8.0",
                 "psr/http-message": "^1.0"
             },
             "type": "library",
@@ -527,7 +324,59 @@
                 "psr",
                 "psr-18"
             ],
-            "time": "2018-10-30T23:29:13+00:00"
+            "time": "2020-06-29T06:28:15+00:00"
+        },
+        {
+            "name": "psr/http-factory",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-factory.git",
+                "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+                "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0.0",
+                "psr/http-message": "^1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interfaces for PSR-7 HTTP message factories",
+            "keywords": [
+                "factory",
+                "http",
+                "message",
+                "psr",
+                "psr-17",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "time": "2019-04-30T12:38:16+00:00"
         },
         {
             "name": "psr/http-message",
@@ -627,46 +476,6 @@
             ],
             "time": "2017-10-23T01:57:42+00:00"
         },
-        {
-            "name": "ralouphie/getallheaders",
-            "version": "3.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/ralouphie/getallheaders.git",
-                "reference": "120b605dfeb996808c31b6477290a714d356e822"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
-                "reference": "120b605dfeb996808c31b6477290a714d356e822",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6"
-            },
-            "require-dev": {
-                "php-coveralls/php-coveralls": "^2.1",
-                "phpunit/phpunit": "^5 || ^6.5"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "src/getallheaders.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Ralph Khattar",
-                    "email": "ralph.khattar@gmail.com"
-                }
-            ],
-            "description": "A polyfill for getallheaders.",
-            "time": "2019-03-08T08:55:37+00:00"
-        },
         {
             "name": "symfony/polyfill-mbstring",
             "version": "v1.17.1",
@@ -4382,5 +4191,6 @@
         "ext-zip": "*",
         "ext-zlib": "*"
     },
-    "platform-dev": []
+    "platform-dev": [],
+    "plugin-api-version": "1.1.0"
 }
diff --git a/docs/topics/settings.md b/docs/topics/settings.md
index 4463ceeb..d28a9996 100644
--- a/docs/topics/settings.md
+++ b/docs/topics/settings.md
@@ -43,3 +43,20 @@ More details of the features available once a locale has been set,
 including a list of the languages and locales currently supported, can
 be found in [Locale Settings for
 Formulae](./recipes.md#locale-settings-for-formulae).
+
+## HTTP client
+
+In order to use the `WEBSERVICE` function in formulae, you must configure an
+HTTP client. Assuming you chose Guzzle 7, this can be done like:
+
+
+```php
+use GuzzleHttp\Client;
+use Http\Factory\Guzzle\RequestFactory;
+use PhpOffice\PhpSpreadsheet\Settings;
+
+$client = new Client();
+$requestFactory = new RequestFactory();
+
+Settings::setHttpClient($client, $requestFactory);
+``` 
diff --git a/src/PhpSpreadsheet/Calculation/Web.php b/src/PhpSpreadsheet/Calculation/Web.php
index 9f0faf99..5cfd2ea8 100644
--- a/src/PhpSpreadsheet/Calculation/Web.php
+++ b/src/PhpSpreadsheet/Calculation/Web.php
@@ -2,7 +2,6 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation;
 
-use GuzzleHttp\Psr7\Request;
 use PhpOffice\PhpSpreadsheet\Settings;
 use Psr\Http\Client\ClientExceptionInterface;
 
@@ -31,7 +30,8 @@ class Web
 
         // Get results from the the webservice
         $client = Settings::getHttpClient();
-        $request = new Request('GET', $url);
+        $requestFactory = Settings::getRequestFactory();
+        $request = $requestFactory->createRequest('GET', $url);
 
         try {
             $response = $client->sendRequest($request);
@@ -43,7 +43,7 @@ class Web
             return Functions::VALUE(); // cURL error
         }
 
-        $output = (string) $response->getBody();
+        $output = $response->getBody()->getContents();
         if (strlen($output) > 32767) {
             return Functions::VALUE(); // Output not a string or too long
         }
diff --git a/src/PhpSpreadsheet/Settings.php b/src/PhpSpreadsheet/Settings.php
index 15218c72..cfa50573 100644
--- a/src/PhpSpreadsheet/Settings.php
+++ b/src/PhpSpreadsheet/Settings.php
@@ -2,11 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheet;
 
-use GuzzleHttp\Client;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Chart\Renderer\IRenderer;
 use PhpOffice\PhpSpreadsheet\Collection\Memory;
 use Psr\Http\Client\ClientInterface;
+use Psr\Http\Message\RequestFactoryInterface;
 use Psr\SimpleCache\CacheInterface;
 
 class Settings
@@ -47,9 +47,14 @@ class Settings
     /**
      * The HTTP client implementation to be used for network request.
      *
-     * @var ClientInterface
+     * @var null|ClientInterface
      */
-    private static $client;
+    private static $httpClient;
+
+    /**
+     * @var null|RequestFactoryInterface
+     */
+    private static $requestFactory;
 
     /**
      * Set the locale code to use for formula translations and any special formatting.
@@ -169,9 +174,19 @@ class Settings
     /**
      * Set the HTTP client implementation to be used for network request.
      */
-    public static function setHttpClient(ClientInterface $httpClient): void
+    public static function setHttpClient(ClientInterface $httpClient, RequestFactoryInterface $requestFactory): void
     {
-        self::$client = $httpClient;
+        self::$httpClient = $httpClient;
+        self::$requestFactory = $requestFactory;
+    }
+
+    /**
+     * Unset the HTTP client configuration.
+     */
+    public static function unsetHttpClient(): void
+    {
+        self::$httpClient = null;
+        self::$requestFactory = null;
     }
 
     /**
@@ -179,10 +194,25 @@ class Settings
      */
     public static function getHttpClient(): ClientInterface
     {
-        if (!self::$client) {
-            self::$client = new Client();
-        }
+        self::assertHttpClient();
 
-        return self::$client;
+        return self::$httpClient;
+    }
+
+    /**
+     * Get the HTTP request factory.
+     */
+    public static function getRequestFactory(): RequestFactoryInterface
+    {
+        self::assertHttpClient();
+
+        return self::$requestFactory;
+    }
+
+    private static function assertHttpClient(): void
+    {
+        if (!self::$httpClient || !self::$requestFactory) {
+            throw new Exception('HTTP client must be configured via Settings::setHttpClient() to be able to use WEBSERVICE function.');
+        }
     }
 }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Web/WebServiceTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Web/WebServiceTest.php
index acc83cff..2aff7b3d 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Web/WebServiceTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Web/WebServiceTest.php
@@ -2,47 +2,46 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Web;
 
-use GuzzleHttp\Client;
-use GuzzleHttp\Exception\ClientException;
-use GuzzleHttp\Exception\ConnectException;
-use GuzzleHttp\Handler\MockHandler;
-use GuzzleHttp\HandlerStack;
-use GuzzleHttp\Psr7\Request;
-use GuzzleHttp\Psr7\Response;
-use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Calculation\Web;
 use PhpOffice\PhpSpreadsheet\Settings;
 use PHPUnit\Framework\TestCase;
+use Psr\Http\Client\ClientInterface;
+use Psr\Http\Message\RequestFactoryInterface;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\StreamInterface;
 
 class WebServiceTest extends TestCase
 {
-    protected static $client;
-
-    public static function setUpBeforeClass(): void
+    protected function tearDown(): void
     {
-        // Prevent URL requests being sent out
-        $mock = new MockHandler([
-            new ClientException('This is not a valid URL', new Request('GET', 'test'), new Response()),
-            new ConnectException('This is a 404 error', new Request('GET', 'test')),
-            new Response('200', [], str_repeat('a', 40000)),
-            new Response('200', [], 'This is a test'),
-        ]);
-
-        $handlerStack = HandlerStack::create($mock);
-        self::$client = new Client(['handler' => $handlerStack]);
-    }
-
-    protected function setUp(): void
-    {
-        Functions::setCompatibilityMode(Functions::COMPATIBILITY_EXCEL);
+        Settings::unsetHttpClient();
     }
 
     /**
      * @dataProvider providerWEBSERVICE
      */
-    public function testWEBSERVICE(string $expectedResult, string $url): void
+    public function testWEBSERVICE(string $expectedResult, string $url, ?array $responseData): void
     {
-        Settings::setHttpClient(self::$client);
+        if ($responseData) {
+            $body = $this->createMock(StreamInterface::class);
+            $body->expects(self::atMost(1))->method('getContents')->willReturn($responseData[1]);
+
+            $response = $this->createMock(ResponseInterface::class);
+            $response->expects(self::once())->method('getStatusCode')->willReturn($responseData[0]);
+            $response->expects(self::atMost(1))->method('getBody')->willReturn($body);
+
+            $client = $this->createMock(ClientInterface::class);
+            $client->expects(self::once())->method('sendRequest')->willReturn($response);
+
+            $request = $this->createMock(RequestInterface::class);
+
+            $requestFactory = $this->createMock(RequestFactoryInterface::class);
+            $requestFactory->expects(self::atMost(1))->method('createRequest')->willReturn($request);
+
+            Settings::setHttpClient($client, $requestFactory);
+        }
+
         $result = Web::WEBSERVICE($url);
         self::assertEquals($expectedResult, $result);
     }
@@ -51,4 +50,28 @@ class WebServiceTest extends TestCase
     {
         return require 'tests/data/Calculation/Web/WEBSERVICE.php';
     }
+
+    public function testWEBSERVICEReturnErrorWhenClientThrows(): void
+    {
+        $exception = $this->createMock(\Psr\Http\Client\ClientExceptionInterface::class);
+
+        $client = $this->createMock(ClientInterface::class);
+        $client->expects(self::once())->method('sendRequest')->willThrowException($exception);
+
+        $request = $this->createMock(RequestInterface::class);
+
+        $requestFactory = $this->createMock(RequestFactoryInterface::class);
+        $requestFactory->expects(self::atMost(1))->method('createRequest')->willReturn($request);
+
+        Settings::setHttpClient($client, $requestFactory);
+
+        $result = Web::WEBSERVICE('https://example.com');
+        self::assertEquals('#VALUE!', $result);
+    }
+
+    public function testWEBSERVICEThrowsIfNotClientConfigured(): void
+    {
+        $this->expectExceptionMessage('HTTP client must be configured via Settings::setHttpClient() to be able to use WEBSERVICE function.');
+        Web::WEBSERVICE('https://example.com');
+    }
 }
diff --git a/tests/data/Calculation/Web/WEBSERVICE.php b/tests/data/Calculation/Web/WEBSERVICE.php
index 6d9934da..c8294eb2 100644
--- a/tests/data/Calculation/Web/WEBSERVICE.php
+++ b/tests/data/Calculation/Web/WEBSERVICE.php
@@ -4,25 +4,27 @@ return [
     [
         '#VALUE!',
         'http://www.thisurlisfartoolongLoremipsumdolorsitametconsecteturadipiscingelitAliquamimperdietmetusurnasedaliquampurusdapibusefficiturQuisqueatullamcorpermaurisacmattisanteDonecsagittisauguenullaegeinterduurnapharetrautQuisquealectusvelnisivolutpatpharetraSuspendisseconvallisvulputateblanditClassaptenttacitisociosquadlitoratorquentperconubianostraperinceptoshimenaeosProinjustdiampulvinaracjustoauctorimperdietsuscipitestEtiamacmaximusmassasitametvulputatedolorthisurlisfartoolongLoremipsumdolorsitametconsecteturadipiscingelitAliquamimperdietmetusurnasedaliquampurusdapibusefficiturQuisqueatullamcorpermaurisacmattisanteDonecsagittisauguenullaegeinterduurnapharetrautQuisquealectusvelnisivolutpatpharetraSuspendisseconvallisvulputateblanditClassaptenttacitisociosquadlitoratorquentperconubianostraperinceptoshimenaeosProinjustdiampulvinaracjustoauctorimperdietsuscipitestEtiamacmaximusmassasitametvulputatedolorthisurlisfartoolongLoremipsumdolorsitametconsecteturadipiscingelitAliquamimperdietmetusurnasedaliquampurusdapibusefficiturQuisqueatullamcorpermaurisacmattisanteDonecsagittisauguenullaegeinterduurnapharetrautQuisquealectusvelnisivolutpatpharetraSuspendisseconvallisvulputateblanditClassaptenttacitisociosquadlitoratorquentperconubianostraperinceptoshimenaeosProinjustdiampulvinaracjustoauctorimperdietsuscipitestEtiamacmaximusmassasitametvulputatedolorthisurlisfartoolongLoremipsumdolorsitametconsecteturadipiscingelitAliquamimperdietmetusurnasedaliquampurusdapibusefficiturQuisqueatullamcorpermaurisacmattisanteDonecsagittisauguenullaegeinterduurnapharetrautQuisquealectusvelnisivolutpatpharetraSuspendisseconvallisvulputateblanditClassaptenttacitisociosquadlitoratorquentperconubianostraperinceptoshimenaeosProinjustdiampulvinaracjustoauctorimperdietsuscipitestEtiamacmaximusmassasitametvulputatedolorthisurlisfartoolongLoremipsumdolorsitametconsecteturadipiscingelitAliquamimperdietmetusurnasedaliquampurusdapibusefficiturQuisqueatullamcorpermaurisacmattisanteDonecsagittisauguenullaegeinterduurnapharetrautQuisquealectusvelnisivolutpatpharetraSuspendisseconvallisvulputateblanditClassaptenttacitisociosquadlitoratorquentperconubianostraperinceptoshimenaeosProinjustdiampulvinaracjustoauctorimperdietsuscipitestEtiamacmaximusmassasitametvulputatedolorthisurlisfartoolongLoremipsumdolorsitametconsecteturadipiscingelitAliquamimperdietmetusurnasedaliquampurusdapibusefficiturQuisqueatullamcorpermaurisacmattisanteDonecsagittisauguenullaegeinterduurnapharetrautQuisquealectusvelnisivolutpatpharetraSuspendisseconvallisvulputateblanditClassaptenttacitisociosquadlitoratorquentperconubianostraperinceptoshimenaeosProinjustdiampulvinaracjustoauctorimperdietsuscipitestEtiamacmaximusmassasitametvulputatedolor.com',
+        null,
     ],
     [
         '#VALUE!',
         'ftp://www.bla.com',
-    ],
-    [
-        '#VALUE!',
-        'http://notevenanurl',
+        null,
     ],
     [
         '#VALUE!',
         'http://www.example1.com',
+        ['404', 'not found'],
+
     ],
     [
         '#VALUE!',
         'http://www.example2.com',
+        ['200', str_repeat('a', 40000)],
     ],
     [
         'This is a test',
         'http://www.example3.com',
+        ['200', 'This is a test'],
     ],
 ];

From c3fa31de1389a9f194340e58e8e9898a2dcfd4c8 Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Sun, 19 Jul 2020 12:21:40 +0900
Subject: [PATCH 091/153] Missing typing

---
 src/PhpSpreadsheet/Reader/Gnumeric/PageSetup.php     |  2 +-
 src/PhpSpreadsheet/Worksheet/PageMargins.php         | 12 ++++++------
 .../Reader/Gnumeric/PageSetupTest.php                |  4 ++--
 .../PhpSpreadsheetTests/Reader/Ods/PageSetupTest.php |  4 ++--
 .../PhpSpreadsheetTests/Reader/Xls/PageSetupTest.php |  4 ++--
 .../Reader/Xlsx/PageSetupTest.php                    |  4 ++--
 .../PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php |  4 ++--
 .../Worksheet/PageMarginsTest.php                    |  4 ++--
 8 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/PhpSpreadsheet/Reader/Gnumeric/PageSetup.php b/src/PhpSpreadsheet/Reader/Gnumeric/PageSetup.php
index dbe30061..0fe73005 100644
--- a/src/PhpSpreadsheet/Reader/Gnumeric/PageSetup.php
+++ b/src/PhpSpreadsheet/Reader/Gnumeric/PageSetup.php
@@ -19,7 +19,7 @@ class PageSetup
      */
     private $gnm;
 
-    public function __construct(Spreadsheet $spreadsheet, $gnm)
+    public function __construct(Spreadsheet $spreadsheet, string $gnm)
     {
         $this->spreadsheet = $spreadsheet;
         $this->gnm = $gnm;
diff --git a/src/PhpSpreadsheet/Worksheet/PageMargins.php b/src/PhpSpreadsheet/Worksheet/PageMargins.php
index d59c6afd..a8297933 100644
--- a/src/PhpSpreadsheet/Worksheet/PageMargins.php
+++ b/src/PhpSpreadsheet/Worksheet/PageMargins.php
@@ -212,32 +212,32 @@ class PageMargins
         }
     }
 
-    public static function fromCentimeters($value): float
+    public static function fromCentimeters(float $value): float
     {
         return $value / 2.54;
     }
 
-    public static function toCentimeters($value): float
+    public static function toCentimeters(float $value): float
     {
         return $value * 2.54;
     }
 
-    public static function fromMillimeters($value): float
+    public static function fromMillimeters(float $value): float
     {
         return $value / 25.4;
     }
 
-    public static function toMillimeters($value): float
+    public static function toMillimeters(float $value): float
     {
         return $value * 25.4;
     }
 
-    public static function fromPoints($value): float
+    public static function fromPoints(float $value): float
     {
         return $value / 72;
     }
 
-    public static function toPoints($value): float
+    public static function toPoints(float $value): float
     {
         return $value * 72;
     }
diff --git a/tests/PhpSpreadsheetTests/Reader/Gnumeric/PageSetupTest.php b/tests/PhpSpreadsheetTests/Reader/Gnumeric/PageSetupTest.php
index 4eb9d5bd..9a8c87a7 100644
--- a/tests/PhpSpreadsheetTests/Reader/Gnumeric/PageSetupTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Gnumeric/PageSetupTest.php
@@ -68,7 +68,7 @@ class PageSetupTest extends TestCase
         }
     }
 
-    public function pageSetupAssertions()
+    public function pageSetupAssertions(): array
     {
         return [
             'Sheet1' => [
@@ -103,7 +103,7 @@ class PageSetupTest extends TestCase
         ];
     }
 
-    public function pageMarginAssertions()
+    public function pageMarginAssertions(): array
     {
         return [
             'Sheet1' => [
diff --git a/tests/PhpSpreadsheetTests/Reader/Ods/PageSetupTest.php b/tests/PhpSpreadsheetTests/Reader/Ods/PageSetupTest.php
index a8e681d4..0e06fb43 100644
--- a/tests/PhpSpreadsheetTests/Reader/Ods/PageSetupTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Ods/PageSetupTest.php
@@ -70,7 +70,7 @@ class PageSetupTest extends TestCase
         }
     }
 
-    public function pageSetupAssertions()
+    public function pageSetupAssertions(): array
     {
         return [
             'Sheet1' => [
@@ -105,7 +105,7 @@ class PageSetupTest extends TestCase
         ];
     }
 
-    public function pageMarginAssertions()
+    public function pageMarginAssertions(): array
     {
         return [
             'Sheet1' => [
diff --git a/tests/PhpSpreadsheetTests/Reader/Xls/PageSetupTest.php b/tests/PhpSpreadsheetTests/Reader/Xls/PageSetupTest.php
index a5282405..be704f30 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xls/PageSetupTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xls/PageSetupTest.php
@@ -70,7 +70,7 @@ class PageSetupTest extends TestCase
         }
     }
 
-    public function pageSetupAssertions()
+    public function pageSetupAssertions(): array
     {
         return [
             'Sheet1' => [
@@ -105,7 +105,7 @@ class PageSetupTest extends TestCase
         ];
     }
 
-    public function pageMarginAssertions()
+    public function pageMarginAssertions(): array
     {
         return [
             'Sheet1' => [
diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/PageSetupTest.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/PageSetupTest.php
index 3efb581a..5dc16a89 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xlsx/PageSetupTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/PageSetupTest.php
@@ -70,7 +70,7 @@ class PageSetupTest extends TestCase
         }
     }
 
-    public function pageSetupAssertions()
+    public function pageSetupAssertions(): array
     {
         return [
             'Sheet1' => [
@@ -105,7 +105,7 @@ class PageSetupTest extends TestCase
         ];
     }
 
-    public function pageMarginAssertions()
+    public function pageMarginAssertions(): array
     {
         return [
             'Sheet1' => [
diff --git a/tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php b/tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php
index d6313281..685421d8 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php
@@ -70,7 +70,7 @@ class PageSetupTest extends TestCase
         }
     }
 
-    public function pageSetupAssertions()
+    public function pageSetupAssertions(): array
     {
         return [
             'Sheet1' => [
@@ -105,7 +105,7 @@ class PageSetupTest extends TestCase
         ];
     }
 
-    public function pageMarginAssertions()
+    public function pageMarginAssertions(): array
     {
         return [
             'Sheet1' => [
diff --git a/tests/PhpSpreadsheetTests/Worksheet/PageMarginsTest.php b/tests/PhpSpreadsheetTests/Worksheet/PageMarginsTest.php
index b9713707..0006a033 100644
--- a/tests/PhpSpreadsheetTests/Worksheet/PageMarginsTest.php
+++ b/tests/PhpSpreadsheetTests/Worksheet/PageMarginsTest.php
@@ -61,7 +61,7 @@ class PageMarginsTest extends TestCase
         self::assertSame($expectedResult, $actualResult);
     }
 
-    public function providerPointsAndInches()
+    public function providerPointsAndInches(): array
     {
         return [
             [36, 0.5],
@@ -71,7 +71,7 @@ class PageMarginsTest extends TestCase
         ];
     }
 
-    public function providerCentimetersAndInches()
+    public function providerCentimetersAndInches(): array
     {
         return [
             [1.27, 0.5],

From 395b750030cf30b5920a8f4de2d4893c892add01 Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Sun, 19 Jul 2020 12:30:31 +0900
Subject: [PATCH 092/153] Stricter visibility

---
 src/PhpSpreadsheet/Reader/Xml/PageSettings.php              | 2 +-
 tests/PhpSpreadsheetTests/Reader/Gnumeric/PageSetupTest.php | 4 ++--
 tests/PhpSpreadsheetTests/Reader/Ods/PageSetupTest.php      | 4 ++--
 tests/PhpSpreadsheetTests/Reader/Xls/PageSetupTest.php      | 4 ++--
 tests/PhpSpreadsheetTests/Reader/Xlsx/PageSetupTest.php     | 4 ++--
 tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php      | 4 ++--
 tests/PhpSpreadsheetTests/Worksheet/PageMarginsTest.php     | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/PhpSpreadsheet/Reader/Xml/PageSettings.php b/src/PhpSpreadsheet/Reader/Xml/PageSettings.php
index 72604dcd..e56ac331 100644
--- a/src/PhpSpreadsheet/Reader/Xml/PageSettings.php
+++ b/src/PhpSpreadsheet/Reader/Xml/PageSettings.php
@@ -38,7 +38,7 @@ class PageSettings
             ->setFooter($this->printSettings->footerMargin);
     }
 
-    private function getPrintDefaults()
+    private function getPrintDefaults(): stdClass
     {
         return (object) [
             'paperSize' => 9,
diff --git a/tests/PhpSpreadsheetTests/Reader/Gnumeric/PageSetupTest.php b/tests/PhpSpreadsheetTests/Reader/Gnumeric/PageSetupTest.php
index 9a8c87a7..0b563586 100644
--- a/tests/PhpSpreadsheetTests/Reader/Gnumeric/PageSetupTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Gnumeric/PageSetupTest.php
@@ -68,7 +68,7 @@ class PageSetupTest extends TestCase
         }
     }
 
-    public function pageSetupAssertions(): array
+    private function pageSetupAssertions(): array
     {
         return [
             'Sheet1' => [
@@ -103,7 +103,7 @@ class PageSetupTest extends TestCase
         ];
     }
 
-    public function pageMarginAssertions(): array
+    private function pageMarginAssertions(): array
     {
         return [
             'Sheet1' => [
diff --git a/tests/PhpSpreadsheetTests/Reader/Ods/PageSetupTest.php b/tests/PhpSpreadsheetTests/Reader/Ods/PageSetupTest.php
index 0e06fb43..20af31c5 100644
--- a/tests/PhpSpreadsheetTests/Reader/Ods/PageSetupTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Ods/PageSetupTest.php
@@ -70,7 +70,7 @@ class PageSetupTest extends TestCase
         }
     }
 
-    public function pageSetupAssertions(): array
+    private function pageSetupAssertions(): array
     {
         return [
             'Sheet1' => [
@@ -105,7 +105,7 @@ class PageSetupTest extends TestCase
         ];
     }
 
-    public function pageMarginAssertions(): array
+    private function pageMarginAssertions(): array
     {
         return [
             'Sheet1' => [
diff --git a/tests/PhpSpreadsheetTests/Reader/Xls/PageSetupTest.php b/tests/PhpSpreadsheetTests/Reader/Xls/PageSetupTest.php
index be704f30..034ce6ee 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xls/PageSetupTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xls/PageSetupTest.php
@@ -70,7 +70,7 @@ class PageSetupTest extends TestCase
         }
     }
 
-    public function pageSetupAssertions(): array
+    private function pageSetupAssertions(): array
     {
         return [
             'Sheet1' => [
@@ -105,7 +105,7 @@ class PageSetupTest extends TestCase
         ];
     }
 
-    public function pageMarginAssertions(): array
+    private function pageMarginAssertions(): array
     {
         return [
             'Sheet1' => [
diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/PageSetupTest.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/PageSetupTest.php
index 5dc16a89..c00a1623 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xlsx/PageSetupTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xlsx/PageSetupTest.php
@@ -70,7 +70,7 @@ class PageSetupTest extends TestCase
         }
     }
 
-    public function pageSetupAssertions(): array
+    private function pageSetupAssertions(): array
     {
         return [
             'Sheet1' => [
@@ -105,7 +105,7 @@ class PageSetupTest extends TestCase
         ];
     }
 
-    public function pageMarginAssertions(): array
+    private function pageMarginAssertions(): array
     {
         return [
             'Sheet1' => [
diff --git a/tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php b/tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php
index 685421d8..97476ed5 100644
--- a/tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xml/PageSetupTest.php
@@ -70,7 +70,7 @@ class PageSetupTest extends TestCase
         }
     }
 
-    public function pageSetupAssertions(): array
+    private function pageSetupAssertions(): array
     {
         return [
             'Sheet1' => [
@@ -105,7 +105,7 @@ class PageSetupTest extends TestCase
         ];
     }
 
-    public function pageMarginAssertions(): array
+    private function pageMarginAssertions(): array
     {
         return [
             'Sheet1' => [
diff --git a/tests/PhpSpreadsheetTests/Worksheet/PageMarginsTest.php b/tests/PhpSpreadsheetTests/Worksheet/PageMarginsTest.php
index 0006a033..37b6df2b 100644
--- a/tests/PhpSpreadsheetTests/Worksheet/PageMarginsTest.php
+++ b/tests/PhpSpreadsheetTests/Worksheet/PageMarginsTest.php
@@ -79,7 +79,7 @@ class PageMarginsTest extends TestCase
         ];
     }
 
-    public function providerMillimetersAndInches()
+    public function providerMillimetersAndInches(): array
     {
         return [
             [12.7, 0.5],

From 7e12575d867ce9a8a071c899ee59e21b90bab7cb Mon Sep 17 00:00:00 2001
From: Dhaval Purohit <dhaval.purohit4@gmail.com>
Date: Wed, 13 May 2020 13:56:49 +0530
Subject: [PATCH 093/153] Borders are complete even on rowspanned columns using
 HTML reader

Fixed #1455
Closes #1473
---
 CHANGELOG.md                                  |  1 +
 src/PhpSpreadsheet/Reader/Html.php            | 21 ++++++++++++-
 tests/PhpSpreadsheetTests/Reader/HtmlTest.php | 31 +++++++++++++++++++
 3 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d45ebac..cd682780 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 ### Fixed
 
 - WEBSERVICE is HTTP client agnostic and must be configured via `Settings::setHttpClient()` [#1562](https://github.com/PHPOffice/PhpSpreadsheet/issues/1562)
+- Borders were not complete on rowspanned columns using HTML reader [#1473](https://github.com/PHPOffice/PhpSpreadsheet/pull/1473)
 
 ### Changed
 
diff --git a/src/PhpSpreadsheet/Reader/Html.php b/src/PhpSpreadsheet/Reader/Html.php
index 2fe85b6f..d59e4744 100644
--- a/src/PhpSpreadsheet/Reader/Html.php
+++ b/src/PhpSpreadsheet/Reader/Html.php
@@ -682,7 +682,26 @@ class Html extends BaseReader
             return;
         }
 
-        $cellStyle = $sheet->getStyle($column . $row);
+        if (isset($attributeArray['rowspan'], $attributeArray['colspan'])) {
+            $columnTo = $column;
+            for ($i = 0; $i < (int) $attributeArray['colspan'] - 1; ++$i) {
+                ++$columnTo;
+            }
+            $range = $column . $row . ':' . $columnTo . ($row + (int) $attributeArray['rowspan'] - 1);
+            $cellStyle = $sheet->getStyle($range);
+        } elseif (isset($attributeArray['rowspan'])) {
+            $range = $column . $row . ':' . $column . ($row + (int) $attributeArray['rowspan'] - 1);
+            $cellStyle = $sheet->getStyle($range);
+        } elseif (isset($attributeArray['colspan'])) {
+            $columnTo = $column;
+            for ($i = 0; $i < (int) $attributeArray['colspan'] - 1; ++$i) {
+                ++$columnTo;
+            }
+            $range = $column . $row . ':' . $columnTo . $row;
+            $cellStyle = $sheet->getStyle($range);
+        } else {
+            $cellStyle = $sheet->getStyle($column . $row);
+        }
 
         // add color styles (background & text) from dom element,currently support : td & th, using ONLY inline css style with RGB color
         $styles = explode(';', $attributeArray['style']);
diff --git a/tests/PhpSpreadsheetTests/Reader/HtmlTest.php b/tests/PhpSpreadsheetTests/Reader/HtmlTest.php
index b0994a33..636aaa94 100644
--- a/tests/PhpSpreadsheetTests/Reader/HtmlTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/HtmlTest.php
@@ -424,4 +424,35 @@ class HtmlTest extends TestCase
         self::assertEquals(10, $style->getAlignment()->getIndent());
         unlink($filename);
     }
+
+    public function testBorderWithRowspanAndColspan(): void
+    {
+        $html = '<table>
+                    <tr>
+                        <td style="border: 1px solid black;">NOT SPANNED</td>
+                        <td rowspan="2" colspan="2" style="border: 1px solid black;">SPANNED</td>
+                    </tr>
+                    <tr>
+                        <td style="border: 1px solid black;">NOT SPANNED</td>
+                    </tr>
+                </table>';
+
+        $reader = new Html();
+        $spreadsheet = $reader->loadFromString($html);
+        $firstSheet = $spreadsheet->getSheet(0);
+        $style = $firstSheet->getStyle('B1:C2');
+
+        $borders = $style->getBorders();
+
+        $totalBorders = [
+            $borders->getTop(),
+            $borders->getLeft(),
+            $borders->getBottom(),
+            $borders->getRight(),
+        ];
+
+        foreach ($totalBorders as $border) {
+            self::assertEquals(Border::BORDER_THIN, $border->getBorderStyle());
+        }
+    }
 }

From 2383aad5689778470491581442aab38cec41bf1d Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Sun, 19 Jul 2020 18:51:35 +0900
Subject: [PATCH 094/153] 1.14.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd682780..31584ac9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com)
 and this project adheres to [Semantic Versioning](https://semver.org).
 
-## [Unreleased]
+## 1.14.1 - 2020-07-19
 
 ### Added
 

From a8197128c6f02e252fce4085c1b197a2b15ad20c Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Sun, 19 Jul 2020 18:54:34 +0900
Subject: [PATCH 095/153] Remove links that should never have been links

---
 CHANGELOG.md | 50 +++++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31584ac9..3989a60e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,7 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 - nothing
 
-## [1.14.0] - 2020-06-29
+## 1.14.0 - 2020-06-29
 
 ### Added
 
@@ -44,7 +44,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Xls Writer - Correct Timestamp Bug [#1493](https://github.com/PHPOffice/PhpSpreadsheet/pull/1493)
 - Don't ouput row and columns without any cells in HTML writer [#1235](https://github.com/PHPOffice/PhpSpreadsheet/issues/1235)
 
-## [1.13.0] - 2020-05-31
+## 1.13.0 - 2020-05-31
 
 ### Added
 
@@ -70,7 +70,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Drop partial migration tool in favor of complete migration via RectorPHP [#1445](https://github.com/PHPOffice/PhpSpreadsheet/issues/1445)
 - Limit composer package to `src/` [#1424](https://github.com/PHPOffice/PhpSpreadsheet/pull/1424)
 
-## [1.12.0] - 2020-04-27
+## 1.12.0 - 2020-04-27
 
 ### Added
 
@@ -86,7 +86,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - MATCH with a static array should return the position of the found value based on the values submitted [#1332](https://github.com/PHPOffice/PhpSpreadsheet/pull/1332)
 - Fix Xlsx Reader's handling of undefined fill color [#1353](https://github.com/PHPOffice/PhpSpreadsheet/pull/1353)
 
-## [1.11.0] - 2020-03-02
+## 1.11.0 - 2020-03-02
 
 ### Added
 
@@ -105,7 +105,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Fix XLSX file loading with autofilter containing '$' [#1326](https://github.com/PHPOffice/PhpSpreadsheet/pull/1326)
 - PHPDoc - Use `@return $this` for fluent methods [#1362](https://github.com/PHPOffice/PhpSpreadsheet/pull/1362)
 
-## [1.10.1] - 2019-12-02
+## 1.10.1 - 2019-12-02
 
 ### Changed
 
@@ -120,7 +120,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - ODS writer prevent invalid numeric value if locale decimal separator is comma [#1268](https://github.com/PHPOffice/PhpSpreadsheet/pull/1268)
 - Xlsx writer actually writes plotVisOnly and dispBlanksAs from chart properties [#1266](https://github.com/PHPOffice/PhpSpreadsheet/pull/1266)
 
-## [1.10.0] - 2019-11-18
+## 1.10.0 - 2019-11-18
 
 ### Changed
 
@@ -145,7 +145,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Validate XIRR inputs and return correct error values [#1120](https://github.com/PHPOffice/PhpSpreadsheet/issues/1120)
 - Allow to read xlsx files with exotic workbook names like "workbook2.xml" [#1183](https://github.com/PHPOffice/PhpSpreadsheet/pull/1183)
 
-## [1.9.0] - 2019-08-17
+## 1.9.0 - 2019-08-17
 
 ### Changed
 
@@ -176,20 +176,20 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Fix `getCalculatedValue()` error with more than two INDIRECT [#1115](https://github.com/PHPOffice/PhpSpreadsheet/pull/1115)
 - Writer\Html did not hide columns [#985](https://github.com/PHPOffice/PhpSpreadsheet/pull/985)
 
-## [1.8.2] - 2019-07-08
+## 1.8.2 - 2019-07-08
 
 ### Fixed
 
 - Uncaught error when opening ods file and properties aren't defined [#1047](https://github.com/PHPOffice/PhpSpreadsheet/issues/1047)
 - Xlsx Reader Cell datavalidations bug [#1052](https://github.com/PHPOffice/PhpSpreadsheet/pull/1052)
 
-## [1.8.1] - 2019-07-02
+## 1.8.1 - 2019-07-02
 
 ### Fixed
 
 - Allow nullable theme for Xlsx Style Reader class [#1043](https://github.com/PHPOffice/PhpSpreadsheet/issues/1043)
 
-## [1.8.0] - 2019-07-01
+## 1.8.0 - 2019-07-01
 
 ### Security Fix (CVE-2019-12331)
 
@@ -212,7 +212,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Fix a SUMIF warning with some versions of PHP when having different length of arrays provided as input [#873](https://github.com/PHPOffice/PhpSpreadsheet/pull/873)
 - Fix incorrectly handled backslash-escaped space characters in number format
 
-## [1.7.0] - 2019-05-26
+## 1.7.0 - 2019-05-26
 
 - Added support for inline styles in Html reader (borders, alignment, width, height)
 - QuotedText cells no longer treated as formulae if the content begins with a `=`
@@ -226,7 +226,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Fix VLOOKUP
 - Fix return type hint
 
-## [1.6.0] - 2019-01-02
+## 1.6.0 - 2019-01-02
 
 ### Added
 
@@ -254,13 +254,13 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 - `master` is the new default branch, `develop` does not exist anymore
 
-## [1.5.2] - 2018-11-25
+## 1.5.2 - 2018-11-25
 
 ### Security
 
 - Improvements to the design of the XML Security Scanner [#771](https://github.com/PHPOffice/PhpSpreadsheet/issues/771)
 
-## [1.5.1] - 2018-11-20
+## 1.5.1 - 2018-11-20
 
 ### Security
 
@@ -280,7 +280,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Mpdf export can exceed pcre.backtrack_limit [#637](https://github.com/PHPOffice/PhpSpreadsheet/issues/637)
 - Fix index overflow on data values array [#748](https://github.com/PHPOffice/PhpSpreadsheet/pull/748)
 
-## [1.5.0] - 2018-10-21
+## 1.5.0 - 2018-10-21
 
 ### Added
 
@@ -295,7 +295,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - OFFSET should allow omitted height and width [#561](https://github.com/PHPOffice/PhpSpreadsheet/issues/561)
 - Correctly determine delimiter when CSV contains line breaks inside enclosures [#716](https://github.com/PHPOffice/PhpSpreadsheet/issues/716)
 
-## [1.4.1] - 2018-09-30
+## 1.4.1 - 2018-09-30
 
 ### Fixed
 
@@ -304,7 +304,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Fix warning when reading xlsx without styles [#631](https://github.com/PHPOffice/PhpSpreadsheet/pull/631)
 - Fix broken sample links on windows due to $baseDir having backslash [#653](https://github.com/PHPOffice/PhpSpreadsheet/pull/653)
 
-## [1.4.0] - 2018-08-06
+## 1.4.0 - 2018-08-06
 
 ### Added
 
@@ -368,13 +368,13 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Migration tool keep variables containing $PHPExcel untouched [#598](https://github.com/PHPOffice/PhpSpreadsheet/issues/598)
 - Rowspans/colspans were incorrect when adding worksheet using loadIntoExisting [#619](https://github.com/PHPOffice/PhpSpreadsheet/issues/619)
 
-## [1.3.1] - 2018-06-12
+## 1.3.1 - 2018-06-12
 
 ### Fixed
 
 - Ranges across Z and AA columns incorrectly threw an exception [#545](https://github.com/PHPOffice/PhpSpreadsheet/issues/545)
 
-## [1.3.0] - 2018-06-10
+## 1.3.0 - 2018-06-10
 
 ### Added
 
@@ -393,13 +393,13 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Fixed parsing of conditionals in COUNTIF functions [#526](https://github.com/PHPOffice/PhpSpreadsheet/issues/526)
 - Corruption errors for saved Xlsx docs with frozen panes [#532](https://github.com/PHPOffice/PhpSpreadsheet/issues/532)
 
-## [1.2.1] - 2018-04-10
+## 1.2.1 - 2018-04-10
 
 ### Fixed
 
 - Plain text and richtext mixed in same cell can be read [#442](https://github.com/PHPOffice/PhpSpreadsheet/issues/442)
 
-## [1.2.0] - 2018-03-04
+## 1.2.0 - 2018-03-04
 
 ### Added
 
@@ -417,7 +417,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Select correct cell when calling freezePane [#389](https://github.com/PHPOffice/PhpSpreadsheet/issues/389)
 - `setStrikethrough()` did not set the font [#403](https://github.com/PHPOffice/PhpSpreadsheet/issues/403)
 
-## [1.1.0] - 2018-01-28
+## 1.1.0 - 2018-01-28
 
 ### Added
 
@@ -435,7 +435,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Support XML file without styles [#331](https://github.com/PHPOffice/PhpSpreadsheet/pull/331)
 - Cell coordinates which are already a range cause an exception [#319](https://github.com/PHPOffice/PhpSpreadsheet/issues/319)
 
-## [1.0.0] - 2017-12-25
+## 1.0.0 - 2017-12-25
 
 ### Added
 
@@ -454,7 +454,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 - Constant `TYPE_DOUGHTNUTCHART` is now `TYPE_DOUGHNUTCHART`.
 
-## [1.0.0-beta2] - 2017-11-26
+## 1.0.0-beta2 - 2017-11-26
 
 ### Added
 
@@ -492,7 +492,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
     - `PhpSpreadsheet\Style` => `PhpSpreadsheet\Style\Style`
     - `PhpSpreadsheet\Worksheet` => `PhpSpreadsheet\Worksheet\Worksheet`
 
-## [1.0.0-beta] - 2017-08-17
+## 1.0.0-beta - 2017-08-17
 
 ### Added
 

From a79c736f4287b36e0b34bc275bd440aa6534f7a6 Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Sun, 19 Jul 2020 18:55:18 +0900
Subject: [PATCH 096/153] Update CHANGELOG

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3989a60e..f6a0e9ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,28 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com)
 and this project adheres to [Semantic Versioning](https://semver.org).
 
+## Unreleased - TBD
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 1.14.1 - 2020-07-19
 
 ### Added

From e084e896988a903f8f5d424fa5bc543921f79ee8 Mon Sep 17 00:00:00 2001
From: Mark Baker <mark@lange.demon.co.uk>
Date: Sat, 25 Jul 2020 12:16:54 +0200
Subject: [PATCH 097/153] Reconcile function discrepancies between the
 documented lists, and the Calculation Engine (#1585)

* Update the Calculation engine list to reflect the complete set of all MS Excel functions as of 1st July 2020
---
 docs/references/function-list-by-category.md  | 270 +++--
 docs/references/function-list-by-name.md      | 993 ++++++++++--------
 .../Calculation/Calculation.php               | 380 +++++++
 3 files changed, 1091 insertions(+), 552 deletions(-)

diff --git a/docs/references/function-list-by-category.md b/docs/references/function-list-by-category.md
index 3cc1c2b8..6ac54cb7 100644
--- a/docs/references/function-list-by-category.md
+++ b/docs/references/function-list-by-category.md
@@ -14,7 +14,7 @@ CUBEVALUE           | **Not yet Implemented**
 
 ## CATEGORY_DATABASE
 
-Excel Function      | PhpSpreadsheet Function
+Excel Function      | PhpSpreadsheet Function                                      
 --------------------|-------------------------------------------
 DAVERAGE            | \PhpOffice\PhpSpreadsheet\Calculation\Database::DAVERAGE
 DCOUNT              | \PhpOffice\PhpSpreadsheet\Calculation\Database::DCOUNT
@@ -229,6 +229,7 @@ AREAS               | **Not yet Implemented**
 CHOOSE              | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::CHOOSE
 COLUMN              | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::COLUMN
 COLUMNS             | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::COLUMNS
+FILTER              | **Not yet Implemented**
 FORMULATEXT         | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::FORMULATEXT
 GETPIVOTDATA        | **Not yet Implemented**
 HLOOKUP             | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::HLOOKUP
@@ -241,8 +242,13 @@ OFFSET              | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::OFFSET
 ROW                 | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::ROW
 ROWS                | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::ROWS
 RTD                 | **Not yet Implemented**
+SORT                | **Not yet Implemented**
+SORTBY              | **Not yet Implemented**
 TRANSPOSE           | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::TRANSPOSE
+UNIQUE              | **Not yet Implemented**
 VLOOKUP             | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::VLOOKUP
+XLOOKUP             | **Not yet Implemented**
+XMATCH              | **Not yet Implemented**
 
 ## CATEGORY_MATH_AND_TRIG
 
@@ -253,6 +259,7 @@ ACOS                | acos
 ACOSH               | acosh
 ACOT                | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::ACOT
 ACOTH               | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::ACOTH
+AGGREGATE           | **Not yet Implemented**
 ARABIC              | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::ARABIC
 ASIN                | asin
 ASINH               | asinh
@@ -261,13 +268,17 @@ ATAN2               | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::ATAN2
 ATANH               | atanh
 BASE                | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::BASE
 CEILING             | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::CEILING
+CEILING.MATH        | **Not yet Implemented**
+CEILING.PRECISE     | **Not yet Implemented**
 COMBIN              | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::COMBIN
+COMBINA             | **Not yet Implemented**
 COS                 | cos
 COSH                | cosh
 COT                 | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::COT
 COTH                | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::COTH
 CSC                 | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::CSC
 CSCH                | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::CSCH
+DECIMAL             | **Not yet Implemented**
 DEGREES             | rad2deg
 EVEN                | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::EVEN
 EXP                 | exp
@@ -278,6 +289,7 @@ FLOOR.MATH          | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::FLOORMATH
 FLOOR.PRECISE       | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::FLOORPRECISE
 GCD                 | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::GCD
 INT                 | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::INT
+ISO.CEILING         | **Not yet Implemented**
 LCM                 | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::LCM
 LN                  | log
 LOG                 | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::logBase
@@ -288,6 +300,7 @@ MMULT               | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::MMULT
 MOD                 | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::MOD
 MROUND              | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::MROUND
 MULTINOMIAL         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::MULTINOMIAL
+MUNIT               | **Not yet Implemented**
 ODD                 | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::ODD
 PI                  | pi
 POWER               | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::POWER
@@ -295,6 +308,7 @@ PRODUCT             | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::PRODUCT
 QUOTIENT            | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::QUOTIENT
 RADIANS             | deg2rad
 RAND                | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::RAND
+RANDARRAY           | **Not yet Implemented**
 RANDBETWEEN         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::RAND
 ROMAN               | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::ROMAN
 ROUND               | round
@@ -303,6 +317,7 @@ ROUNDUP             | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::ROUNDUP
 SEC                 | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SEC
 SECH                | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SECH
 SERIESSUM           | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SERIESSUM
+SEQUENCE            | **Not yet Implemented**
 SIGN                | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SIGN
 SIN                 | sin
 SINH                | sinh
@@ -323,99 +338,157 @@ TRUNC               | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::TRUNC
 
 ## CATEGORY_STATISTICAL
 
-Excel Function      | PhpSpreadsheet Function
---------------------|-------------------------------------------
-AVEDEV              | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::AVEDEV
-AVERAGE             | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::AVERAGE
-AVERAGEA            | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::AVERAGEA
-AVERAGEIF           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::AVERAGEIF
-AVERAGEIFS          | **Not yet Implemented**
-BETADIST            | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::BETADIST
-BETAINV             | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::BETAINV
-BINOMDIST           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::BINOMDIST
-CHIDIST             | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::CHIDIST
-CHIINV              | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::CHIINV
-CHITEST             | **Not yet Implemented**
-CONFIDENCE          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::CONFIDENCE
-CORREL              | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::CORREL
-COUNT               | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::COUNT
-COUNTA              | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::COUNTA
-COUNTBLANK          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::COUNTBLANK
-COUNTIF             | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::COUNTIF
-COUNTIFS            | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::COUNTIFS
-COVAR               | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::COVAR
-CRITBINOM           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::CRITBINOM
-DEVSQ               | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::DEVSQ
-EXPONDIST           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::EXPONDIST
-FDIST               | **Not yet Implemented**
-FINV                | **Not yet Implemented**
-FISHER              | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::FISHER
-FISHERINV           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::FISHERINV
-FORECAST            | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::FORECAST
-FREQUENCY           | **Not yet Implemented**
-FTEST               | **Not yet Implemented**
-GAMMADIST           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::GAMMADIST
-GAMMAINV            | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::GAMMAINV
-GAMMALN             | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::GAMMALN
-GEOMEAN             | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::GEOMEAN
-GROWTH              | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::GROWTH
-HARMEAN             | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::HARMEAN
-HYPGEOMDIST         | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::HYPGEOMDIST
-INTERCEPT           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::INTERCEPT
-KURT                | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::KURT
-LARGE               | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::LARGE
-LINEST              | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::LINEST
-LOGEST              | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::LOGEST
-LOGINV              | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::LOGINV
-LOGNORMDIST         | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::LOGNORMDIST
-MAX                 | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MAX
-MAXA                | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MAXA
-MAXIFS              | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MAXIFS
-MEDIAN              | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MEDIAN
-MEDIANIF            | **Not yet Implemented**
-MIN                 | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MIN
-MINA                | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MINA
-MINIFS              | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MINIFS
-MODE                | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MODE
-MODE.SNGL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MODE
-NEGBINOMDIST        | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::NEGBINOMDIST
-NORMDIST            | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::NORMDIST
-NORMINV             | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::NORMINV
-NORMSDIST           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::NORMSDIST
-NORMSINV            | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::NORMSINV
-PEARSON             | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::CORREL
-PERCENTILE          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::PERCENTILE
-PERCENTRANK         | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::PERCENTRANK
-PERMUT              | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::PERMUT
-POISSON             | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::POISSON
-PROB                | **Not yet Implemented**
-QUARTILE            | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::QUARTILE
-RANK                | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::RANK
-RSQ                 | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::RSQ
-SKEW                | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::SKEW
-SLOPE               | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::SLOPE
-SMALL               | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::SMALL
-STANDARDIZE         | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STANDARDIZE
-STDEV               | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STDEV
-STDEV.P             | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STDEVP
-STDEV.S             | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STDEV
-STDEVA              | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STDEVA
-STDEVP              | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STDEVP
-STDEVPA             | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STDEVPA
-STEYX               | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STEYX
-TDIST               | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::TDIST
-TINV                | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::TINV
-TREND               | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::TREND
-TRIMMEAN            | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::TRIMMEAN
-TTEST               | **Not yet Implemented**
-VAR                 | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::VARFunc
-VAR.P               | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::VARP
-VAR.S               | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::VARFunc
-VARA                | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::VARA
-VARP                | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::VARP
-VARPA               | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::VARPA
-WEIBULL             | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::WEIBULL
-ZTEST               | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::ZTEST
+Excel Function           | PhpSpreadsheet Function
+-------------------------|-------------------------------------------
+AVEDEV                   | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::AVEDEV
+AVERAGE                  | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::AVERAGE
+AVERAGEA                 | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::AVERAGEA
+AVERAGEIF                | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::AVERAGEIF
+AVERAGEIFS               | **Not yet Implemented**
+BETADIST                 | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::BETADIST
+BETA.DIST                | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::BETADIST
+BETAINV                  | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::BETAINV
+BETA.INV                 | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::BETAINV
+BINOMDIST                | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::BINOMDIST
+BINOM.DIST               | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::BINOMDIST
+BINOM.DIST.RANGE         | **Not yet Implemented**
+BINOM.INV                | **Not yet Implemented**
+CHIDIST                  | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::CHIDIST
+CHISQ.DIST               | **Not yet Implemented**
+CHISQ.DIST.RT            | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::CHIDIST
+CHIINV                   | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::CHIINV
+CHISQ.INV                | **Not yet Implemented**
+CHISQ.INV.RT             | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::CHIINV
+CHITEST                  | **Not yet Implemented**
+CHISQ.TEST               | **Not yet Implemented**
+CONFIDENCE               | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::CONFIDENCE
+CONFIDENCE.NORM          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::CONFIDENCE
+CONFIDENCE.T             | **Not yet Implemented**
+CORREL                   | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::CORREL
+COUNT                    | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::COUNT
+COUNTA                   | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::COUNTA
+COUNTBLANK               | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::COUNTBLANK
+COUNTIF                  | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::COUNTIF
+COUNTIFS                 | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::COUNTIFS
+COVAR                    | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::COVAR
+COVARIANCE.P             | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::COVAR
+COVARIANCE.S             | **Not yet Implemented**
+CRITBINOM                | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::CRITBINOM
+DEVSQ                    | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::DEVSQ
+EXPONDIST                | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::EXPONDIST
+EXPON.DIST               | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::EXPONDIST
+FDIST                    | **Not yet Implemented**
+F.DIST                   | **Not yet Implemented**
+F.DIST.RT                | **Not yet Implemented**
+FINV                     | **Not yet Implemented**
+F.INV                    | **Not yet Implemented**
+F.INV.RT                 | **Not yet Implemented**
+F.TEST                   | **Not yet Implemented**
+FISHER                   | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::FISHER
+FISHERINV                | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::FISHERINV
+FORECAST                 | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::FORECAST
+FORECAST.ETS             | **Not yet Implemented**
+FORECAST.ETS.CONFINT     | **Not yet Implemented**
+FORECAST.ETS.SEASONALITY | **Not yet Implemented**
+FORECAST.ETS.STAT        | **Not yet Implemented**
+FORECAST.LINEAR          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::FORECAST
+FREQUENCY                | **Not yet Implemented**
+FTEST                    | **Not yet Implemented**
+GAMMA                    | **Not yet Implemented**
+GAMMADIST                | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::GAMMADIST
+GAMMA.DIST               | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::GAMMADIST
+GAMMAINV                 | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::GAMMAINV
+GAMMA.INV                | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::GAMMAINV
+GAMMALN                  | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::GAMMALN
+GAMMALN.PRECISE          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::GAMMALN
+GAUSS                    | **Not yet Implemented**
+GEOMEAN                  | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::GEOMEAN
+GROWTH                   | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::GROWTH
+HARMEAN                  | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::HARMEAN
+HYPGEOMDIST              | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::HYPGEOMDIST
+INTERCEPT                | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::INTERCEPT
+KURT                     | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::KURT
+LARGE                    | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::LARGE
+LINEST                   | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::LINEST
+LOGEST                   | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::LOGEST
+LOGINV                   | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::LOGINV
+LOGNORMDIST              | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::LOGNORMDIST
+LOGNORM.DIST             | **Not yet Implemented**
+LOGNORM.INV              | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::LOGINV
+MAX                      | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MAX
+MAXA                     | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MAXA
+MAXIFS                   | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MAXIFS
+MEDIAN                   | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MEDIAN
+MEDIANIF                 | **Not yet Implemented**
+MIN                      | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MIN
+MINA                     | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MINA
+MINIFS                   | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MINIFS
+MODE                     | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MODE
+MODE.MULT                | **Not yet Implemented**
+MODE.SNGL                | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MODE
+NEGBINOMDIST             | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::NEGBINOMDIST
+NEGBINOM.DIST            | **Not yet Implemented**
+NORMDIST                 | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::NORMDIST
+NORM.DIST                | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::NORMDIST
+NORMINV                  | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::NORMINV
+NORM.INV                 | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::NORMINV
+NORMSDIST                | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::NORMSDIST
+NORM.S.DIST              | **Not yet Implemented**
+NORMSINV                 | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::NORMSINV
+NORM.S.INV               | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::NORMSINV
+PEARSON                  | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::CORREL
+PERCENTILE               | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::PERCENTILE
+PERCENTILE.EXC           | **Not yet Implemented**
+PERCENTILE.INC           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::PERCENTILE
+PERCENTRANK              | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::PERCENTRANK
+PERCENTRANK.EXC          | **Not yet Implemented**
+PERCENTRANK.INC          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::PERCENTRANK
+PERMUT                   | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::PERMUT
+PERMUTATIONA             | **Not yet Implemented**
+PHI                      | **Not yet Implemented**
+POISSON                  | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::POISSON
+POISSON.DIST             | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::POISSON
+PROB                     | **Not yet Implemented**
+QUARTILE                 | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::QUARTILE
+QUARTILE.EXC             | **Not yet Implemented**
+QUARTILE.INC             | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::QUARTILE
+RANK                     | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::RANK
+RANK.AVG                 | **Not yet Implemented**
+RANK.EQ                  | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::RANK
+RSQ                      | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::RSQ
+SKEW                     | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::SKEW
+SKEW.P                   | **Not yet Implemented**
+SLOPE                    | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::SLOPE
+SMALL                    | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::SMALL
+STANDARDIZE              | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STANDARDIZE
+STDEV                    | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STDEV
+STDEV.P                  | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STDEVP
+STDEV.S                  | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STDEV
+STDEVA                   | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STDEVA
+STDEVP                   | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STDEVP
+STDEVPA                  | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STDEVPA
+STEYX                    | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STEYX
+TDIST                    | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::TDIST
+T.DIST                   | **Not yet Implemented**
+T.DIST.2T                | **Not yet Implemented**
+T.DIST.RT                | **Not yet Implemented**
+TINV                     | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::TINV
+T.INV                    | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::TINV
+T.INV.2T                 | **Not yet Implemented**
+TREND                    | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::TREND
+TRIMMEAN                 | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::TRIMMEAN
+TTEST                    | **Not yet Implemented**
+T.TEST                   | **Not yet Implemented**
+VAR                      | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::VARFunc
+VAR.P                    | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::VARP
+VAR.S                    | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::VARFunc
+VARA                     | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::VARA
+VARP                     | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::VARP
+VARPA                    | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::VARPA
+WEIBULL                  | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::WEIBULL
+WEIBULL.DIST             | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::WEIBULL
+ZTEST                    | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::ZTEST
+Z.TEST                   | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::ZTEST
 
 ## CATEGORY_TEXT_AND_DATA
 
@@ -428,6 +501,7 @@ CLEAN               | \PhpOffice\PhpSpreadsheet\Calculation\TextData::TRIMNONPRI
 CODE                | \PhpOffice\PhpSpreadsheet\Calculation\TextData::ASCIICODE
 CONCAT              | \PhpOffice\PhpSpreadsheet\Calculation\TextData::CONCATENATE
 CONCATENATE         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::CONCATENATE
+DBCS                | **Not yet Implemented**
 DOLLAR              | \PhpOffice\PhpSpreadsheet\Calculation\TextData::DOLLAR
 EXACT               | \PhpOffice\PhpSpreadsheet\Calculation\TextData::EXACT
 FIND                | \PhpOffice\PhpSpreadsheet\Calculation\TextData::SEARCHSENSITIVE
@@ -460,3 +534,11 @@ UNICHAR             | \PhpOffice\PhpSpreadsheet\Calculation\TextData::CHARACTER
 UNICODE             | \PhpOffice\PhpSpreadsheet\Calculation\TextData::ASCIICODE
 UPPER               | \PhpOffice\PhpSpreadsheet\Calculation\TextData::UPPERCASE
 VALUE               | \PhpOffice\PhpSpreadsheet\Calculation\TextData::VALUE
+
+## CATEGORY_WEB
+
+Excel Function      | PhpSpreadsheet Function
+--------------------|-------------------------------------------
+ENCODEURL           | **Not yet Implemented**
+FILTERXML           | **Not yet Implemented**
+WEBSERVICE          | \PhpOffice\PhpSpreadsheet\Calculation\Web::WEBSERVICE
diff --git a/docs/references/function-list-by-name.md b/docs/references/function-list-by-name.md
index c787ee00..2341ee5f 100644
--- a/docs/references/function-list-by-name.md
+++ b/docs/references/function-list-by-name.md
@@ -2,536 +2,613 @@
 
 ## A
 
-Excel Function      | Category                       | PhpSpreadsheet Function
---------------------|--------------------------------|-------------------------------------------
-ABS                 | CATEGORY_MATH_AND_TRIG         | abs
-ACCRINT             | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::ACCRINT
-ACCRINTM            | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::ACCRINTM
-ACOS                | CATEGORY_MATH_AND_TRIG         | acos
-ACOSH               | CATEGORY_MATH_AND_TRIG         | acosh
-ACOT                | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::ACOT
-ACOTH               | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::ACOTH
-ADDRESS             | CATEGORY_LOOKUP_AND_REFERENCE  | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::cellAddress
-AMORDEGRC           | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::AMORDEGRC
-AMORLINC            | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::AMORLINC
-AND                 | CATEGORY_LOGICAL               | \PhpOffice\PhpSpreadsheet\Calculation\Logical::logicalAnd
-ARABIC              | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::ARABIC
-AREAS               | CATEGORY_LOOKUP_AND_REFERENCE  | **Not yet Implemented**
-ASC                 | CATEGORY_TEXT_AND_DATA         | **Not yet Implemented**
-ASIN                | CATEGORY_MATH_AND_TRIG         | asin
-ASINH               | CATEGORY_MATH_AND_TRIG         | asinh
-ATAN                | CATEGORY_MATH_AND_TRIG         | atan
-ATAN2               | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::ATAN2
-ATANH               | CATEGORY_MATH_AND_TRIG         | atanh
-AVEDEV              | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::AVEDEV
-AVERAGE             | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::AVERAGE
-AVERAGEA            | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::AVERAGEA
-AVERAGEIF           | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::AVERAGEIF
-AVERAGEIFS          | CATEGORY_STATISTICAL           | **Not yet Implemented**
+Excel Function           | Category                      | PhpSpreadsheet Function 
+-------------------------|-------------------------------|-------------------------
+ABS                      | CATEGORY_MATH_AND_TRIG        | abs
+ACCRINT                  | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::ACCRINT
+ACCRINTM                 | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::ACCRINTM
+ACOS                     | CATEGORY_MATH_AND_TRIG        | acos
+ACOSH                    | CATEGORY_MATH_AND_TRIG        | acosh
+ACOT                     | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::ACOT
+ACOTH                    | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::ACOTH
+ADDRESS                  | CATEGORY_LOOKUP_AND_REFERENCE | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::cellAddress
+AGGREGATE                | CATEGORY_MATH_AND_TRIG        | **Not yet Implemented**
+AMORDEGRC                | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::AMORDEGRC
+AMORLINC                 | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::AMORLINC
+AND                      | CATEGORY_LOGICAL              | \PhpOffice\PhpSpreadsheet\Calculation\Logical::logicalAnd
+ARABIC                   | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::ARABIC
+AREAS                    | CATEGORY_LOOKUP_AND_REFERENCE | **Not yet Implemented**
+ASC                      | CATEGORY_TEXT_AND_DATA        | **Not yet Implemented**
+ASIN                     | CATEGORY_MATH_AND_TRIG        | asin
+ASINH                    | CATEGORY_MATH_AND_TRIG        | asinh
+ATAN                     | CATEGORY_MATH_AND_TRIG        | atan
+ATAN2                    | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::ATAN2
+ATANH                    | CATEGORY_MATH_AND_TRIG        | atanh
+AVEDEV                   | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::AVEDEV
+AVERAGE                  | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::AVERAGE
+AVERAGEA                 | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::AVERAGEA
+AVERAGEIF                | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::AVERAGEIF
+AVERAGEIFS               | CATEGORY_STATISTICAL          | **Not yet Implemented**
 
 ## B
 
-Excel Function      | Category                       | PhpSpreadsheet Function
---------------------|--------------------------------|-------------------------------------------
-BAHTTEXT            | CATEGORY_TEXT_AND_DATA         | **Not yet Implemented**
-BASE                | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::BASE
-BESSELI             | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::BESSELI
-BESSELJ             | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::BESSELJ
-BESSELK             | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::BESSELK
-BESSELY             | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::BESSELY
-BETADIST            | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::BETADIST
-BETAINV             | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::BETAINV
-BIN2DEC             | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::BINTODEC
-BIN2HEX             | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::BINTOHEX
-BIN2OCT             | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::BINTOOCT
-BINOMDIST           | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::BINOMDIST
-BITAND              | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::BITAND
-BITLSHIFT           | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::BITLSHIFT
-BITOR               | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::BITOR
-BITRSHIFT           | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::BITRSHIFT
-BITXOR              | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::BITOR
+Excel Function           | Category                      | PhpSpreadsheet Function 
+-------------------------|-------------------------------|-------------------------
+BAHTTEXT                 | CATEGORY_TEXT_AND_DATA        | **Not yet Implemented**
+BASE                     | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::BASE
+BESSELI                  | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::BESSELI
+BESSELJ                  | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::BESSELJ
+BESSELK                  | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::BESSELK
+BESSELY                  | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::BESSELY
+BETADIST                 | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::BETADIST
+BETA.DIST                | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::BETADIST
+BETAINV                  | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::BETAINV
+BETA.INV                 | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::BETAINV
+BIN2DEC                  | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::BINTODEC
+BIN2HEX                  | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::BINTOHEX
+BIN2OCT                  | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::BINTOOCT
+BINOMDIST                | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::BINOMDIST
+BINOM.DIST               | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::BINOMDIST
+BINOM.DIST.RANGE         | CATEGORY_STATISTICAL          | **Not yet Implemented**
+BINOM.INV                | CATEGORY_STATISTICAL          | **Not yet Implemented**
+BITAND                   | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::BITAND
+BITLSHIFT                | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::BITLSHIFT
+BITOR                    | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::BITOR
+BITRSHIFT                | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::BITRSHIFT
+BITXOR                   | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::BITOR
 
 ## C
 
-Excel Function      | Category                       | PhpSpreadsheet Function
---------------------|--------------------------------|-------------------------------------------
-CEILING             | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::CEILING
-CELL                | CATEGORY_INFORMATION           | **Not yet Implemented**
-CHAR                | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::CHARACTER
-CHIDIST             | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::CHIDIST
-CHIINV              | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::CHIINV
-CHITEST             | CATEGORY_STATISTICAL           | **Not yet Implemented**
-CHOOSE              | CATEGORY_LOOKUP_AND_REFERENCE  | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::CHOOSE
-CLEAN               | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::TRIMNONPRINTABLE
-CODE                | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::ASCIICODE
-COLUMN              | CATEGORY_LOOKUP_AND_REFERENCE  | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::COLUMN
-COLUMNS             | CATEGORY_LOOKUP_AND_REFERENCE  | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::COLUMNS
-COMBIN              | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::COMBIN
-COMPLEX             | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::COMPLEX
-CONCAT              | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::CONCATENATE
-CONCATENATE         | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::CONCATENATE
-CONFIDENCE          | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::CONFIDENCE
-CONVERT             | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::CONVERTUOM
-CORREL              | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::CORREL
-COS                 | CATEGORY_MATH_AND_TRIG         | cos
-COSH                | CATEGORY_MATH_AND_TRIG         | cosh
-COT                 | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::COT
-COTH                | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::COTH
-COUNT               | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::COUNT
-COUNTA              | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::COUNTA
-COUNTBLANK          | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::COUNTBLANK
-COUNTIF             | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::COUNTIF
-COUNTIFS            | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::COUNTIFS
-COUPDAYBS           | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::COUPDAYBS
-COUPDAYS            | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::COUPDAYS
-COUPDAYSNC          | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::COUPDAYSNC
-COUPNCD             | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::COUPNCD
-COUPNUM             | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::COUPNUM
-COUPPCD             | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::COUPPCD
-COVAR               | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::COVAR
-CRITBINOM           | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::CRITBINOM
-CSC                 | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::CSC
-CSCH                | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::CSCH
-CUBEKPIMEMBER       | CATEGORY_CUBE                  | **Not yet Implemented**
-CUBEMEMBER          | CATEGORY_CUBE                  | **Not yet Implemented**
-CUBEMEMBERPROPERTY  | CATEGORY_CUBE                  | **Not yet Implemented**
-CUBERANKEDMEMBER    | CATEGORY_CUBE                  | **Not yet Implemented**
-CUBESET             | CATEGORY_CUBE                  | **Not yet Implemented**
-CUBESETCOUNT        | CATEGORY_CUBE                  | **Not yet Implemented**
-CUBEVALUE           | CATEGORY_CUBE                  | **Not yet Implemented**
-CUMIPMT             | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::CUMIPMT
-CUMPRINC            | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::CUMPRINC
+Excel Function           | Category                      | PhpSpreadsheet Function 
+-------------------------|-------------------------------|-------------------------
+CEILING                  | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::CEILING
+CEILING.MATH             | CATEGORY_MATH_AND_TRIG        | **Not yet Implemented**
+CEILING.PRECISE          | CATEGORY_MATH_AND_TRIG        | **Not yet Implemented**
+CELL                     | CATEGORY_INFORMATION          | **Not yet Implemented**
+CHAR                     | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::CHARACTER
+CHIDIST                  | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::CHIDIST
+CHIINV                   | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::CHIINV
+CHISQ.DIST               | CATEGORY_STATISTICAL          | **Not yet Implemented**
+CHISQ.DIST.RT            | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::CHIDIST
+CHISQ.INV                | CATEGORY_STATISTICAL          | **Not yet Implemented**
+CHISQ.INV.RT             | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::CHIINV
+CHISQ.TEST               | CATEGORY_STATISTICAL          | **Not yet Implemented**
+CHITEST                  | CATEGORY_STATISTICAL          | **Not yet Implemented**
+CHOOSE                   | CATEGORY_LOOKUP_AND_REFERENCE | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::CHOOSE
+CLEAN                    | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::TRIMNONPRINTABLE
+CODE                     | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::ASCIICODE
+COLUMN                   | CATEGORY_LOOKUP_AND_REFERENCE | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::COLUMN
+COLUMNS                  | CATEGORY_LOOKUP_AND_REFERENCE | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::COLUMNS
+COMBIN                   | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::COMBIN
+COMBINA                  | CATEGORY_MATH_AND_TRIG        | **Not yet Implemented**
+COMPLEX                  | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::COMPLEX
+CONCAT                   | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::CONCATENATE
+CONCATENATE              | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::CONCATENATE
+CONFIDENCE               | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::CONFIDENCE
+CONFIDENCE.NORM          | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::CONFIDENCE
+CONFIDENCE.T             | CATEGORY_STATISTICAL          | **Not yet Implemented**
+CONVERT                  | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::CONVERTUOM
+CORREL                   | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::CORREL
+COS                      | CATEGORY_MATH_AND_TRIG        | cos
+COSH                     | CATEGORY_MATH_AND_TRIG        | cosh
+COT                      | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::COT
+COTH                     | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::COTH
+COUNT                    | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::COUNT
+COUNTA                   | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::COUNTA
+COUNTBLANK               | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::COUNTBLANK
+COUNTIF                  | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::COUNTIF
+COUNTIFS                 | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::COUNTIFS
+COUPDAYBS                | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::COUPDAYBS
+COUPDAYS                 | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::COUPDAYS
+COUPDAYSNC               | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::COUPDAYSNC
+COUPNCD                  | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::COUPNCD
+COUPNUM                  | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::COUPNUM
+COUPPCD                  | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::COUPPCD
+COVAR                    | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::COVAR
+COVARIANCE.P             | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::COVAR
+COVARIANCE.S             | CATEGORY_STATISTICAL          | **Not yet Implemented**
+CRITBINOM                | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::CRITBINOM
+CSC                      | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::CSC
+CSCH                     | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::CSCH
+CUBEKPIMEMBER            | CATEGORY_CUBE                 | **Not yet Implemented**
+CUBEMEMBER               | CATEGORY_CUBE                 | **Not yet Implemented**
+CUBEMEMBERPROPERTY       | CATEGORY_CUBE                 | **Not yet Implemented**
+CUBERANKEDMEMBER         | CATEGORY_CUBE                 | **Not yet Implemented**
+CUBESET                  | CATEGORY_CUBE                 | **Not yet Implemented**
+CUBESETCOUNT             | CATEGORY_CUBE                 | **Not yet Implemented**
+CUBEVALUE                | CATEGORY_CUBE                 | **Not yet Implemented**
+CUMIPMT                  | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::CUMIPMT
+CUMPRINC                 | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::CUMPRINC
 
 ## D
 
-Excel Function      | Category                       | PhpSpreadsheet Function
---------------------|--------------------------------|-------------------------------------------
-DATE                | CATEGORY_DATE_AND_TIME         | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::DATE
-DATEDIF             | CATEGORY_DATE_AND_TIME         | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::DATEDIF
-DATEVALUE           | CATEGORY_DATE_AND_TIME         | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::DATEVALUE
-DAVERAGE            | CATEGORY_DATABASE              | \PhpOffice\PhpSpreadsheet\Calculation\Database::DAVERAGE
-DAY                 | CATEGORY_DATE_AND_TIME         | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::DAYOFMONTH
-DAYS                | CATEGORY_DATE_AND_TIME         | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::DAYS
-DAYS360             | CATEGORY_DATE_AND_TIME         | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::DAYS360
-DB                  | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::DB
-DCOUNT              | CATEGORY_DATABASE              | \PhpOffice\PhpSpreadsheet\Calculation\Database::DCOUNT
-DCOUNTA             | CATEGORY_DATABASE              | \PhpOffice\PhpSpreadsheet\Calculation\Database::DCOUNTA
-DDB                 | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::DDB
-DEC2BIN             | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::DECTOBIN
-DEC2HEX             | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::DECTOHEX
-DEC2OCT             | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::DECTOOCT
-DEGREES             | CATEGORY_MATH_AND_TRIG         | rad2deg
-DELTA               | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::DELTA
-DEVSQ               | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::DEVSQ
-DGET                | CATEGORY_DATABASE              | \PhpOffice\PhpSpreadsheet\Calculation\Database::DGET
-DISC                | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::DISC
-DMAX                | CATEGORY_DATABASE              | \PhpOffice\PhpSpreadsheet\Calculation\Database::DMAX
-DMIN                | CATEGORY_DATABASE              | \PhpOffice\PhpSpreadsheet\Calculation\Database::DMIN
-DOLLAR              | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::DOLLAR
-DOLLARDE            | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::DOLLARDE
-DOLLARFR            | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::DOLLARFR
-DPRODUCT            | CATEGORY_DATABASE              | \PhpOffice\PhpSpreadsheet\Calculation\Database::DPRODUCT
-DSTDEV              | CATEGORY_DATABASE              | \PhpOffice\PhpSpreadsheet\Calculation\Database::DSTDEV
-DSTDEVP             | CATEGORY_DATABASE              | \PhpOffice\PhpSpreadsheet\Calculation\Database::DSTDEVP
-DSUM                | CATEGORY_DATABASE              | \PhpOffice\PhpSpreadsheet\Calculation\Database::DSUM
-DURATION            | CATEGORY_FINANCIAL             | **Not yet Implemented**
-DVAR                | CATEGORY_DATABASE              | \PhpOffice\PhpSpreadsheet\Calculation\Database::DVAR
-DVARP               | CATEGORY_DATABASE              | \PhpOffice\PhpSpreadsheet\Calculation\Database::DVARP
+Excel Function           | Category                      | PhpSpreadsheet Function 
+-------------------------|-------------------------------|-------------------------
+DATE                     | CATEGORY_DATE_AND_TIME        | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::DATE
+DATEDIF                  | CATEGORY_DATE_AND_TIME        | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::DATEDIF
+DATEVALUE                | CATEGORY_DATE_AND_TIME        | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::DATEVALUE
+DAVERAGE                 | CATEGORY_DATABASE             | \PhpOffice\PhpSpreadsheet\Calculation\Database::DAVERAGE
+DAY                      | CATEGORY_DATE_AND_TIME        | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::DAYOFMONTH
+DAYS                     | CATEGORY_DATE_AND_TIME        | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::DAYS
+DAYS360                  | CATEGORY_DATE_AND_TIME        | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::DAYS360
+DB                       | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::DB
+DBCS                     | CATEGORY_TEXT_AND_DATA        | **Not yet Implemented**
+DCOUNT                   | CATEGORY_DATABASE             | \PhpOffice\PhpSpreadsheet\Calculation\Database::DCOUNT
+DCOUNTA                  | CATEGORY_DATABASE             | \PhpOffice\PhpSpreadsheet\Calculation\Database::DCOUNTA
+DDB                      | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::DDB
+DEC2BIN                  | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::DECTOBIN
+DEC2HEX                  | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::DECTOHEX
+DEC2OCT                  | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::DECTOOCT
+DECIMAL                  | CATEGORY_MATH_AND_TRIG        | **Not yet Implemented**
+DEGREES                  | CATEGORY_MATH_AND_TRIG        | rad2deg
+DELTA                    | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::DELTA
+DEVSQ                    | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::DEVSQ
+DGET                     | CATEGORY_DATABASE             | \PhpOffice\PhpSpreadsheet\Calculation\Database::DGET
+DISC                     | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::DISC
+DMAX                     | CATEGORY_DATABASE             | \PhpOffice\PhpSpreadsheet\Calculation\Database::DMAX
+DMIN                     | CATEGORY_DATABASE             | \PhpOffice\PhpSpreadsheet\Calculation\Database::DMIN
+DOLLAR                   | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::DOLLAR
+DOLLARDE                 | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::DOLLARDE
+DOLLARFR                 | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::DOLLARFR
+DPRODUCT                 | CATEGORY_DATABASE             | \PhpOffice\PhpSpreadsheet\Calculation\Database::DPRODUCT
+DSTDEV                   | CATEGORY_DATABASE             | \PhpOffice\PhpSpreadsheet\Calculation\Database::DSTDEV
+DSTDEVP                  | CATEGORY_DATABASE             | \PhpOffice\PhpSpreadsheet\Calculation\Database::DSTDEVP
+DSUM                     | CATEGORY_DATABASE             | \PhpOffice\PhpSpreadsheet\Calculation\Database::DSUM
+DURATION                 | CATEGORY_FINANCIAL            | **Not yet Implemented**
+DVAR                     | CATEGORY_DATABASE             | \PhpOffice\PhpSpreadsheet\Calculation\Database::DVAR
+DVARP                    | CATEGORY_DATABASE             | \PhpOffice\PhpSpreadsheet\Calculation\Database::DVARP
 
 ## E
 
-Excel Function      | Category                       | PhpSpreadsheet Function
---------------------|--------------------------------|-------------------------------------------
-EDATE               | CATEGORY_DATE_AND_TIME         | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::EDATE
-EFFECT              | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::EFFECT
-EOMONTH             | CATEGORY_DATE_AND_TIME         | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::EOMONTH
-ERF                 | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::ERF
-ERF.PRECISE         | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::ERFPRECISE
-ERFC                | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::ERFC
-ERFC.PRECISE        | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::ERFC
-ERROR.TYPE          | CATEGORY_INFORMATION           | \PhpOffice\PhpSpreadsheet\Calculation\Functions::errorType
-EVEN                | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::EVEN
-EXACT               | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::EXACT
-EXP                 | CATEGORY_MATH_AND_TRIG         | exp
-EXPONDIST           | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::EXPONDIST
+Excel Function           | Category                      | PhpSpreadsheet Function 
+-------------------------|-------------------------------|-------------------------
+EDATE                    | CATEGORY_DATE_AND_TIME        | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::EDATE
+EFFECT                   | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::EFFECT
+ENCODEURL                | CATEGORY_TEXT_AND_DATA        | **Not yet Implemented**
+EOMONTH                  | CATEGORY_DATE_AND_TIME        | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::EOMONTH
+ERF                      | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::ERF
+ERFC                     | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::ERFC
+ERFC.PRECISE             | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::ERFC
+ERF.PRECISE              | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::ERFPRECISE
+ERROR.TYPE               | CATEGORY_INFORMATION          | \PhpOffice\PhpSpreadsheet\Calculation\Functions::errorType
+EVEN                     | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::EVEN
+EXACT                    | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::EXACT
+EXP                      | CATEGORY_MATH_AND_TRIG        | exp
+EXPONDIST                | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::EXPONDIST
+EXPON.DIST               | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::EXPONDIST
 
 ## F
 
-Excel Function      | Category                       | PhpSpreadsheet Function
---------------------|--------------------------------|-------------------------------------------
-FACT                | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::FACT
-FACTDOUBLE          | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::FACTDOUBLE
-FALSE               | CATEGORY_LOGICAL               | \PhpOffice\PhpSpreadsheet\Calculation\Logical::FALSE
-FDIST               | CATEGORY_STATISTICAL           | **Not yet Implemented**
-FIND                | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::SEARCHSENSITIVE
-FINDB               | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::SEARCHSENSITIVE
-FINV                | CATEGORY_STATISTICAL           | **Not yet Implemented**
-FISHER              | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::FISHER
-FISHERINV           | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::FISHERINV
-FIXED               | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::FIXEDFORMAT
-FLOOR               | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::FLOOR
-FLOOR.MATH          | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::FLOORMATH
-FLOOR.PRECISE       | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::FLOORPRECISE
-FORECAST            | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::FORECAST
-FORMULATEXT         | CATEGORY_LOOKUP_AND_REFERENCE  | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::FORMULATEXT
-FREQUENCY           | CATEGORY_STATISTICAL           | **Not yet Implemented**
-FTEST               | CATEGORY_STATISTICAL           | **Not yet Implemented**
-FV                  | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::FV
-FVSCHEDULE          | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::FVSCHEDULE
+Excel Function           | Category                      | PhpSpreadsheet Function 
+-------------------------|-------------------------------|-------------------------
+FACT                     | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::FACT
+FACTDOUBLE               | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::FACTDOUBLE
+FALSE                    | CATEGORY_LOGICAL              | \PhpOffice\PhpSpreadsheet\Calculation\Logical::FALSE
+FDIST                    | CATEGORY_STATISTICAL          | **Not yet Implemented**
+F.DIST                   | CATEGORY_STATISTICAL          | **Not yet Implemented**
+F.DIST.RT                | CATEGORY_STATISTICAL          | **Not yet Implemented**
+FILTER                   | CATEGORY_LOOKUP_AND_REFERENCE | **Not yet Implemented**
+FILTERXML                | CATEGORY_TEXT_AND_DATA        | **Not yet Implemented**
+FIND                     | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::SEARCHSENSITIVE
+FINDB                    | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::SEARCHSENSITIVE
+FINV                     | CATEGORY_STATISTICAL          | **Not yet Implemented**
+F.INV                    | CATEGORY_STATISTICAL          | **Not yet Implemented**
+F.INV.RT                 | CATEGORY_STATISTICAL          | **Not yet Implemented**
+FISHER                   | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::FISHER
+FISHERINV                | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::FISHERINV
+FIXED                    | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::FIXEDFORMAT
+FLOOR                    | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::FLOOR
+FLOOR.MATH               | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::FLOORMATH
+FLOOR.PRECISE            | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::FLOORPRECISE
+FORECAST                 | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::FORECAST
+FORECAST.ETS             | CATEGORY_STATISTICAL          | **Not yet Implemented**
+FORECAST.ETS.CONFINT     | CATEGORY_STATISTICAL          | **Not yet Implemented**
+FORECAST.ETS.SEASONALITY | CATEGORY_STATISTICAL          | **Not yet Implemented**
+FORECAST.ETS.STAT        | CATEGORY_STATISTICAL          | **Not yet Implemented**
+FORECAST.LINEAR          | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::FORECAST
+FORMULATEXT              | CATEGORY_LOOKUP_AND_REFERENCE | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::FORMULATEXT
+FREQUENCY                | CATEGORY_STATISTICAL          | **Not yet Implemented**
+FTEST                    | CATEGORY_STATISTICAL          | **Not yet Implemented**
+F.TEST                   | CATEGORY_STATISTICAL          | **Not yet Implemented**
+FV                       | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::FV
+FVSCHEDULE               | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::FVSCHEDULE
 
 ## G
 
-Excel Function      | Category                       | PhpSpreadsheet Function
---------------------|--------------------------------|-------------------------------------------
-GAMMADIST           | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::GAMMADIST
-GAMMAINV            | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::GAMMAINV
-GAMMALN             | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::GAMMALN
-GCD                 | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::GCD
-GEOMEAN             | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::GEOMEAN
-GESTEP              | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::GESTEP
-GETPIVOTDATA        | CATEGORY_LOOKUP_AND_REFERENCE  | **Not yet Implemented**
-GROWTH              | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::GROWTH
+Excel Function           | Category                      | PhpSpreadsheet Function 
+-------------------------|-------------------------------|-------------------------
+GAMMA                    | CATEGORY_STATISTICAL          | **Not yet Implemented**
+GAMMADIST                | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::GAMMADIST
+GAMMA.DIST               | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::GAMMADIST
+GAMMAINV                 | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::GAMMAINV
+GAMMA.INV                | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::GAMMAINV
+GAMMALN                  | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::GAMMALN
+GAMMALN.PRECISE          | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::GAMMALN
+GAUSS                    | CATEGORY_STATISTICAL          | **Not yet Implemented**
+GCD                      | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::GCD
+GEOMEAN                  | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::GEOMEAN
+GESTEP                   | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::GESTEP
+GETPIVOTDATA             | CATEGORY_LOOKUP_AND_REFERENCE | **Not yet Implemented**
+GROWTH                   | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::GROWTH
 
 ## H
 
-Excel Function      | Category                       | PhpSpreadsheet Function
---------------------|--------------------------------|-------------------------------------------
-HARMEAN             | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::HARMEAN
-HEX2BIN             | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::HEXTOBIN
-HEX2DEC             | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::HEXTODEC
-HEX2OCT             | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::HEXTOOCT
-HLOOKUP             | CATEGORY_LOOKUP_AND_REFERENCE  | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::HLOOKUP
-HOUR                | CATEGORY_DATE_AND_TIME         | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::HOUROFDAY
-HYPERLINK           | CATEGORY_LOOKUP_AND_REFERENCE  | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::HYPERLINK
-HYPGEOMDIST         | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::HYPGEOMDIST
+Excel Function           | Category                      | PhpSpreadsheet Function 
+-------------------------|-------------------------------|-------------------------
+HARMEAN                  | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::HARMEAN
+HEX2BIN                  | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::HEXTOBIN
+HEX2DEC                  | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::HEXTODEC
+HEX2OCT                  | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::HEXTOOCT
+HLOOKUP                  | CATEGORY_LOOKUP_AND_REFERENCE | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::HLOOKUP
+HOUR                     | CATEGORY_DATE_AND_TIME        | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::HOUROFDAY
+HYPERLINK                | CATEGORY_LOOKUP_AND_REFERENCE | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::HYPERLINK
+HYPGEOMDIST              | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::HYPGEOMDIST
 
 ## I
 
-Excel Function      | Category                       | PhpSpreadsheet Function
---------------------|--------------------------------|-------------------------------------------
-IF                  | CATEGORY_LOGICAL               | \PhpOffice\PhpSpreadsheet\Calculation\Logical::statementIf
-IFERROR             | CATEGORY_LOGICAL               | \PhpOffice\PhpSpreadsheet\Calculation\Logical::IFERROR
-IFNA                | CATEGORY_LOGICAL               | \PhpOffice\PhpSpreadsheet\Calculation\Logical::IFNA
-IFS                 | CATEGORY_LOGICAL               | \PhpOffice\PhpSpreadsheet\Calculation\Logical::IFS
-IMABS               | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMABS
-IMAGINARY           | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMAGINARY
-IMARGUMENT          | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMARGUMENT
-IMCONJUGATE         | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMCONJUGATE
-IMCOS               | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMCOS
-IMCOSH              | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMCOSH
-IMCOT               | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMCOT
-IMCSC               | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMCSC
-IMCSCH              | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMCSCH
-IMDIV               | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMDIV
-IMEXP               | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMEXP
-IMLN                | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMLN
-IMLOG10             | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMLOG10
-IMLOG2              | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMLOG2
-IMPOWER             | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMPOWER
-IMPRODUCT           | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMPRODUCT
-IMREAL              | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMREAL
-IMSEC               | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMSEC
-IMSECH              | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMSECH
-IMSIN               | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMSIN
-IMSINH              | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMSINH
-IMSQRT              | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMSQRT
-IMSUB               | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMSUB
-IMSUM               | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMSUM
-IMTAN               | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMTAN
-INDEX               | CATEGORY_LOOKUP_AND_REFERENCE  | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::INDEX
-INDIRECT            | CATEGORY_LOOKUP_AND_REFERENCE  | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::INDIRECT
-INFO                | CATEGORY_INFORMATION           | **Not yet Implemented**
-INT                 | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::INT
-INTERCEPT           | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::INTERCEPT
-INTRATE             | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::INTRATE
-IPMT                | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::IPMT
-IRR                 | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::IRR
-ISBLANK             | CATEGORY_INFORMATION           | \PhpOffice\PhpSpreadsheet\Calculation\Functions::isBlank
-ISERR               | CATEGORY_INFORMATION           | \PhpOffice\PhpSpreadsheet\Calculation\Functions::isErr
-ISERROR             | CATEGORY_INFORMATION           | \PhpOffice\PhpSpreadsheet\Calculation\Functions::isError
-ISEVEN              | CATEGORY_INFORMATION           | \PhpOffice\PhpSpreadsheet\Calculation\Functions::isEven
-ISFORMULA           | CATEGORY_INFORMATION           | \PhpOffice\PhpSpreadsheet\Calculation\Functions::isFormula
-ISLOGICAL           | CATEGORY_INFORMATION           | \PhpOffice\PhpSpreadsheet\Calculation\Functions::isLogical
-ISNA                | CATEGORY_INFORMATION           | \PhpOffice\PhpSpreadsheet\Calculation\Functions::isNa
-ISNONTEXT           | CATEGORY_INFORMATION           | \PhpOffice\PhpSpreadsheet\Calculation\Functions::isNonText
-ISNUMBER            | CATEGORY_INFORMATION           | \PhpOffice\PhpSpreadsheet\Calculation\Functions::isNumber
-ISODD               | CATEGORY_INFORMATION           | \PhpOffice\PhpSpreadsheet\Calculation\Functions::isOdd
-ISOWEEKNUM          | CATEGORY_DATE_AND_TIME         | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::ISOWEEKNUM
-ISPMT               | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::ISPMT
-ISREF               | CATEGORY_INFORMATION           | **Not yet Implemented**
-ISTEXT              | CATEGORY_INFORMATION           | \PhpOffice\PhpSpreadsheet\Calculation\Functions::isText
+Excel Function           | Category                      | PhpSpreadsheet Function 
+-------------------------|-------------------------------|-------------------------
+IF                       | CATEGORY_LOGICAL              | \PhpOffice\PhpSpreadsheet\Calculation\Logical::statementIf
+IFERROR                  | CATEGORY_LOGICAL              | \PhpOffice\PhpSpreadsheet\Calculation\Logical::IFERROR
+IFNA                     | CATEGORY_LOGICAL              | \PhpOffice\PhpSpreadsheet\Calculation\Logical::IFNA
+IFS                      | CATEGORY_LOGICAL              | \PhpOffice\PhpSpreadsheet\Calculation\Logical::IFS
+IMABS                    | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMABS
+IMAGINARY                | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMAGINARY
+IMARGUMENT               | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMARGUMENT
+IMCONJUGATE              | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMCONJUGATE
+IMCOS                    | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMCOS
+IMCOSH                   | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMCOSH
+IMCOT                    | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMCOT
+IMCSC                    | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMCSC
+IMCSCH                   | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMCSCH
+IMDIV                    | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMDIV
+IMEXP                    | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMEXP
+IMLN                     | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMLN
+IMLOG10                  | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMLOG10
+IMLOG2                   | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMLOG2
+IMPOWER                  | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMPOWER
+IMPRODUCT                | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMPRODUCT
+IMREAL                   | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMREAL
+IMSEC                    | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMSEC
+IMSECH                   | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMSECH
+IMSIN                    | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMSIN
+IMSINH                   | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMSINH
+IMSQRT                   | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMSQRT
+IMSUB                    | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMSUB
+IMSUM                    | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMSUM
+IMTAN                    | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::IMTAN
+INDEX                    | CATEGORY_LOOKUP_AND_REFERENCE | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::INDEX
+INDIRECT                 | CATEGORY_LOOKUP_AND_REFERENCE | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::INDIRECT
+INFO                     | CATEGORY_INFORMATION          | **Not yet Implemented**
+INT                      | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::INT
+INTERCEPT                | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::INTERCEPT
+INTRATE                  | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::INTRATE
+IPMT                     | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::IPMT
+IRR                      | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::IRR
+ISBLANK                  | CATEGORY_INFORMATION          | \PhpOffice\PhpSpreadsheet\Calculation\Functions::isBlank
+ISERR                    | CATEGORY_INFORMATION          | \PhpOffice\PhpSpreadsheet\Calculation\Functions::isErr
+ISERROR                  | CATEGORY_INFORMATION          | \PhpOffice\PhpSpreadsheet\Calculation\Functions::isError
+ISEVEN                   | CATEGORY_INFORMATION          | \PhpOffice\PhpSpreadsheet\Calculation\Functions::isEven
+ISFORMULA                | CATEGORY_INFORMATION          | \PhpOffice\PhpSpreadsheet\Calculation\Functions::isFormula
+ISLOGICAL                | CATEGORY_INFORMATION          | \PhpOffice\PhpSpreadsheet\Calculation\Functions::isLogical
+ISNA                     | CATEGORY_INFORMATION          | \PhpOffice\PhpSpreadsheet\Calculation\Functions::isNa
+ISNONTEXT                | CATEGORY_INFORMATION          | \PhpOffice\PhpSpreadsheet\Calculation\Functions::isNonText
+ISNUMBER                 | CATEGORY_INFORMATION          | \PhpOffice\PhpSpreadsheet\Calculation\Functions::isNumber
+ISO.CEILING              | CATEGORY_MATH_AND_TRIG        | **Not yet Implemented**
+ISODD                    | CATEGORY_INFORMATION          | \PhpOffice\PhpSpreadsheet\Calculation\Functions::isOdd
+ISOWEEKNUM               | CATEGORY_DATE_AND_TIME        | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::ISOWEEKNUM
+ISPMT                    | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::ISPMT
+ISREF                    | CATEGORY_INFORMATION          | **Not yet Implemented**
+ISTEXT                   | CATEGORY_INFORMATION          | \PhpOffice\PhpSpreadsheet\Calculation\Functions::isText
 
 ## J
 
-Excel Function      | Category                       | PhpSpreadsheet Function
---------------------|--------------------------------|-------------------------------------------
-JIS                 | CATEGORY_TEXT_AND_DATA         | **Not yet Implemented**
+Excel Function           | Category                      | PhpSpreadsheet Function 
+-------------------------|-------------------------------|-------------------------
+JIS                      | CATEGORY_TEXT_AND_DATA        | **Not yet Implemented**
 
 ## K
 
-Excel Function      | Category                       | PhpSpreadsheet Function
---------------------|--------------------------------|-------------------------------------------
-KURT                | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::KURT
+Excel Function           | Category                      | PhpSpreadsheet Function 
+-------------------------|-------------------------------|-------------------------
+KURT                     | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::KURT
 
 ## L
 
-Excel Function      | Category                       | PhpSpreadsheet Function
---------------------|--------------------------------|-------------------------------------------
-LARGE               | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::LARGE
-LCM                 | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::LCM
-LEFT                | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::LEFT
-LEFTB               | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::LEFT
-LEN                 | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::STRINGLENGTH
-LENB                | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::STRINGLENGTH
-LINEST              | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::LINEST
-LN                  | CATEGORY_MATH_AND_TRIG         | log
-LOG                 | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::logBase
-LOG10               | CATEGORY_MATH_AND_TRIG         | log10
-LOGEST              | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::LOGEST
-LOGINV              | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::LOGINV
-LOGNORMDIST         | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::LOGNORMDIST
-LOOKUP              | CATEGORY_LOOKUP_AND_REFERENCE  | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::LOOKUP
-LOWER               | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::LOWERCASE
+Excel Function           | Category                      | PhpSpreadsheet Function 
+-------------------------|-------------------------------|-------------------------
+LARGE                    | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::LARGE
+LCM                      | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::LCM
+LEFT                     | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::LEFT
+LEFTB                    | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::LEFT
+LEN                      | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::STRINGLENGTH
+LENB                     | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::STRINGLENGTH
+LINEST                   | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::LINEST
+LN                       | CATEGORY_MATH_AND_TRIG        | log
+LOG                      | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::logBase
+LOG10                    | CATEGORY_MATH_AND_TRIG        | log10
+LOGEST                   | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::LOGEST
+LOGINV                   | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::LOGINV
+LOGNORMDIST              | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::LOGNORMDIST
+LOGNORM.DIST             | CATEGORY_STATISTICAL          | **Not yet Implemented**
+LOGNORM.INV              | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::LOGINV
+LOOKUP                   | CATEGORY_LOOKUP_AND_REFERENCE | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::LOOKUP
+LOWER                    | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::LOWERCASE
 
 ## M
 
-Excel Function      | Category                       | PhpSpreadsheet Function
---------------------|--------------------------------|-------------------------------------------
-MATCH               | CATEGORY_LOOKUP_AND_REFERENCE  | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::MATCH
-MAX                 | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MAX
-MAXA                | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MAXA
-MAXIFS              | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MAXIFS
-MDETERM             | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::MDETERM
-MDURATION           | CATEGORY_FINANCIAL             | **Not yet Implemented**
-MEDIAN              | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MEDIAN
-MEDIANIF            | CATEGORY_STATISTICAL           | **Not yet Implemented**
-MID                 | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::MID
-MIDB                | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::MID
-MIN                 | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MIN
-MINA                | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MINA
-MINIFS              | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MINIFS
-MINUTE              | CATEGORY_DATE_AND_TIME         | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::MINUTE
-MINVERSE            | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::MINVERSE
-MIRR                | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::MIRR
-MMULT               | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::MMULT
-MOD                 | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::MOD
-MODE                | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MODE
-MODE.SNGL           | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MODE
-MONTH               | CATEGORY_DATE_AND_TIME         | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::MONTHOFYEAR
-MROUND              | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::MROUND
-MULTINOMIAL         | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::MULTINOMIAL
+Excel Function           | Category                      | PhpSpreadsheet Function 
+-------------------------|-------------------------------|-------------------------
+MATCH                    | CATEGORY_LOOKUP_AND_REFERENCE | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::MATCH
+MAX                      | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MAX
+MAXA                     | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MAXA
+MAXIFS                   | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MAXIFS
+MDETERM                  | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::MDETERM
+MDURATION                | CATEGORY_FINANCIAL            | **Not yet Implemented**
+MEDIAN                   | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MEDIAN
+MEDIANIF                 | CATEGORY_STATISTICAL          | **Not yet Implemented**
+MID                      | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::MID
+MIDB                     | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::MID
+MIN                      | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MIN
+MINA                     | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MINA
+MINIFS                   | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MINIFS
+MINUTE                   | CATEGORY_DATE_AND_TIME        | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::MINUTE
+MINVERSE                 | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::MINVERSE
+MIRR                     | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::MIRR
+MMULT                    | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::MMULT
+MOD                      | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::MOD
+MODE                     | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MODE
+MODE.MULT                | CATEGORY_STATISTICAL          | **Not yet Implemented**
+MODE.SNGL                | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::MODE
+MONTH                    | CATEGORY_DATE_AND_TIME        | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::MONTHOFYEAR
+MROUND                   | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::MROUND
+MULTINOMIAL              | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::MULTINOMIAL
+MUNIT                    | CATEGORY_MATH_AND_TRIG        | **Not yet Implemented**
 
 ## N
 
-Excel Function      | Category                       | PhpSpreadsheet Function
---------------------|--------------------------------|-------------------------------------------
-N                   | CATEGORY_INFORMATION           | \PhpOffice\PhpSpreadsheet\Calculation\Functions::n
-NA                  | CATEGORY_INFORMATION           | \PhpOffice\PhpSpreadsheet\Calculation\Functions::NA
-NEGBINOMDIST        | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::NEGBINOMDIST
-NETWORKDAYS         | CATEGORY_DATE_AND_TIME         | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::NETWORKDAYS
-NETWORKDAYS.INTL    | CATEGORY_DATE_AND_TIME         | **Not yet Implemented**
-NOMINAL             | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::NOMINAL
-NORMDIST            | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::NORMDIST
-NORMINV             | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::NORMINV
-NORMSDIST           | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::NORMSDIST
-NORMSINV            | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::NORMSINV
-NOT                 | CATEGORY_LOGICAL               | \PhpOffice\PhpSpreadsheet\Calculation\Logical::NOT
-NOW                 | CATEGORY_DATE_AND_TIME         | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::DATETIMENOW
-NPER                | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::NPER
-NPV                 | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::NPV
-NUMBERVALUE         | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::NUMBERVALUE
+Excel Function           | Category                      | PhpSpreadsheet Function 
+-------------------------|-------------------------------|-------------------------
+N                        | CATEGORY_INFORMATION          | \PhpOffice\PhpSpreadsheet\Calculation\Functions::n
+NA                       | CATEGORY_INFORMATION          | \PhpOffice\PhpSpreadsheet\Calculation\Functions::NA
+NEGBINOMDIST             | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::NEGBINOMDIST
+NEGBINOM.DIST            | CATEGORY_STATISTICAL          | **Not yet Implemented**
+NETWORKDAYS              | CATEGORY_DATE_AND_TIME        | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::NETWORKDAYS
+NETWORKDAYS.INTL         | CATEGORY_DATE_AND_TIME        | **Not yet Implemented**
+NOMINAL                  | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::NOMINAL
+NORMDIST                 | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::NORMDIST
+NORM.DIST                | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::NORMDIST
+NORMINV                  | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::NORMINV
+NORM.INV                 | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::NORMINV
+NORMSDIST                | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::NORMSDIST
+NORM.S.DIST              | CATEGORY_STATISTICAL          | **Not yet Implemented**
+NORMSINV                 | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::NORMSINV
+NORM.S.INV               | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::NORMSINV
+NOT                      | CATEGORY_LOGICAL              | \PhpOffice\PhpSpreadsheet\Calculation\Logical::NOT
+NOW                      | CATEGORY_DATE_AND_TIME        | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::DATETIMENOW
+NPER                     | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::NPER
+NPV                      | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::NPV
+NUMBERVALUE              | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::NUMBERVALUE
 
 ## O
 
-Excel Function      | Category                       | PhpSpreadsheet Function
---------------------|--------------------------------|-------------------------------------------
-OCT2BIN             | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::OCTTOBIN
-OCT2DEC             | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::OCTTODEC
-OCT2HEX             | CATEGORY_ENGINEERING           | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::OCTTOHEX
-ODD                 | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::ODD
-ODDFPRICE           | CATEGORY_FINANCIAL             | **Not yet Implemented**
-ODDFYIELD           | CATEGORY_FINANCIAL             | **Not yet Implemented**
-ODDLPRICE           | CATEGORY_FINANCIAL             | **Not yet Implemented**
-ODDLYIELD           | CATEGORY_FINANCIAL             | **Not yet Implemented**
-OFFSET              | CATEGORY_LOOKUP_AND_REFERENCE  | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::OFFSET
-OR                  | CATEGORY_LOGICAL               | \PhpOffice\PhpSpreadsheet\Calculation\Logical::logicalOr
+Excel Function           | Category                      | PhpSpreadsheet Function 
+-------------------------|-------------------------------|-------------------------
+OCT2BIN                  | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::OCTTOBIN
+OCT2DEC                  | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::OCTTODEC
+OCT2HEX                  | CATEGORY_ENGINEERING          | \PhpOffice\PhpSpreadsheet\Calculation\Engineering::OCTTOHEX
+ODD                      | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::ODD
+ODDFPRICE                | CATEGORY_FINANCIAL            | **Not yet Implemented**
+ODDFYIELD                | CATEGORY_FINANCIAL            | **Not yet Implemented**
+ODDLPRICE                | CATEGORY_FINANCIAL            | **Not yet Implemented**
+ODDLYIELD                | CATEGORY_FINANCIAL            | **Not yet Implemented**
+OFFSET                   | CATEGORY_LOOKUP_AND_REFERENCE | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::OFFSET
+OR                       | CATEGORY_LOGICAL              | \PhpOffice\PhpSpreadsheet\Calculation\Logical::logicalOr
 
 ## P
 
-Excel Function      | Category                       | PhpSpreadsheet Function
---------------------|--------------------------------|-------------------------------------------
-PDURATION           | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::PDURATION
-PEARSON             | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::CORREL
-PERCENTILE          | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::PERCENTILE
-PERCENTRANK         | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::PERCENTRANK
-PERMUT              | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::PERMUT
-PHONETIC            | CATEGORY_TEXT_AND_DATA         | **Not yet Implemented**
-PI                  | CATEGORY_MATH_AND_TRIG         | pi
-PMT                 | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::PMT
-POISSON             | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::POISSON
-POWER               | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::POWER
-PPMT                | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::PPMT
-PRICE               | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::PRICE
-PRICEDISC           | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::PRICEDISC
-PRICEMAT            | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::PRICEMAT
-PROB                | CATEGORY_STATISTICAL           | **Not yet Implemented**
-PRODUCT             | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::PRODUCT
-PROPER              | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::PROPERCASE
-PV                  | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::PV
+Excel Function           | Category                      | PhpSpreadsheet Function 
+-------------------------|-------------------------------|-------------------------
+PDURATION                | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::PDURATION
+PEARSON                  | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::CORREL
+PERCENTILE               | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::PERCENTILE
+PERCENTILE.EXC           | CATEGORY_STATISTICAL          | **Not yet Implemented**
+PERCENTILE.INC           | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::PERCENTILE
+PERCENTRANK              | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::PERCENTRANK
+PERCENTRANK.EXC          | CATEGORY_STATISTICAL          | **Not yet Implemented**
+PERCENTRANK.INC          | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::PERCENTRANK
+PERMUT                   | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::PERMUT
+PERMUTATIONA             | CATEGORY_STATISTICAL          | **Not yet Implemented**
+PHI                      | CATEGORY_STATISTICAL          | **Not yet Implemented**
+PHONETIC                 | CATEGORY_TEXT_AND_DATA        | **Not yet Implemented**
+PI                       | CATEGORY_MATH_AND_TRIG        | pi
+PMT                      | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::PMT
+POISSON                  | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::POISSON
+POISSON.DIST             | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::POISSON
+POWER                    | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::POWER
+PPMT                     | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::PPMT
+PRICE                    | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::PRICE
+PRICEDISC                | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::PRICEDISC
+PRICEMAT                 | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::PRICEMAT
+PROB                     | CATEGORY_STATISTICAL          | **Not yet Implemented**
+PRODUCT                  | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::PRODUCT
+PROPER                   | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::PROPERCASE
+PV                       | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::PV
 
 ## Q
 
-Excel Function      | Category                       | PhpSpreadsheet Function
---------------------|--------------------------------|-------------------------------------------
-QUARTILE            | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::QUARTILE
-QUOTIENT            | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::QUOTIENT
+Excel Function           | Category                      | PhpSpreadsheet Function 
+-------------------------|-------------------------------|-------------------------
+QUARTILE                 | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::QUARTILE
+QUARTILE.EXC             | CATEGORY_STATISTICAL          | **Not yet Implemented**
+QUARTILE.INC             | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::QUARTILE
+QUOTIENT                 | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::QUOTIENT
 
 ## R
 
-Excel Function      | Category                       | PhpSpreadsheet Function
---------------------|--------------------------------|-------------------------------------------
-RADIANS             | CATEGORY_MATH_AND_TRIG         | deg2rad
-RAND                | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::RAND
-RANDBETWEEN         | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::RAND
-RANK                | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::RANK
-RATE                | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::RATE
-RECEIVED            | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::RECEIVED
-REPLACE             | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::REPLACE
-REPLACEB            | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::REPLACE
-REPT                | CATEGORY_TEXT_AND_DATA         | str_repeat
-RIGHT               | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::RIGHT
-RIGHTB              | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::RIGHT
-ROMAN               | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::ROMAN
-ROUND               | CATEGORY_MATH_AND_TRIG         | round
-ROUNDDOWN           | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::ROUNDDOWN
-ROUNDUP             | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::ROUNDUP
-ROW                 | CATEGORY_LOOKUP_AND_REFERENCE  | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::ROW
-ROWS                | CATEGORY_LOOKUP_AND_REFERENCE  | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::ROWS
-RRI                 | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::RRI
-RSQ                 | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::RSQ
-RTD                 | CATEGORY_LOOKUP_AND_REFERENCE  | **Not yet Implemented**
+Excel Function           | Category                      | PhpSpreadsheet Function 
+-------------------------|-------------------------------|-------------------------
+RADIANS                  | CATEGORY_MATH_AND_TRIG        | deg2rad
+RAND                     | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::RAND
+RANDARRAY                | CATEGORY_MATH_AND_TRIG        | **Not yet Implemented**
+RANDBETWEEN              | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::RAND
+RANK                     | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::RANK
+RANK.AVG                 | CATEGORY_STATISTICAL          | **Not yet Implemented**
+RANK.EQ                  | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::RANK
+RATE                     | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::RATE
+RECEIVED                 | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::RECEIVED
+REPLACE                  | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::REPLACE
+REPLACEB                 | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::REPLACE
+REPT                     | CATEGORY_TEXT_AND_DATA        | str_repeat
+RIGHT                    | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::RIGHT
+RIGHTB                   | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::RIGHT
+ROMAN                    | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::ROMAN
+ROUND                    | CATEGORY_MATH_AND_TRIG        | round
+ROUNDDOWN                | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::ROUNDDOWN
+ROUNDUP                  | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::ROUNDUP
+ROW                      | CATEGORY_LOOKUP_AND_REFERENCE | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::ROW
+ROWS                     | CATEGORY_LOOKUP_AND_REFERENCE | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::ROWS
+RRI                      | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::RRI
+RSQ                      | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::RSQ
+RTD                      | CATEGORY_LOOKUP_AND_REFERENCE | **Not yet Implemented**
 
 ## S
 
-Excel Function      | Category                       | PhpSpreadsheet Function
---------------------|--------------------------------|-------------------------------------------
-SEARCH              | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::SEARCHINSENSITIVE
-SEARCHB             | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::SEARCHINSENSITIVE
-SEC                 | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SEC
-SECH                | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SECH
-SECOND              | CATEGORY_DATE_AND_TIME         | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::SECOND
-SERIESSUM           | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SERIESSUM
-SHEET               | CATEGORY_INFORMATION           | **Not yet Implemented**
-SHEETS              | CATEGORY_INFORMATION           | **Not yet Implemented**
-SIGN                | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SIGN
-SIN                 | CATEGORY_MATH_AND_TRIG         | sin
-SINH                | CATEGORY_MATH_AND_TRIG         | sinh
-SKEW                | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::SKEW
-SLN                 | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::SLN
-SLOPE               | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::SLOPE
-SMALL               | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::SMALL
-SQRT                | CATEGORY_MATH_AND_TRIG         | sqrt
-SQRTPI              | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SQRTPI
-STANDARDIZE         | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STANDARDIZE
-STDEV               | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STDEV
-STDEV.P             | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STDEVP
-STDEV.S             | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STDEV
-STDEVA              | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STDEVA
-STDEVP              | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STDEVP
-STDEVPA             | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STDEVPA
-STEYX               | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STEYX
-SUBSTITUTE          | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::SUBSTITUTE
-SUBTOTAL            | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SUBTOTAL
-SUM                 | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SUM
-SUMIF               | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SUMIF
-SUMIFS              | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SUMIFS
-SUMPRODUCT          | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SUMPRODUCT
-SUMSQ               | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SUMSQ
-SUMX2MY2            | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SUMX2MY2
-SUMX2PY2            | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SUMX2PY2
-SUMXMY2             | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SUMXMY2
-SWITCH              | CATEGORY_LOGICAL               | \PhpOffice\PhpSpreadsheet\Calculation\Logical::statementSwitch
-SYD                 | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::SYD
+Excel Function           | Category                      | PhpSpreadsheet Function 
+-------------------------|-------------------------------|-------------------------
+SEARCH                   | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::SEARCHINSENSITIVE
+SEARCHB                  | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::SEARCHINSENSITIVE
+SEC                      | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SEC
+SECH                     | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SECH
+SECOND                   | CATEGORY_DATE_AND_TIME        | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::SECOND
+SEQUENCE                 | CATEGORY_MATH_AND_TRIG        | **Not yet Implemented**
+SERIESSUM                | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SERIESSUM
+SHEET                    | CATEGORY_INFORMATION          | **Not yet Implemented**
+SHEETS                   | CATEGORY_INFORMATION          | **Not yet Implemented**
+SIGN                     | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SIGN
+SIN                      | CATEGORY_MATH_AND_TRIG        | sin
+SINH                     | CATEGORY_MATH_AND_TRIG        | sinh
+SKEW                     | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::SKEW
+SKEW.P                   | CATEGORY_STATISTICAL          | **Not yet Implemented**
+SLN                      | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::SLN
+SLOPE                    | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::SLOPE
+SMALL                    | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::SMALL
+SORT                     | CATEGORY_LOOKUP_AND_REFERENCE | **Not yet Implemented**
+SORTBY                   | CATEGORY_LOOKUP_AND_REFERENCE | **Not yet Implemented**
+SQRT                     | CATEGORY_MATH_AND_TRIG        | sqrt
+SQRTPI                   | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SQRTPI
+STANDARDIZE              | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STANDARDIZE
+STDEV                    | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STDEV
+STDEVA                   | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STDEVA
+STDEVP                   | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STDEVP
+STDEV.P                  | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STDEVP
+STDEVPA                  | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STDEVPA
+STDEV.S                  | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STDEV
+STEYX                    | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::STEYX
+SUBSTITUTE               | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::SUBSTITUTE
+SUBTOTAL                 | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SUBTOTAL
+SUM                      | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SUM
+SUMIF                    | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SUMIF
+SUMIFS                   | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SUMIFS
+SUMPRODUCT               | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SUMPRODUCT
+SUMSQ                    | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SUMSQ
+SUMX2MY2                 | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SUMX2MY2
+SUMX2PY2                 | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SUMX2PY2
+SUMXMY2                  | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::SUMXMY2
+SWITCH                   | CATEGORY_LOGICAL              | \PhpOffice\PhpSpreadsheet\Calculation\Logical::statementSwitch
+SYD                      | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::SYD
 
 ## T
 
-Excel Function      | Category                       | PhpSpreadsheet Function
---------------------|--------------------------------|-------------------------------------------
-T                   | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::RETURNSTRING
-TAN                 | CATEGORY_MATH_AND_TRIG         | tan
-TANH                | CATEGORY_MATH_AND_TRIG         | tanh
-TBILLEQ             | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::TBILLEQ
-TBILLPRICE          | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::TBILLPRICE
-TBILLYIELD          | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::TBILLYIELD
-TDIST               | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::TDIST
-TEXT                | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::TEXTFORMAT
-TEXTJOIN            | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::TEXTJOIN
-TIME                | CATEGORY_DATE_AND_TIME         | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::TIME
-TIMEVALUE           | CATEGORY_DATE_AND_TIME         | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::TIMEVALUE
-TINV                | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::TINV
-TODAY               | CATEGORY_DATE_AND_TIME         | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::DATENOW
-TRANSPOSE           | CATEGORY_LOOKUP_AND_REFERENCE  | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::TRANSPOSE
-TREND               | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::TREND
-TRIM                | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::TRIMSPACES
-TRIMMEAN            | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::TRIMMEAN
-TRUE                | CATEGORY_LOGICAL               | \PhpOffice\PhpSpreadsheet\Calculation\Logical::TRUE
-TRUNC               | CATEGORY_MATH_AND_TRIG         | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::TRUNC
-TTEST               | CATEGORY_STATISTICAL           | **Not yet Implemented**
-TYPE                | CATEGORY_INFORMATION           | \PhpOffice\PhpSpreadsheet\Calculation\Functions::TYPE
+Excel Function           | Category                      | PhpSpreadsheet Function 
+-------------------------|-------------------------------|-------------------------
+T                        | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::RETURNSTRING
+TAN                      | CATEGORY_MATH_AND_TRIG        | tan
+TANH                     | CATEGORY_MATH_AND_TRIG        | tanh
+TBILLEQ                  | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::TBILLEQ
+TBILLPRICE               | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::TBILLPRICE
+TBILLYIELD               | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::TBILLYIELD
+TDIST                    | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::TDIST
+T.DIST                   | CATEGORY_STATISTICAL          | **Not yet Implemented**
+T.DIST.2T                | CATEGORY_STATISTICAL          | **Not yet Implemented**
+T.DIST.RT                | CATEGORY_STATISTICAL          | **Not yet Implemented**
+TEXT                     | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::TEXTFORMAT
+TEXTJOIN                 | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::TEXTJOIN
+TIME                     | CATEGORY_DATE_AND_TIME        | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::TIME
+TIMEVALUE                | CATEGORY_DATE_AND_TIME        | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::TIMEVALUE
+TINV                     | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::TINV
+T.INV                    | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::TINV
+T.INV.2T                 | CATEGORY_STATISTICAL          | **Not yet Implemented**
+TODAY                    | CATEGORY_DATE_AND_TIME        | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::DATENOW
+TRANSPOSE                | CATEGORY_LOOKUP_AND_REFERENCE | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::TRANSPOSE
+TREND                    | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::TREND
+TRIM                     | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::TRIMSPACES
+TRIMMEAN                 | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::TRIMMEAN
+TRUE                     | CATEGORY_LOGICAL              | \PhpOffice\PhpSpreadsheet\Calculation\Logical::TRUE
+TRUNC                    | CATEGORY_MATH_AND_TRIG        | \PhpOffice\PhpSpreadsheet\Calculation\MathTrig::TRUNC
+TTEST                    | CATEGORY_STATISTICAL          | **Not yet Implemented**
+T.TEST                   | CATEGORY_STATISTICAL          | **Not yet Implemented**
+TYPE                     | CATEGORY_INFORMATION          | \PhpOffice\PhpSpreadsheet\Calculation\Functions::TYPE
 
 ## U
 
-Excel Function      | Category                       | PhpSpreadsheet Function
---------------------|--------------------------------|-------------------------------------------
-UNICHAR             | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::CHARACTER
-UNICODE             | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::ASCIICODE
-UPPER               | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::UPPERCASE
-USDOLLAR            | CATEGORY_FINANCIAL             | **Not yet Implemented**
+Excel Function           | Category                      | PhpSpreadsheet Function 
+-------------------------|-------------------------------|-------------------------
+UNICHAR                  | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::CHARACTER
+UNICODE                  | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::ASCIICODE
+UNIQUE                   | CATEGORY_LOOKUP_AND_REFERENCE | **Not yet Implemented**
+UPPER                    | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::UPPERCASE
+USDOLLAR                 | CATEGORY_FINANCIAL            | **Not yet Implemented**
 
 ## V
 
-Excel Function      | Category                       | PhpSpreadsheet Function
---------------------|--------------------------------|-------------------------------------------
-VALUE               | CATEGORY_TEXT_AND_DATA         | \PhpOffice\PhpSpreadsheet\Calculation\TextData::VALUE
-VAR                 | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::VARFunc
-VAR.P               | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::VARP
-VAR.S               | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::VARFunc
-VARA                | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::VARA
-VARP                | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::VARP
-VARPA               | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::VARPA
-VDB                 | CATEGORY_FINANCIAL             | **Not yet Implemented**
-VLOOKUP             | CATEGORY_LOOKUP_AND_REFERENCE  | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::VLOOKUP
+Excel Function           | Category                      | PhpSpreadsheet Function 
+-------------------------|-------------------------------|-------------------------
+VALUE                    | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\TextData::VALUE
+VAR                      | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::VARFunc
+VARA                     | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::VARA
+VARP                     | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::VARP
+VAR.P                    | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::VARP
+VARPA                    | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::VARPA
+VAR.S                    | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::VARFunc
+VDB                      | CATEGORY_FINANCIAL            | **Not yet Implemented**
+VLOOKUP                  | CATEGORY_LOOKUP_AND_REFERENCE | \PhpOffice\PhpSpreadsheet\Calculation\LookupRef::VLOOKUP
 
 ## W
 
-Excel Function      | Category                       | PhpSpreadsheet Function
---------------------|--------------------------------|-------------------------------------------
-WEEKDAY             | CATEGORY_DATE_AND_TIME         | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::WEEKDAY
-WEEKNUM             | CATEGORY_DATE_AND_TIME         | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::WEEKNUM
-WEIBULL             | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::WEIBULL
-WORKDAY             | CATEGORY_DATE_AND_TIME         | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::WORKDAY
-WORKDAY.INTL        | CATEGORY_DATE_AND_TIME         | **Not yet Implemented**
+Excel Function           | Category                      | PhpSpreadsheet Function 
+-------------------------|-------------------------------|-------------------------
+WEBSERVICE               | CATEGORY_TEXT_AND_DATA        | \PhpOffice\PhpSpreadsheet\Calculation\Web::WEBSERVICE
+WEEKDAY                  | CATEGORY_DATE_AND_TIME        | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::WEEKDAY
+WEEKNUM                  | CATEGORY_DATE_AND_TIME        | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::WEEKNUM
+WEIBULL                  | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::WEIBULL
+WEIBULL.DIST             | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::WEIBULL
+WORKDAY                  | CATEGORY_DATE_AND_TIME        | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::WORKDAY
+WORKDAY.INTL             | CATEGORY_DATE_AND_TIME        | **Not yet Implemented**
 
 ## X
 
-Excel Function      | Category                       | PhpSpreadsheet Function
---------------------|--------------------------------|-------------------------------------------
-XIRR                | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::XIRR
-XNPV                | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::XNPV
-XOR                 | CATEGORY_LOGICAL               | \PhpOffice\PhpSpreadsheet\Calculation\Logical::logicalXor
+Excel Function           | Category                      | PhpSpreadsheet Function 
+-------------------------|-------------------------------|-------------------------
+XIRR                     | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::XIRR
+XLOOKUP                  | CATEGORY_LOOKUP_AND_REFERENCE | **Not yet Implemented**
+XMATCH                   | CATEGORY_LOOKUP_AND_REFERENCE | **Not yet Implemented**
+XNPV                     | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::XNPV
+XOR                      | CATEGORY_LOGICAL              | \PhpOffice\PhpSpreadsheet\Calculation\Logical::logicalXor
 
 ## Y
 
-Excel Function      | Category                       | PhpSpreadsheet Function
---------------------|--------------------------------|-------------------------------------------
-YEAR                | CATEGORY_DATE_AND_TIME         | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::YEAR
-YEARFRAC            | CATEGORY_DATE_AND_TIME         | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::YEARFRAC
-YIELD               | CATEGORY_FINANCIAL             | **Not yet Implemented**
-YIELDDISC           | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::YIELDDISC
-YIELDMAT            | CATEGORY_FINANCIAL             | \PhpOffice\PhpSpreadsheet\Calculation\Financial::YIELDMAT
+Excel Function           | Category                      | PhpSpreadsheet Function 
+-------------------------|-------------------------------|-------------------------
+YEAR                     | CATEGORY_DATE_AND_TIME        | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::YEAR
+YEARFRAC                 | CATEGORY_DATE_AND_TIME        | \PhpOffice\PhpSpreadsheet\Calculation\DateTime::YEARFRAC
+YIELD                    | CATEGORY_FINANCIAL            | **Not yet Implemented**
+YIELDDISC                | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::YIELDDISC
+YIELDMAT                 | CATEGORY_FINANCIAL            | \PhpOffice\PhpSpreadsheet\Calculation\Financial::YIELDMAT
 
 ## Z
 
-Excel Function      | Category                       | PhpSpreadsheet Function
---------------------|--------------------------------|-------------------------------------------
-ZTEST               | CATEGORY_STATISTICAL           | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::ZTEST
+Excel Function           | Category                      | PhpSpreadsheet Function 
+-------------------------|-------------------------------|-------------------------
+ZTEST                    | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::ZTEST
+Z.TEST                   | CATEGORY_STATISTICAL          | \PhpOffice\PhpSpreadsheet\Calculation\Statistical::ZTEST
diff --git a/src/PhpSpreadsheet/Calculation/Calculation.php b/src/PhpSpreadsheet/Calculation/Calculation.php
index a8f93a88..af6574bf 100644
--- a/src/PhpSpreadsheet/Calculation/Calculation.php
+++ b/src/PhpSpreadsheet/Calculation/Calculation.php
@@ -253,6 +253,11 @@ class Calculation
             'functionCall' => [LookupRef::class, 'cellAddress'],
             'argumentCount' => '2-5',
         ],
+        'AGGREGATE' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3+',
+        ],
         'AMORDEGRC' => [
             'category' => Category::CATEGORY_FINANCIAL,
             'functionCall' => [Financial::class, 'AMORDEGRC'],
@@ -368,11 +373,21 @@ class Calculation
             'functionCall' => [Statistical::class, 'BETADIST'],
             'argumentCount' => '3-5',
         ],
+        'BETA.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '4-6',
+        ],
         'BETAINV' => [
             'category' => Category::CATEGORY_STATISTICAL,
             'functionCall' => [Statistical::class, 'BETAINV'],
             'argumentCount' => '3-5',
         ],
+        'BETA.INV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical::class, 'BETAINV'],
+            'argumentCount' => '3-5',
+        ],
         'BIN2DEC' => [
             'category' => Category::CATEGORY_ENGINEERING,
             'functionCall' => [Engineering::class, 'BINTODEC'],
@@ -393,6 +408,21 @@ class Calculation
             'functionCall' => [Statistical::class, 'BINOMDIST'],
             'argumentCount' => '4',
         ],
+        'BINOM.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical::class, 'BINOMDIST'],
+            'argumentCount' => '4',
+        ],
+        'BINOM.DIST.RANGE' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3,4',
+        ],
+        'BINOM.INV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3',
+        ],
         'BITAND' => [
             'category' => Category::CATEGORY_ENGINEERING,
             'functionCall' => [Engineering::class, 'BITAND'],
@@ -423,6 +453,16 @@ class Calculation
             'functionCall' => [MathTrig::class, 'CEILING'],
             'argumentCount' => '2',
         ],
+        'CEILING.MATH' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3',
+        ],
+        'CEILING.PRECISE' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
         'CELL' => [
             'category' => Category::CATEGORY_INFORMATION,
             'functionCall' => [Functions::class, 'DUMMY'],
@@ -438,16 +478,41 @@ class Calculation
             'functionCall' => [Statistical::class, 'CHIDIST'],
             'argumentCount' => '2',
         ],
+        'CHISQ.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3',
+        ],
+        'CHISQ.DIST.RT' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical::class, 'CHIDIST'],
+            'argumentCount' => '2',
+        ],
         'CHIINV' => [
             'category' => Category::CATEGORY_STATISTICAL,
             'functionCall' => [Statistical::class, 'CHIINV'],
             'argumentCount' => '2',
         ],
+        'CHISQ.INV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
+        'CHISQ.INV.RT' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical::class, 'CHIINV'],
+            'argumentCount' => '2',
+        ],
         'CHITEST' => [
             'category' => Category::CATEGORY_STATISTICAL,
             'functionCall' => [Functions::class, 'DUMMY'],
             'argumentCount' => '2',
         ],
+        'CHISQ.TEST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
         'CHOOSE' => [
             'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
             'functionCall' => [LookupRef::class, 'CHOOSE'],
@@ -479,6 +544,11 @@ class Calculation
             'functionCall' => [MathTrig::class, 'COMBIN'],
             'argumentCount' => '2',
         ],
+        'COMBINA' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
         'COMPLEX' => [
             'category' => Category::CATEGORY_ENGINEERING,
             'functionCall' => [Engineering::class, 'COMPLEX'],
@@ -499,6 +569,16 @@ class Calculation
             'functionCall' => [Statistical::class, 'CONFIDENCE'],
             'argumentCount' => '3',
         ],
+        'CONFIDENCE.NORM' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical::class, 'CONFIDENCE'],
+            'argumentCount' => '3',
+        ],
+        'CONFIDENCE.T' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3',
+        ],
         'CONVERT' => [
             'category' => Category::CATEGORY_ENGINEERING,
             'functionCall' => [Engineering::class, 'CONVERTUOM'],
@@ -589,6 +669,16 @@ class Calculation
             'functionCall' => [Statistical::class, 'COVAR'],
             'argumentCount' => '2',
         ],
+        'COVARIANCE.P' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical::class, 'COVAR'],
+            'argumentCount' => '2',
+        ],
+        'COVARIANCE.S' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
         'CRITBINOM' => [
             'category' => Category::CATEGORY_STATISTICAL,
             'functionCall' => [Statistical::class, 'CRITBINOM'],
@@ -689,6 +779,11 @@ class Calculation
             'functionCall' => [Financial::class, 'DB'],
             'argumentCount' => '4,5',
         ],
+        'DBCS' => [
+            'category' => Category::CATEGORY_TEXT_AND_DATA,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1',
+        ],
         'DCOUNT' => [
             'category' => Category::CATEGORY_DATABASE,
             'functionCall' => [Database::class, 'DCOUNT'],
@@ -719,6 +814,11 @@ class Calculation
             'functionCall' => [Engineering::class, 'DECTOOCT'],
             'argumentCount' => '1,2',
         ],
+        'DECIMAL' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
         'DEGREES' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
             'functionCall' => 'rad2deg',
@@ -814,6 +914,11 @@ class Calculation
             'functionCall' => [Financial::class, 'EFFECT'],
             'argumentCount' => '2',
         ],
+        'ENCODEURL' => [
+            'category' => Category::CATEGORY_WEB,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1',
+        ],
         'EOMONTH' => [
             'category' => Category::CATEGORY_DATE_AND_TIME,
             'functionCall' => [DateTime::class, 'EOMONTH'],
@@ -864,6 +969,11 @@ class Calculation
             'functionCall' => [Statistical::class, 'EXPONDIST'],
             'argumentCount' => '3',
         ],
+        'EXPON.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical::class, 'EXPONDIST'],
+            'argumentCount' => '3',
+        ],
         'FACT' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
             'functionCall' => [MathTrig::class, 'FACT'],
@@ -884,6 +994,26 @@ class Calculation
             'functionCall' => [Functions::class, 'DUMMY'],
             'argumentCount' => '3',
         ],
+        'F.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '4',
+        ],
+        'F.DIST.RT' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3',
+        ],
+        'FILTER' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3+',
+        ],
+        'FILTERXML' => [
+            'category' => Category::CATEGORY_WEB,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
         'FIND' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
             'functionCall' => [TextData::class, 'SEARCHSENSITIVE'],
@@ -899,6 +1029,16 @@ class Calculation
             'functionCall' => [Functions::class, 'DUMMY'],
             'argumentCount' => '3',
         ],
+        'F.INV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3',
+        ],
+        'F.INV.RT' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3',
+        ],
         'FISHER' => [
             'category' => Category::CATEGORY_STATISTICAL,
             'functionCall' => [Statistical::class, 'FISHER'],
@@ -934,6 +1074,31 @@ class Calculation
             'functionCall' => [Statistical::class, 'FORECAST'],
             'argumentCount' => '3',
         ],
+        'FORECAST.ETS' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3-6',
+        ],
+        'FORECAST.ETS.CONFINT' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3-6',
+        ],
+        'FORECAST.ETS.SEASONALITY' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2-4',
+        ],
+        'FORECAST.ETS.STAT' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3-6',
+        ],
+        'FORECAST.LINEAR' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical::class, 'FORECAST'],
+            'argumentCount' => '3',
+        ],
         'FORMULATEXT' => [
             'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
             'functionCall' => [LookupRef::class, 'FORMULATEXT'],
@@ -951,6 +1116,11 @@ class Calculation
             'functionCall' => [Functions::class, 'DUMMY'],
             'argumentCount' => '2',
         ],
+        'F.TEST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
         'FV' => [
             'category' => Category::CATEGORY_FINANCIAL,
             'functionCall' => [Financial::class, 'FV'],
@@ -961,21 +1131,46 @@ class Calculation
             'functionCall' => [Financial::class, 'FVSCHEDULE'],
             'argumentCount' => '2',
         ],
+        'GAMMA' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1',
+        ],
         'GAMMADIST' => [
             'category' => Category::CATEGORY_STATISTICAL,
             'functionCall' => [Statistical::class, 'GAMMADIST'],
             'argumentCount' => '4',
         ],
+        'GAMMA.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical::class, 'GAMMADIST'],
+            'argumentCount' => '4',
+        ],
         'GAMMAINV' => [
             'category' => Category::CATEGORY_STATISTICAL,
             'functionCall' => [Statistical::class, 'GAMMAINV'],
             'argumentCount' => '3',
         ],
+        'GAMMA.INV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical::class, 'GAMMAINV'],
+            'argumentCount' => '3',
+        ],
         'GAMMALN' => [
             'category' => Category::CATEGORY_STATISTICAL,
             'functionCall' => [Statistical::class, 'GAMMALN'],
             'argumentCount' => '1',
         ],
+        'GAMMALN.PRECISE' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical::class, 'GAMMALN'],
+            'argumentCount' => '1',
+        ],
+        'GAUSS' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1',
+        ],
         'GCD' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
             'functionCall' => [MathTrig::class, 'GCD'],
@@ -1275,6 +1470,11 @@ class Calculation
             'functionCall' => [Functions::class, 'isNumber'],
             'argumentCount' => '1',
         ],
+        'ISO.CEILING' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1,2',
+        ],
         'ISODD' => [
             'category' => Category::CATEGORY_INFORMATION,
             'functionCall' => [Functions::class, 'isOdd'],
@@ -1375,6 +1575,16 @@ class Calculation
             'functionCall' => [Statistical::class, 'LOGNORMDIST'],
             'argumentCount' => '3',
         ],
+        'LOGNORM.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '4',
+        ],
+        'LOGNORM.INV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical::class, 'LOGINV'],
+            'argumentCount' => '3',
+        ],
         'LOOKUP' => [
             'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
             'functionCall' => [LookupRef::class, 'LOOKUP'],
@@ -1480,6 +1690,11 @@ class Calculation
             'functionCall' => [Statistical::class, 'MODE'],
             'argumentCount' => '1+',
         ],
+        'MODE.MULT' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1+',
+        ],
         'MODE.SNGL' => [
             'category' => Category::CATEGORY_STATISTICAL,
             'functionCall' => [Statistical::class, 'MODE'],
@@ -1500,6 +1715,11 @@ class Calculation
             'functionCall' => [MathTrig::class, 'MULTINOMIAL'],
             'argumentCount' => '1+',
         ],
+        'MUNIT' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1',
+        ],
         'N' => [
             'category' => Category::CATEGORY_INFORMATION,
             'functionCall' => [Functions::class, 'n'],
@@ -1515,6 +1735,11 @@ class Calculation
             'functionCall' => [Statistical::class, 'NEGBINOMDIST'],
             'argumentCount' => '3',
         ],
+        'NEGBINOM.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '4',
+        ],
         'NETWORKDAYS' => [
             'category' => Category::CATEGORY_DATE_AND_TIME,
             'functionCall' => [DateTime::class, 'NETWORKDAYS'],
@@ -1535,21 +1760,41 @@ class Calculation
             'functionCall' => [Statistical::class, 'NORMDIST'],
             'argumentCount' => '4',
         ],
+        'NORM.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical::class, 'NORMDIST'],
+            'argumentCount' => '4',
+        ],
         'NORMINV' => [
             'category' => Category::CATEGORY_STATISTICAL,
             'functionCall' => [Statistical::class, 'NORMINV'],
             'argumentCount' => '3',
         ],
+        'NORM.INV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical::class, 'NORMINV'],
+            'argumentCount' => '3',
+        ],
         'NORMSDIST' => [
             'category' => Category::CATEGORY_STATISTICAL,
             'functionCall' => [Statistical::class, 'NORMSDIST'],
             'argumentCount' => '1',
         ],
+        'NORM.S.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1,2',
+        ],
         'NORMSINV' => [
             'category' => Category::CATEGORY_STATISTICAL,
             'functionCall' => [Statistical::class, 'NORMSINV'],
             'argumentCount' => '1',
         ],
+        'NORM.S.INV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical::class, 'NORMSINV'],
+            'argumentCount' => '1',
+        ],
         'NOT' => [
             'category' => Category::CATEGORY_LOGICAL,
             'functionCall' => [Logical::class, 'NOT'],
@@ -1642,21 +1887,51 @@ class Calculation
             'functionCall' => [Statistical::class, 'PERCENTILE'],
             'argumentCount' => '2',
         ],
+        'PERCENTILE.EXC' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
+        'PERCENTILE.INC' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical::class, 'PERCENTILE'],
+            'argumentCount' => '2',
+        ],
         'PERCENTRANK' => [
             'category' => Category::CATEGORY_STATISTICAL,
             'functionCall' => [Statistical::class, 'PERCENTRANK'],
             'argumentCount' => '2,3',
         ],
+        'PERCENTRANK.EXC' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2,3',
+        ],
+        'PERCENTRANK.INC' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical::class, 'PERCENTRANK'],
+            'argumentCount' => '2,3',
+        ],
         'PERMUT' => [
             'category' => Category::CATEGORY_STATISTICAL,
             'functionCall' => [Statistical::class, 'PERMUT'],
             'argumentCount' => '2',
         ],
+        'PERMUTATIONA' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
         'PHONETIC' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
             'functionCall' => [Functions::class, 'DUMMY'],
             'argumentCount' => '1',
         ],
+        'PHI' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1',
+        ],
         'PI' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
             'functionCall' => 'pi',
@@ -1672,6 +1947,11 @@ class Calculation
             'functionCall' => [Statistical::class, 'POISSON'],
             'argumentCount' => '3',
         ],
+        'POISSON.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical::class, 'POISSON'],
+            'argumentCount' => '3',
+        ],
         'POWER' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
             'functionCall' => [MathTrig::class, 'POWER'],
@@ -1722,6 +2002,16 @@ class Calculation
             'functionCall' => [Statistical::class, 'QUARTILE'],
             'argumentCount' => '2',
         ],
+        'QUARTILE.EXC' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
+        'QUARTILE.INC' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical::class, 'QUARTILE'],
+            'argumentCount' => '2',
+        ],
         'QUOTIENT' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
             'functionCall' => [MathTrig::class, 'QUOTIENT'],
@@ -1737,6 +2027,11 @@ class Calculation
             'functionCall' => [MathTrig::class, 'RAND'],
             'argumentCount' => '0',
         ],
+        'RANDARRAY' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '0-5',
+        ],
         'RANDBETWEEN' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
             'functionCall' => [MathTrig::class, 'RAND'],
@@ -1747,6 +2042,16 @@ class Calculation
             'functionCall' => [Statistical::class, 'RANK'],
             'argumentCount' => '2,3',
         ],
+        'RANK.AVG' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2,3',
+        ],
+        'RANK.EQ' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical::class, 'RANK'],
+            'argumentCount' => '2,3',
+        ],
         'RATE' => [
             'category' => Category::CATEGORY_FINANCIAL,
             'functionCall' => [Financial::class, 'RATE'],
@@ -1853,6 +2158,11 @@ class Calculation
             'functionCall' => [DateTime::class, 'SECOND'],
             'argumentCount' => '1',
         ],
+        'SEQUENCE' => [
+            'category' => Category::CATEGORY_MATH_AND_TRIG,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
         'SERIESSUM' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
             'functionCall' => [MathTrig::class, 'SERIESSUM'],
@@ -1888,6 +2198,11 @@ class Calculation
             'functionCall' => [Statistical::class, 'SKEW'],
             'argumentCount' => '1+',
         ],
+        'SKEW.P' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1+',
+        ],
         'SLN' => [
             'category' => Category::CATEGORY_FINANCIAL,
             'functionCall' => [Financial::class, 'SLN'],
@@ -1903,6 +2218,16 @@ class Calculation
             'functionCall' => [Statistical::class, 'SMALL'],
             'argumentCount' => '2',
         ],
+        'SORT' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1+',
+        ],
+        'SORTBY' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2+',
+        ],
         'SQRT' => [
             'category' => Category::CATEGORY_MATH_AND_TRIG,
             'functionCall' => 'sqrt',
@@ -2049,6 +2374,21 @@ class Calculation
             'functionCall' => [Statistical::class, 'TDIST'],
             'argumentCount' => '3',
         ],
+        'T.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3',
+        ],
+        'T.DIST.2T' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
+        'T.DIST.RT' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
         'TEXT' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
             'functionCall' => [TextData::class, 'TEXTFORMAT'],
@@ -2074,6 +2414,16 @@ class Calculation
             'functionCall' => [Statistical::class, 'TINV'],
             'argumentCount' => '2',
         ],
+        'T.INV' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical::class, 'TINV'],
+            'argumentCount' => '2',
+        ],
+        'T.INV.2T' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2',
+        ],
         'TODAY' => [
             'category' => Category::CATEGORY_DATE_AND_TIME,
             'functionCall' => [DateTime::class, 'DATENOW'],
@@ -2114,6 +2464,11 @@ class Calculation
             'functionCall' => [Functions::class, 'DUMMY'],
             'argumentCount' => '4',
         ],
+        'T.TEST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '4',
+        ],
         'TYPE' => [
             'category' => Category::CATEGORY_INFORMATION,
             'functionCall' => [Functions::class, 'TYPE'],
@@ -2129,6 +2484,11 @@ class Calculation
             'functionCall' => [TextData::class, 'ASCIICODE'],
             'argumentCount' => '1',
         ],
+        'UNIQUE' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '1+',
+        ],
         'UPPER' => [
             'category' => Category::CATEGORY_TEXT_AND_DATA,
             'functionCall' => [TextData::class, 'UPPERCASE'],
@@ -2204,6 +2564,11 @@ class Calculation
             'functionCall' => [Statistical::class, 'WEIBULL'],
             'argumentCount' => '4',
         ],
+        'WEIBULL.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical::class, 'WEIBULL'],
+            'argumentCount' => '4',
+        ],
         'WORKDAY' => [
             'category' => Category::CATEGORY_DATE_AND_TIME,
             'functionCall' => [DateTime::class, 'WORKDAY'],
@@ -2219,11 +2584,21 @@ class Calculation
             'functionCall' => [Financial::class, 'XIRR'],
             'argumentCount' => '2,3',
         ],
+        'XLOOKUP' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '3-6',
+        ],
         'XNPV' => [
             'category' => Category::CATEGORY_FINANCIAL,
             'functionCall' => [Financial::class, 'XNPV'],
             'argumentCount' => '3',
         ],
+        'XMATCH' => [
+            'category' => Category::CATEGORY_LOOKUP_AND_REFERENCE,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '2,3',
+        ],
         'XOR' => [
             'category' => Category::CATEGORY_LOGICAL,
             'functionCall' => [Logical::class, 'logicalXor'],
@@ -2259,6 +2634,11 @@ class Calculation
             'functionCall' => [Statistical::class, 'ZTEST'],
             'argumentCount' => '2-3',
         ],
+        'Z.TEST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Statistical::class, 'ZTEST'],
+            'argumentCount' => '2-3',
+        ],
     ];
 
     //    Internal functions used for special control purposes

From 57213deb64f11aac895573cc8d092fac0b298cb0 Mon Sep 17 00:00:00 2001
From: Mark Baker <mark@lange.demon.co.uk>
Date: Sat, 25 Jul 2020 12:44:51 +0200
Subject: [PATCH 098/153] Implementation of MS Excel's LOGNORM.DIST(),
 NORM.S.DIST(), F.DIST(), GAUSS() and GAMMA() functions (#1588)

* `GAUSS()` and `GAMMA()`, `NORM.S.DIST()`, `LOGNORM.DIST()` and `F.DIST()` function implementations, and further unit tests for a number of the statistical functions

Co-authored-by: Adrien Crivelli <adrien.crivelli@gmail.com>
---
 CHANGELOG.md                                  |   2 +-
 .../Calculation/Calculation.php               |  36 ++--
 .../Calculation/Statistical.php               | 163 +++++++++++++++++-
 .../Functions/Statistical/FDist2Test.php      |  25 +++
 .../Functions/Statistical/GammaTest.php       |  26 +++
 .../Functions/Statistical/GaussTest.php       |  26 +++
 .../Statistical/LogNormDist2Test.php          |  25 +++
 .../Functions/Statistical/LogNormDistTest.php |  25 +++
 .../Functions/Statistical/NormDistTest.php    |  25 +++
 .../Functions/Statistical/NormInvTest.php     |  25 +++
 .../Functions/Statistical/NormSDist2Test.php  |  25 +++
 .../Functions/Statistical/NormSDistTest.php   |  26 +++
 .../Functions/Statistical/NormSInvTest.php    |  26 +++
 .../Functions/Statistical/StandardizeTest.php |  25 +++
 tests/data/Calculation/Statistical/FDIST2.php |  17 ++
 tests/data/Calculation/Statistical/GAMMA.php  |  13 ++
 tests/data/Calculation/Statistical/GAUSS.php  |  10 ++
 .../Calculation/Statistical/LOGNORMDIST.php   |   9 +
 .../Calculation/Statistical/LOGNORMDIST2.php  |  23 +++
 .../data/Calculation/Statistical/NORMDIST.php |  11 ++
 .../data/Calculation/Statistical/NORMINV.php  |  11 ++
 .../Calculation/Statistical/NORMSDIST.php     |  12 ++
 .../Calculation/Statistical/NORMSDIST2.php    |  17 ++
 .../data/Calculation/Statistical/NORMSINV.php |   8 +
 .../Calculation/Statistical/STANDARDIZE.php   |  12 ++
 25 files changed, 602 insertions(+), 21 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/FDist2Test.php
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GammaTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GaussTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogNormDist2Test.php
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogNormDistTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormDistTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormInvTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormSDist2Test.php
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormSDistTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormSInvTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/StandardizeTest.php
 create mode 100644 tests/data/Calculation/Statistical/FDIST2.php
 create mode 100644 tests/data/Calculation/Statistical/GAMMA.php
 create mode 100644 tests/data/Calculation/Statistical/GAUSS.php
 create mode 100644 tests/data/Calculation/Statistical/LOGNORMDIST.php
 create mode 100644 tests/data/Calculation/Statistical/LOGNORMDIST2.php
 create mode 100644 tests/data/Calculation/Statistical/NORMDIST.php
 create mode 100644 tests/data/Calculation/Statistical/NORMINV.php
 create mode 100644 tests/data/Calculation/Statistical/NORMSDIST.php
 create mode 100644 tests/data/Calculation/Statistical/NORMSDIST2.php
 create mode 100644 tests/data/Calculation/Statistical/NORMSINV.php
 create mode 100644 tests/data/Calculation/Statistical/STANDARDIZE.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6a0e9ec..0f0d4c91 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 Excel `LOGNORM.DIST()`, `NORM.S.DIST()`, `GAMMA()` and `GAUSS()` functions. [#1588](https://github.com/PHPOffice/PhpSpreadsheet/pull/1588)
 
 ### Changed
 
diff --git a/src/PhpSpreadsheet/Calculation/Calculation.php b/src/PhpSpreadsheet/Calculation/Calculation.php
index af6574bf..57506ab9 100644
--- a/src/PhpSpreadsheet/Calculation/Calculation.php
+++ b/src/PhpSpreadsheet/Calculation/Calculation.php
@@ -996,7 +996,7 @@ class Calculation
         ],
         'F.DIST' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Functions::class, 'DUMMY'],
+            'functionCall' => [Statistical::class, 'FDIST2'],
             'argumentCount' => '4',
         ],
         'F.DIST.RT' => [
@@ -1133,7 +1133,7 @@ class Calculation
         ],
         'GAMMA' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Functions::class, 'DUMMY'],
+            'functionCall' => [Statistical::class, 'GAMMAFunction'],
             'argumentCount' => '1',
         ],
         'GAMMADIST' => [
@@ -1168,7 +1168,7 @@ class Calculation
         ],
         'GAUSS' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Functions::class, 'DUMMY'],
+            'functionCall' => [Statistical::class, 'GAUSS'],
             'argumentCount' => '1',
         ],
         'GCD' => [
@@ -1577,7 +1577,7 @@ class Calculation
         ],
         'LOGNORM.DIST' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Functions::class, 'DUMMY'],
+            'functionCall' => [Statistical::class, 'LOGNORMDIST2'],
             'argumentCount' => '4',
         ],
         'LOGNORM.INV' => [
@@ -1782,7 +1782,7 @@ class Calculation
         ],
         'NORM.S.DIST' => [
             'category' => Category::CATEGORY_STATISTICAL,
-            'functionCall' => [Functions::class, 'DUMMY'],
+            'functionCall' => [Statistical::class, 'NORMSDIST2'],
             'argumentCount' => '1,2',
         ],
         'NORMSINV' => [
@@ -3131,8 +3131,8 @@ class Calculation
             }
             //    Return strings wrapped in quotes
             return self::FORMULA_STRING_QUOTE . $value . self::FORMULA_STRING_QUOTE;
-        //    Convert numeric errors to NaN error
         } elseif ((is_float($value)) && ((is_nan($value)) || (is_infinite($value)))) {
+            //    Convert numeric errors to NaN error
             return Functions::NAN();
         }
 
@@ -3774,22 +3774,22 @@ class Calculation
         $pCellParent = ($pCell !== null) ? $pCell->getWorksheet() : null;
 
         $regexpMatchString = '/^(' . self::CALCULATION_REGEXP_FUNCTION .
-                                '|' . self::CALCULATION_REGEXP_CELLREF .
-                                '|' . self::CALCULATION_REGEXP_NUMBER .
-                                '|' . self::CALCULATION_REGEXP_STRING .
-                                '|' . self::CALCULATION_REGEXP_OPENBRACE .
-                                '|' . self::CALCULATION_REGEXP_NAMEDRANGE .
-                                '|' . self::CALCULATION_REGEXP_ERROR .
-                                ')/sui';
+            '|' . self::CALCULATION_REGEXP_CELLREF .
+            '|' . self::CALCULATION_REGEXP_NUMBER .
+            '|' . self::CALCULATION_REGEXP_STRING .
+            '|' . self::CALCULATION_REGEXP_OPENBRACE .
+            '|' . self::CALCULATION_REGEXP_NAMEDRANGE .
+            '|' . self::CALCULATION_REGEXP_ERROR .
+            ')/sui';
 
         //    Start with initialisation
         $index = 0;
         $stack = new Stack();
         $output = [];
         $expectingOperator = false; //    We use this test in syntax-checking the expression to determine when a
-                                                    //        - is a negation or + is a positive operator rather than an operation
+        //        - is a negation or + is a positive operator rather than an operation
         $expectingOperand = false; //    We use this test in syntax-checking the expression to determine whether an operand
-                                                    //        should be null in a function call
+        //        should be null in a function call
 
         // IF branch pruning
         // currently pending storeKey (last item of the storeKeysStack
@@ -4172,7 +4172,7 @@ class Calculation
                     ((preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '.*/Ui', substr($formula, $index), $match)) &&
                         ($output[count($output) - 1]['type'] == 'Cell Reference') ||
                         (preg_match('/^' . self::CALCULATION_REGEXP_NAMEDRANGE . '.*/miu', substr($formula, $index), $match)) &&
-                            ($output[count($output) - 1]['type'] == 'Named Range' || $output[count($output) - 1]['type'] == 'Value')
+                        ($output[count($output) - 1]['type'] == 'Named Range' || $output[count($output) - 1]['type'] == 'Value')
                     )) {
                     while ($stack->count() > 0 &&
                         ($o2 = $stack->last()) &&
@@ -4951,7 +4951,7 @@ class Calculation
         } else {
             if ((Functions::getCompatibilityMode() != Functions::COMPATIBILITY_OPENOFFICE) &&
                 ((is_string($operand1) && !is_numeric($operand1) && strlen($operand1) > 0) ||
-                 (is_string($operand2) && !is_numeric($operand2) && strlen($operand2) > 0))) {
+                    (is_string($operand2) && !is_numeric($operand2) && strlen($operand2) > 0))) {
                 $result = Functions::VALUE();
             } else {
                 //    If we're dealing with non-matrix operations, execute the necessary operation
@@ -4980,7 +4980,7 @@ class Calculation
 
                             return false;
                         }
-                            $result = $operand1 / $operand2;
+                        $result = $operand1 / $operand2;
 
                         break;
                     //    Power
diff --git a/src/PhpSpreadsheet/Calculation/Statistical.php b/src/PhpSpreadsheet/Calculation/Statistical.php
index 100eb2fa..b44e6c6f 100644
--- a/src/PhpSpreadsheet/Calculation/Statistical.php
+++ b/src/PhpSpreadsheet/Calculation/Statistical.php
@@ -779,7 +779,7 @@ class Statistical
     /**
      * BETAINV.
      *
-     * Returns the inverse of the beta distribution.
+     * Returns the inverse of the Beta distribution.
      *
      * @param float $probability Probability at which you want to evaluate the distribution
      * @param float $alpha Parameter to the distribution
@@ -1475,6 +1475,62 @@ class Statistical
         return Functions::VALUE();
     }
 
+    private static function betaFunction($a, $b)
+    {
+        return (self::gamma($a) * self::gamma($b)) / self::gamma($a + $b);
+    }
+
+    private static function regularizedIncompleteBeta($value, $a, $b)
+    {
+        return self::incompleteBeta($value, $a, $b) / self::betaFunction($a, $b);
+    }
+
+    /**
+     * F.DIST.
+     *
+     *    Returns the F probability distribution.
+     *    You can use this function to determine whether two data sets have different degrees of diversity.
+     *    For example, you can examine the test scores of men and women entering high school, and determine
+     *        if the variability in the females is different from that found in the males.
+     *
+     * @param float $value Value of the function
+     * @param int $u The numerator degrees of freedom
+     * @param int $v The denominator degrees of freedom
+     * @param bool $cumulative If cumulative is TRUE, F.DIST returns the cumulative distribution function;
+     *                         if FALSE, it returns the probability density function.
+     *
+     * @return float|string
+     */
+    public static function FDIST2($value, $u, $v, $cumulative)
+    {
+        $value = Functions::flattenSingleValue($value);
+        $u = Functions::flattenSingleValue($u);
+        $v = Functions::flattenSingleValue($v);
+        $cumulative = Functions::flattenSingleValue($cumulative);
+
+        if (is_numeric($value) && is_numeric($u) && is_numeric($v)) {
+            if ($value < 0 || $u < 1 || $v < 1) {
+                return Functions::NAN();
+            }
+
+            $cumulative = (bool) $cumulative;
+            $u = (int) $u;
+            $v = (int) $v;
+
+            if ($cumulative) {
+                $adjustedValue = ($u * $value) / ($u * $value + $v);
+
+                return self::incompleteBeta($adjustedValue, $u / 2, $v / 2);
+            }
+
+            return (self::gamma(($v + $u) / 2) / (self::gamma($u / 2) * self::gamma($v / 2))) *
+                (($u / $v) ** ($u / 2)) *
+                (($value ** (($u - 2) / 2)) / ((1 + ($u / $v) * $value) ** (($u + $v) / 2)));
+        }
+
+        return Functions::VALUE();
+    }
+
     /**
      * FISHER.
      *
@@ -1556,6 +1612,27 @@ class Statistical
         return $bestFitLinear->getValueOfYForX($xValue);
     }
 
+    /**
+     * GAMMA.
+     *
+     * Return the gamma function value.
+     *
+     * @param float $value
+     *
+     * @return float|string The result, or a string containing an error
+     */
+    public static function GAMMAFunction($value)
+    {
+        $value = Functions::flattenSingleValue($value);
+        if (!is_numeric($value)) {
+            return Functions::VALUE();
+        } elseif ((((int) $value) == ((float) $value)) && $value <= 0.0) {
+            return Functions::NAN();
+        }
+
+        return self::gamma($value);
+    }
+
     /**
      * GAMMADIST.
      *
@@ -1593,7 +1670,7 @@ class Statistical
     /**
      * GAMMAINV.
      *
-     * Returns the inverse of the beta distribution.
+     * Returns the inverse of the Gamma distribution.
      *
      * @param float $probability Probability at which you want to evaluate the distribution
      * @param float $alpha Parameter to the distribution
@@ -1677,6 +1754,26 @@ class Statistical
         return Functions::VALUE();
     }
 
+    /**
+     * GAUSS.
+     *
+     * Calculates the probability that a member of a standard normal population will fall between
+     *     the mean and z standard deviations from the mean.
+     *
+     * @param float $value
+     *
+     * @return float|string The result, or a string containing an error
+     */
+    public static function GAUSS($value)
+    {
+        $value = Functions::flattenSingleValue($value);
+        if (!is_numeric($value)) {
+            return Functions::VALUE();
+        }
+
+        return self::NORMDIST($value, 0, 1, true) - 0.5;
+    }
+
     /**
      * GEOMEAN.
      *
@@ -2117,6 +2214,42 @@ class Statistical
         return Functions::VALUE();
     }
 
+    /**
+     * LOGNORM.DIST.
+     *
+     * Returns the lognormal distribution of x, where ln(x) is normally distributed
+     * with parameters mean and standard_dev.
+     *
+     * @param float $value
+     * @param float $mean
+     * @param float $stdDev
+     * @param bool $cumulative
+     *
+     * @return float|string The result, or a string containing an error
+     */
+    public static function LOGNORMDIST2($value, $mean, $stdDev, $cumulative = false)
+    {
+        $value = Functions::flattenSingleValue($value);
+        $mean = Functions::flattenSingleValue($mean);
+        $stdDev = Functions::flattenSingleValue($stdDev);
+        $cumulative = (bool) Functions::flattenSingleValue($cumulative);
+
+        if ((is_numeric($value)) && (is_numeric($mean)) && (is_numeric($stdDev))) {
+            if (($value <= 0) || ($stdDev <= 0)) {
+                return Functions::NAN();
+            }
+
+            if ($cumulative === true) {
+                return self::NORMSDIST2((log($value) - $mean) / $stdDev, true);
+            }
+
+            return (1 / (sqrt(2 * M_PI) * $stdDev * $value)) *
+                exp(0 - ((log($value) - $mean) ** 2 / (2 * $stdDev ** 2)));
+        }
+
+        return Functions::VALUE();
+    }
+
     /**
      * MAX.
      *
@@ -2623,10 +2756,36 @@ class Statistical
     public static function NORMSDIST($value)
     {
         $value = Functions::flattenSingleValue($value);
+        if (!is_numeric($value)) {
+            return Functions::VALUE();
+        }
 
         return self::NORMDIST($value, 0, 1, true);
     }
 
+    /**
+     * NORM.S.DIST.
+     *
+     * Returns the standard normal cumulative distribution function. The distribution has
+     * a mean of 0 (zero) and a standard deviation of one. Use this function in place of a
+     * table of standard normal curve areas.
+     *
+     * @param float $value
+     * @param bool $cumulative
+     *
+     * @return float|string The result, or a string containing an error
+     */
+    public static function NORMSDIST2($value, $cumulative)
+    {
+        $value = Functions::flattenSingleValue($value);
+        if (!is_numeric($value)) {
+            return Functions::VALUE();
+        }
+        $cumulative = (bool) Functions::flattenSingleValue($cumulative);
+
+        return self::NORMDIST($value, 0, 1, $cumulative);
+    }
+
     /**
      * NORMSINV.
      *
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/FDist2Test.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/FDist2Test.php
new file mode 100644
index 00000000..a6e34429
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/FDist2Test.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class FDist2Test extends TestCase
+{
+    /**
+     * @dataProvider providerFDIST2
+     *
+     * @param mixed $expectedResult
+     */
+    public function testFDIST2($expectedResult, ...$args): void
+    {
+        $result = Statistical::FDIST2(...$args);
+        self::assertEqualsWithDelta($expectedResult, $result, 1E-12);
+    }
+
+    public function providerFDIST2(): array
+    {
+        return require 'tests/data/Calculation/Statistical/FDIST2.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GammaTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GammaTest.php
new file mode 100644
index 00000000..abf92866
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GammaTest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class GammaTest extends TestCase
+{
+    /**
+     * @dataProvider providerGAMMA
+     *
+     * @param mixed $expectedResult
+     * @param mixed $testValue
+     */
+    public function testGAMMA($expectedResult, $testValue): void
+    {
+        $result = Statistical::GAMMAFunction($testValue);
+        self::assertEqualsWithDelta($expectedResult, $result, 1E-12);
+    }
+
+    public function providerGAMMA(): array
+    {
+        return require 'tests/data/Calculation/Statistical/GAMMA.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GaussTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GaussTest.php
new file mode 100644
index 00000000..596a608f
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/GaussTest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class GaussTest extends TestCase
+{
+    /**
+     * @dataProvider providerGAUSS
+     *
+     * @param mixed $expectedResult
+     * @param mixed $testValue
+     */
+    public function testGAUSS($expectedResult, $testValue): void
+    {
+        $result = Statistical::GAUSS($testValue);
+        self::assertEqualsWithDelta($expectedResult, $result, 1E-12);
+    }
+
+    public function providerGAUSS(): array
+    {
+        return require 'tests/data/Calculation/Statistical/GAUSS.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogNormDist2Test.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogNormDist2Test.php
new file mode 100644
index 00000000..8954ad7d
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogNormDist2Test.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class LogNormDist2Test extends TestCase
+{
+    /**
+     * @dataProvider providerLOGNORMDIST2
+     *
+     * @param mixed $expectedResult
+     */
+    public function testLOGNORMDIST2($expectedResult, ...$args): void
+    {
+        $result = Statistical::LOGNORMDIST2(...$args);
+        self::assertEqualsWithDelta($expectedResult, $result, 1E-12);
+    }
+
+    public function providerLOGNORMDIST2(): array
+    {
+        return require 'tests/data/Calculation/Statistical/LOGNORMDIST2.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogNormDistTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogNormDistTest.php
new file mode 100644
index 00000000..51679c21
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogNormDistTest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class LogNormDistTest extends TestCase
+{
+    /**
+     * @dataProvider providerLOGNORMDIST
+     *
+     * @param mixed $expectedResult
+     */
+    public function testLOGNORMDIST($expectedResult, ...$args): void
+    {
+        $result = Statistical::LOGNORMDIST(...$args);
+        self::assertEqualsWithDelta($expectedResult, $result, 1E-12);
+    }
+
+    public function providerLOGNORMDIST(): array
+    {
+        return require 'tests/data/Calculation/Statistical/LOGNORMDIST.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormDistTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormDistTest.php
new file mode 100644
index 00000000..55e81f5c
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormDistTest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class NormDistTest extends TestCase
+{
+    /**
+     * @dataProvider providerNORMDIST
+     *
+     * @param mixed $expectedResult
+     */
+    public function testNORMDIST($expectedResult, ...$args): void
+    {
+        $result = Statistical::NORMDIST(...$args);
+        self::assertEqualsWithDelta($expectedResult, $result, 1E-12);
+    }
+
+    public function providerNORMDIST(): array
+    {
+        return require 'tests/data/Calculation/Statistical/NORMDIST.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormInvTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormInvTest.php
new file mode 100644
index 00000000..5a92e830
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormInvTest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class NormInvTest extends TestCase
+{
+    /**
+     * @dataProvider providerNORMINV
+     *
+     * @param mixed $expectedResult
+     */
+    public function testNORMINV($expectedResult, ...$args): void
+    {
+        $result = Statistical::NORMINV(...$args);
+        self::assertEqualsWithDelta($expectedResult, $result, 1E-12);
+    }
+
+    public function providerNORMINV()
+    {
+        return require 'tests/data/Calculation/Statistical/NORMINV.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormSDist2Test.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormSDist2Test.php
new file mode 100644
index 00000000..1b778906
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormSDist2Test.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class NormSDist2Test extends TestCase
+{
+    /**
+     * @dataProvider providerNORMSDIST2
+     *
+     * @param mixed $expectedResult
+     */
+    public function testNORMSDIST2($expectedResult, ...$args): void
+    {
+        $result = Statistical::NORMSDIST2(...$args);
+        self::assertEqualsWithDelta($expectedResult, $result, 1E-12);
+    }
+
+    public function providerNORMSDIST2(): array
+    {
+        return require 'tests/data/Calculation/Statistical/NORMSDIST2.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormSDistTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormSDistTest.php
new file mode 100644
index 00000000..fc8779ac
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormSDistTest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class NormSDistTest extends TestCase
+{
+    /**
+     * @dataProvider providerNORMSDIST
+     *
+     * @param mixed $expectedResult
+     * @param mixed $testValue
+     */
+    public function testNORMSDIST($expectedResult, $testValue): void
+    {
+        $result = Statistical::NORMSDIST($testValue);
+        self::assertEqualsWithDelta($expectedResult, $result, 1E-12);
+    }
+
+    public function providerNORMSDIST(): array
+    {
+        return require 'tests/data/Calculation/Statistical/NORMSDIST.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormSInvTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormSInvTest.php
new file mode 100644
index 00000000..008516ce
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/NormSInvTest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class NormSInvTest extends TestCase
+{
+    /**
+     * @dataProvider providerNORMSINV
+     *
+     * @param mixed $expectedResult
+     * @param mixed $testValue
+     */
+    public function testNORMSINV($expectedResult, $testValue): void
+    {
+        $result = Statistical::NORMSINV($testValue);
+        self::assertEqualsWithDelta($expectedResult, $result, 1E-12);
+    }
+
+    public function providerNORMSINV(): array
+    {
+        return require 'tests/data/Calculation/Statistical/NORMSINV.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/StandardizeTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/StandardizeTest.php
new file mode 100644
index 00000000..a1d02b12
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/StandardizeTest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class StandardizeTest extends TestCase
+{
+    /**
+     * @dataProvider providerSTANDARDIZE
+     *
+     * @param mixed $expectedResult
+     */
+    public function testSTANDARDIZE($expectedResult, ...$args): void
+    {
+        $result = Statistical::STANDARDIZE(...$args);
+        self::assertEqualsWithDelta($expectedResult, $result, 1E-12);
+    }
+
+    public function providerSTANDARDIZE(): array
+    {
+        return require 'tests/data/Calculation/Statistical/STANDARDIZE.php';
+    }
+}
diff --git a/tests/data/Calculation/Statistical/FDIST2.php b/tests/data/Calculation/Statistical/FDIST2.php
new file mode 100644
index 00000000..2299c397
--- /dev/null
+++ b/tests/data/Calculation/Statistical/FDIST2.php
@@ -0,0 +1,17 @@
+<?php
+
+return [
+    [0.0012237917087, 15.2069, 6, 4, false],
+    [0.99000004300276, 15.2069, 6, 4, true],
+    [0.0241472644208, 5, 1, 2, false],
+    [0.84515425472852, 5, 1, 2, true],
+    [0.0006669496615, 65, 2, 1, false],
+    [0.9126295943339, 65, 2, 1, true],
+    [4.7306581130012E-6, 65, 8, 5, false],
+    [0.99987479238344, 65, 8, 5, true],
+    [0.0017323823929, 7.5, 13, 8, false],
+    [0.9961476916638, 7.5, 13, 8, true],
+    ['#NUM!', -1, 1, 2, false],
+    ['#NUM!', -1, 0.5, 2, false],
+    ['#VALUE!', 'NAN', 1, 2, false],
+];
diff --git a/tests/data/Calculation/Statistical/GAMMA.php b/tests/data/Calculation/Statistical/GAMMA.php
new file mode 100644
index 00000000..760b429d
--- /dev/null
+++ b/tests/data/Calculation/Statistical/GAMMA.php
@@ -0,0 +1,13 @@
+<?php
+
+return [
+    [1.329340388179, 2.5],
+    [0.267865934620, -3.75],
+    [9.513507698669, 0.1],
+    [1.0, 1.0],
+    [0.886226925453, 1.5],
+    [17.837861981813, 4.8],
+    [52.342777784553, 5.5],
+    ['#NUM!', -1],
+    ['#VALUE!', 'NAN'],
+];
diff --git a/tests/data/Calculation/Statistical/GAUSS.php b/tests/data/Calculation/Statistical/GAUSS.php
new file mode 100644
index 00000000..e5dbc17e
--- /dev/null
+++ b/tests/data/Calculation/Statistical/GAUSS.php
@@ -0,0 +1,10 @@
+<?php
+
+return [
+    [0.4772498680518, 2],
+    [-0.4999997133484, -5],
+    [0.0, 0],
+    [0.0398278372770, 0.1],
+    [0.4937903346742, 2.5],
+    ['#VALUE!', 'NAN'],
+];
diff --git a/tests/data/Calculation/Statistical/LOGNORMDIST.php b/tests/data/Calculation/Statistical/LOGNORMDIST.php
new file mode 100644
index 00000000..57a26e0f
--- /dev/null
+++ b/tests/data/Calculation/Statistical/LOGNORMDIST.php
@@ -0,0 +1,9 @@
+<?php
+
+return[
+    [0.0390835557068, 4, 3.5, 1.2],
+    [0.066417114799, 12, 10, 5],
+    ['#NUM!', -1.1, -2.2, 3.3],
+    ['#NUM!', 1.1, -2.2, -3.3],
+    ['#VALUE!', 'NAN', 0.1, 0.2],
+];
diff --git a/tests/data/Calculation/Statistical/LOGNORMDIST2.php b/tests/data/Calculation/Statistical/LOGNORMDIST2.php
new file mode 100644
index 00000000..108eb54a
--- /dev/null
+++ b/tests/data/Calculation/Statistical/LOGNORMDIST2.php
@@ -0,0 +1,23 @@
+<?php
+
+return[
+    [0.0390835557068, 4, 3.5, 1.2, true],
+    [0.0176175966818, 4, 3.5, 1.2, false],
+    [0.0162328457851, 0.5, 10, 5, true],
+    [0.0162104821842, 0.5, 10, 5, false],
+    [0.0664171147992, 12, 10, 5, true],
+    [0.0021488646273, 12, 10, 5, false],
+    [0.0201708646513, 8, 7, 2.4, true],
+    [0.0025400389694, 8, 7, 2.4, false],
+    [0.0390835557068, 4, 3.5, 1.2, true],
+    [0.0176175966818, 4, 3.5, 1.2, false],
+    [0.0847348867430, 3, 2.5, 1.02, true],
+    [0.0507335863525, 3, 2.5, 1.02, false],
+    [0.2618068896629, 1.1, 2.2, 3.3, true],
+    [0.0896756593248, 1.1, 2.2, 3.3, false],
+    [0.7566441984111, 1.1, -2.2, 3.3, true],
+    [0.0862879718374, 1.1, -2.2, 3.3, false],
+    ['#NUM!', -1.1, -2.2, 3.3, true],
+    ['#NUM!', 1.1, -2.2, -3.3, true],
+    ['#VALUE!', 'NAN', 0.1, 0.2, true],
+];
diff --git a/tests/data/Calculation/Statistical/NORMDIST.php b/tests/data/Calculation/Statistical/NORMDIST.php
new file mode 100644
index 00000000..96b1d7d0
--- /dev/null
+++ b/tests/data/Calculation/Statistical/NORMDIST.php
@@ -0,0 +1,11 @@
+<?php
+
+return [
+    [0.9087887802741, 42, 40, 1.5, true],
+    [0.109340049784, 42, 40, 1.5, false],
+    [0.0176032663382, 50, 40, 20, false],
+    [0.2524925375469, 0.8, 1, 0.3, true],
+    [0.8413447460685, 68, 65.5, 2.5, true],
+    ['#NUM!', 42, 40, -1.5, true],
+    ['#VALUE!', 42, 'ALPHA', 1.5, true],
+];
diff --git a/tests/data/Calculation/Statistical/NORMINV.php b/tests/data/Calculation/Statistical/NORMINV.php
new file mode 100644
index 00000000..24cd20dd
--- /dev/null
+++ b/tests/data/Calculation/Statistical/NORMINV.php
@@ -0,0 +1,11 @@
+<?php
+
+return [
+    [42.000002008416, 0.908789, 40, 1.5],
+    [5.50669420572, 0.6, 5, 2],
+    [63.813775624441, 0.25, 65.5, 2.5],
+    ['#NUM!', -0.5, 2.2, 3.3],
+    ['#NUM!', 1.5, 2.2, 3.3],
+    ['#NUM!', 0.5, 2.2, -3.3],
+    ['#VALUE!', 'NAN', 0.1, 0.2],
+];
diff --git a/tests/data/Calculation/Statistical/NORMSDIST.php b/tests/data/Calculation/Statistical/NORMSDIST.php
new file mode 100644
index 00000000..83dc6029
--- /dev/null
+++ b/tests/data/Calculation/Statistical/NORMSDIST.php
@@ -0,0 +1,12 @@
+<?php
+
+return [
+    [0.908788780274, 1.333333333333],
+    [0.788144601416, 0.8],
+    [0.841344746068, 1.0],
+    [0.158655253931, -1.0],
+    [0.066807201269, -1.5],
+    [0.5, 0],
+    [0.989275889978, 2.3],
+    ['#VALUE!', 'NAN'],
+];
diff --git a/tests/data/Calculation/Statistical/NORMSDIST2.php b/tests/data/Calculation/Statistical/NORMSDIST2.php
new file mode 100644
index 00000000..81ecf39f
--- /dev/null
+++ b/tests/data/Calculation/Statistical/NORMSDIST2.php
@@ -0,0 +1,17 @@
+<?php
+
+return [
+    [0.908788780274, 1.333333333333, true],
+    [0.164010074676, 1.333333333333, false],
+    [0.352065326764, 0.5, false],
+    [0.788144601416, 0.8, true],
+    [0.841344746068, 1.0, true],
+    [0.158655253931, -1.0, true],
+    [0.066807201269, -1.5, true],
+    [0.129517595666, -1.5, false],
+    [0.5, 0, true],
+    [0.398942280401, 0, false],
+    [0.989275889978, 2.3, true],
+    [0.028327037742, 2.3, false],
+    ['#VALUE!', 'NAN', true],
+];
diff --git a/tests/data/Calculation/Statistical/NORMSINV.php b/tests/data/Calculation/Statistical/NORMSINV.php
new file mode 100644
index 00000000..a3ab3702
--- /dev/null
+++ b/tests/data/Calculation/Statistical/NORMSINV.php
@@ -0,0 +1,8 @@
+<?php
+
+return [
+    [1.33333467227723, 0.908789],
+    [-0.67448975022342, 0.25],
+    [0.12566134687610, 0.55],
+    [1.28155156414015, 0.9],
+];
diff --git a/tests/data/Calculation/Statistical/STANDARDIZE.php b/tests/data/Calculation/Statistical/STANDARDIZE.php
new file mode 100644
index 00000000..174516bc
--- /dev/null
+++ b/tests/data/Calculation/Statistical/STANDARDIZE.php
@@ -0,0 +1,12 @@
+<?php
+
+return [
+    [1.333333333333, 42, 40, 1.5],
+    [0.25, 5.5, 5, 2],
+    [20, 5.5, 1.5, 0.2],
+    [-2.0, 12, 15, 1.5],
+    [-0.4, -2, 0, 5],
+    [-0.676, 63.81, 65.5, 2.5],
+    ['#NUM!', 1.1, -2.2, -3.3],
+    ['#VALUE!', 'NAN', 0.1, 0.2],
+];

From fe121e8f7aee43182015defc36900a69eec4eb0c Mon Sep 17 00:00:00 2001
From: Mark Baker <mark@lange.demon.co.uk>
Date: Sat, 25 Jul 2020 21:58:08 +0200
Subject: [PATCH 099/153] Additional statistical unit tests for non-happy path
 (#1594)

* Additional statistical unit tests for non-happy path
---
 .../Functions/Statistical/CorrelTest.php      |  4 ++-
 .../Functions/Statistical/KurtTest.php        | 25 +++++++++++++++++++
 .../data/Calculation/Statistical/BETADIST.php |  8 ++++++
 .../data/Calculation/Statistical/BETAINV.php  |  8 ++++++
 .../Calculation/Statistical/BINOMDIST.php     | 12 +++++++++
 .../data/Calculation/Statistical/CHIDIST.php  |  4 +++
 tests/data/Calculation/Statistical/CHIINV.php |  4 +++
 .../Calculation/Statistical/CONFIDENCE.php    | 12 +++++++++
 tests/data/Calculation/Statistical/CORREL.php | 15 +++++++++++
 .../Calculation/Statistical/EXPONDIST.php     |  8 ++++++
 tests/data/Calculation/Statistical/FISHER.php |  8 ++++++
 .../Calculation/Statistical/FISHERINV.php     |  4 +++
 .../Calculation/Statistical/GAMMADIST.php     |  8 ++++++
 .../data/Calculation/Statistical/GAMMAINV.php |  8 ++++++
 .../data/Calculation/Statistical/GAMMALN.php  |  8 ++++++
 tests/data/Calculation/Statistical/KURT.php   | 12 +++++++++
 tests/data/Calculation/Statistical/STEYX.php  | 10 ++++++++
 17 files changed, 157 insertions(+), 1 deletion(-)
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/KurtTest.php
 create mode 100644 tests/data/Calculation/Statistical/KURT.php

diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CorrelTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CorrelTest.php
index 52f773bc..960a4cfd 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CorrelTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/CorrelTest.php
@@ -17,8 +17,10 @@ class CorrelTest extends TestCase
      * @dataProvider providerCORREL
      *
      * @param mixed $expectedResult
+     * @param mixed $xargs
+     * @param mixed $yargs
      */
-    public function testCORREL($expectedResult, array $xargs, array $yargs): void
+    public function testCORREL($expectedResult, $xargs, $yargs): void
     {
         $result = Statistical::CORREL($xargs, $yargs);
         self::assertEqualsWithDelta($expectedResult, $result, 1E-12);
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/KurtTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/KurtTest.php
new file mode 100644
index 00000000..b62aa026
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/KurtTest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class KurtTest extends TestCase
+{
+    /**
+     * @dataProvider providerKURT
+     *
+     * @param mixed $expectedResult
+     */
+    public function testKURT($expectedResult, ...$values): void
+    {
+        $result = Statistical::KURT(...$values);
+        self::assertEqualsWithDelta($expectedResult, $result, 1E-12);
+    }
+
+    public function providerKURT()
+    {
+        return require 'tests/data/Calculation/Statistical/KURT.php';
+    }
+}
diff --git a/tests/data/Calculation/Statistical/BETADIST.php b/tests/data/Calculation/Statistical/BETADIST.php
index b89de805..f489429c 100644
--- a/tests/data/Calculation/Statistical/BETADIST.php
+++ b/tests/data/Calculation/Statistical/BETADIST.php
@@ -21,4 +21,12 @@ return [
         0.685470581054,
         2, 8, 10, 1, 3,
     ],
+    [
+        '#VALUE!',
+        2, 'NAN', 10, 1, 3,
+    ],
+    [
+        '#NUM!',
+        2, -8, 10, 1, 3,
+    ],
 ];
diff --git a/tests/data/Calculation/Statistical/BETAINV.php b/tests/data/Calculation/Statistical/BETAINV.php
index 5406c0d5..d62c1c35 100644
--- a/tests/data/Calculation/Statistical/BETAINV.php
+++ b/tests/data/Calculation/Statistical/BETAINV.php
@@ -21,4 +21,12 @@ return [
         0.303225844664,
         0.2, 4, 5, 0, 1,
     ],
+    [
+        '#VALUE!',
+        0.2, 'NAN', 5, 0, 1,
+    ],
+    [
+        '#NUM!',
+        0.2, -4, 5, 0, 1,
+    ],
 ];
diff --git a/tests/data/Calculation/Statistical/BINOMDIST.php b/tests/data/Calculation/Statistical/BINOMDIST.php
index 93eacaf6..47e8a3f3 100644
--- a/tests/data/Calculation/Statistical/BINOMDIST.php
+++ b/tests/data/Calculation/Statistical/BINOMDIST.php
@@ -45,4 +45,16 @@ return [
         0.999105034804,
         65, 100, 0.5, true,
     ],
+    [
+        '#VALUE!',
+        'NAN', 100, 0.5, true,
+    ],
+    [
+        '#NUM!',
+        -5, 100, 0.5, true,
+    ],
+    [
+        '#NUM!',
+        5, 100, 1.5, true,
+    ],
 ];
diff --git a/tests/data/Calculation/Statistical/CHIDIST.php b/tests/data/Calculation/Statistical/CHIDIST.php
index a83256c9..4093b991 100644
--- a/tests/data/Calculation/Statistical/CHIDIST.php
+++ b/tests/data/Calculation/Statistical/CHIDIST.php
@@ -33,4 +33,8 @@ return [
         0.046011705689,
         8, 3,
     ],
+    [
+        '#VALUE!',
+        'NAN', 3,
+    ],
 ];
diff --git a/tests/data/Calculation/Statistical/CHIINV.php b/tests/data/Calculation/Statistical/CHIINV.php
index e1c7199e..2384cda6 100644
--- a/tests/data/Calculation/Statistical/CHIINV.php
+++ b/tests/data/Calculation/Statistical/CHIINV.php
@@ -33,4 +33,8 @@ return [
         4.108344935632,
         0.25, 3,
     ],
+    [
+        '#VALUE!',
+        0.25, 'NAN',
+    ],
 ];
diff --git a/tests/data/Calculation/Statistical/CONFIDENCE.php b/tests/data/Calculation/Statistical/CONFIDENCE.php
index 484eef27..8fd68abc 100644
--- a/tests/data/Calculation/Statistical/CONFIDENCE.php
+++ b/tests/data/Calculation/Statistical/CONFIDENCE.php
@@ -13,4 +13,16 @@ return [
         0.013719747903,
         0.05, 0.07, 100,
     ],
+    [
+        '#VALUE!',
+        'NAN', 0.07, 100,
+    ],
+    [
+        '#NUM!',
+        1.05, 0.07, 100,
+    ],
+    [
+        '#NUM!',
+        0.05, -0.07, 100,
+    ],
 ];
diff --git a/tests/data/Calculation/Statistical/CORREL.php b/tests/data/Calculation/Statistical/CORREL.php
index de03a480..409abbd6 100644
--- a/tests/data/Calculation/Statistical/CORREL.php
+++ b/tests/data/Calculation/Statistical/CORREL.php
@@ -11,4 +11,19 @@ return [
         [2, 10, 7, 17, 14, 16, 8, 12, 11, 15, 18, 3, 4, 1, 6, 5, 13, 19, 20, 9],
         [22.9, 45.78, 33.49, 49.77, 40.94, 36.18, 21.05, 50.57, 31.32, 53.76, 55.66, 27.61, 11.15, 10.11, 37.9, 31.08, 45.48, 63.83, 63.6, 27.01],
     ],
+    [
+        '#VALUE!',
+        3,
+        9,
+    ],
+    [
+        '#N/A',
+        [],
+        [],
+    ],
+    [
+        '#DIV/0!',
+        [3],
+        [9],
+    ],
 ];
diff --git a/tests/data/Calculation/Statistical/EXPONDIST.php b/tests/data/Calculation/Statistical/EXPONDIST.php
index 546668fd..df150e19 100644
--- a/tests/data/Calculation/Statistical/EXPONDIST.php
+++ b/tests/data/Calculation/Statistical/EXPONDIST.php
@@ -9,4 +9,12 @@ return [
         0.393469340287,
         0.5, 1, true,
     ],
+    [
+        '#VALUE!',
+        0.5, 'NAN', true,
+    ],
+    [
+        '#NUM!',
+        -0.5, 1, true,
+    ],
 ];
diff --git a/tests/data/Calculation/Statistical/FISHER.php b/tests/data/Calculation/Statistical/FISHER.php
index fc35acba..12909012 100644
--- a/tests/data/Calculation/Statistical/FISHER.php
+++ b/tests/data/Calculation/Statistical/FISHER.php
@@ -13,4 +13,12 @@ return [
         1.098612288668,
         0.8,
     ],
+    [
+        '#VALUE!',
+        'NAN',
+    ],
+    [
+        '#NUM!',
+        -2,
+    ],
 ];
diff --git a/tests/data/Calculation/Statistical/FISHERINV.php b/tests/data/Calculation/Statistical/FISHERINV.php
index 6e5bf20a..b79fd4f8 100644
--- a/tests/data/Calculation/Statistical/FISHERINV.php
+++ b/tests/data/Calculation/Statistical/FISHERINV.php
@@ -17,4 +17,8 @@ return [
         0.992631520201,
         2.8,
     ],
+    [
+        '#VALUE!',
+        'NAN',
+    ],
 ];
diff --git a/tests/data/Calculation/Statistical/GAMMADIST.php b/tests/data/Calculation/Statistical/GAMMADIST.php
index f993fb5d..dfc93c63 100644
--- a/tests/data/Calculation/Statistical/GAMMADIST.php
+++ b/tests/data/Calculation/Statistical/GAMMADIST.php
@@ -9,4 +9,12 @@ return [
         0.576809918873,
         6, 3, 2, true,
     ],
+    [
+        '#VALUE!',
+        6, 'NAN', 2, true,
+    ],
+    [
+        '#NUM!',
+        -6, 3, 2, true,
+    ],
 ];
diff --git a/tests/data/Calculation/Statistical/GAMMAINV.php b/tests/data/Calculation/Statistical/GAMMAINV.php
index 5a2b7153..64869092 100644
--- a/tests/data/Calculation/Statistical/GAMMAINV.php
+++ b/tests/data/Calculation/Statistical/GAMMAINV.php
@@ -5,4 +5,12 @@ return [
         5.348120627447,
         0.5, 3, 2,
     ],
+    [
+        '#VALUE!',
+        'NAN', 3, 2,
+    ],
+    [
+        '#NUM!',
+        -0.5, 3, 2,
+    ],
 ];
diff --git a/tests/data/Calculation/Statistical/GAMMALN.php b/tests/data/Calculation/Statistical/GAMMALN.php
index 146b2f95..783f0afd 100644
--- a/tests/data/Calculation/Statistical/GAMMALN.php
+++ b/tests/data/Calculation/Statistical/GAMMALN.php
@@ -5,4 +5,12 @@ return [
         2.453736570842,
         4.5,
     ],
+    [
+        '#VALUE!',
+        'NAN',
+    ],
+    [
+        '#NUM!',
+        -4.5,
+    ],
 ];
diff --git a/tests/data/Calculation/Statistical/KURT.php b/tests/data/Calculation/Statistical/KURT.php
new file mode 100644
index 00000000..cae7dbc8
--- /dev/null
+++ b/tests/data/Calculation/Statistical/KURT.php
@@ -0,0 +1,12 @@
+<?php
+
+return[
+    [
+        -0.1517996372084,
+        [3, 4, 5, 2, 3, 4, 5, 6, 4, 7],
+    ],
+    [
+        0.532657874050135,
+        [4, 5, 4, 4, 4, 4, 4, 2, 3, 5, 5, 3],
+    ],
+];
diff --git a/tests/data/Calculation/Statistical/STEYX.php b/tests/data/Calculation/Statistical/STEYX.php
index dc0b04a4..a87ff592 100644
--- a/tests/data/Calculation/Statistical/STEYX.php
+++ b/tests/data/Calculation/Statistical/STEYX.php
@@ -11,4 +11,14 @@ return [
         [3, 7.9, 8, 9.2, 12, 10.5, 15, 15.5, 17],
         [1, 2, 3, 4, 4.5, 5, 6, 7, 8],
     ],
+    [
+        '#N/A',
+        [],
+        [],
+    ],
+    [
+        '#DIV/0!',
+        [2],
+        [1],
+    ],
 ];

From 16a9ff14d4ec9cf4a2c0ea3f7983bc300c2428fd Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Sat, 25 Jul 2020 23:17:26 +0200
Subject: [PATCH 100/153] Experiment

---
 .travis.yml                                    | 2 +-
 composer.json                                  | 2 +-
 tests/data/Calculation/Statistical/CHIDIST.php | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7a17dd93..afe5911a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ before_script:
   - composer install --ignore-platform-reqs
 
 script:
-  - ./vendor/bin/phpunit
+  - ./vendor/bin/phpunit --color=always --coverage-text
 
 jobs:
   include:
diff --git a/composer.json b/composer.json
index d0379949..32df7bac 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
     "scripts": {
         "check": [
             "php-cs-fixer fix --ansi --dry-run --diff",
-            "phpcs --report-width=200 samples/ src/ tests/ --ignore=samples/Header.php --standard=PSR2 -n",
+            "phpcs --report-width=200 samples/ src/ tests/ --ignore=samples/Header.php --standard=PSR12 -n",
             "phpunit --color=always"
         ],
         "fix": [
diff --git a/tests/data/Calculation/Statistical/CHIDIST.php b/tests/data/Calculation/Statistical/CHIDIST.php
index 4093b991..023d2a7c 100644
--- a/tests/data/Calculation/Statistical/CHIDIST.php
+++ b/tests/data/Calculation/Statistical/CHIDIST.php
@@ -37,4 +37,8 @@ return [
         '#VALUE!',
         'NAN', 3,
     ],
+    [
+        '#NUM!',
+        -8, 3,
+    ],
 ];

From 7ddf6ccf41195c6f83f8a6a76ce683736864bf91 Mon Sep 17 00:00:00 2001
From: oleibman <eclipsechasers2@yahoo.com>
Date: Sat, 25 Jul 2020 20:15:57 -0700
Subject: [PATCH 101/153] PrintArea Causes Exception

I wanted to investigate #1523, but I couldn't duplicate its results
because the sample code in the issue caused an Exception to be thrown.
The exception happened because, when the Print Range Set method is
set to Insert (as oppposed to Overwrite), and the Print Range is
empty, it is created with a leading or trailing comma, and Writer/Xlsx
objects. This is, in a sense, a user error, but the software should
be more resilient. This can be accomplished by ensuring that no
leading or trailing comma is generated when Print Range is empty.

This code change fixes that problem. Since I couldn't reproduce the
original, I can't say for sure that it fixes it. However, with the
sample code provided, I can write a spreadsheet which Excel reads
without any problems, so it probably fixes the original.

Closes  #1544
Fixes #1523
---
 src/PhpSpreadsheet/Worksheet/PageSetup.php          |  5 ++++-
 .../Functional/PrintAreaTest.php                    | 13 +++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/PhpSpreadsheet/Worksheet/PageSetup.php b/src/PhpSpreadsheet/Worksheet/PageSetup.php
index d8d5098f..d1a22a7b 100644
--- a/src/PhpSpreadsheet/Worksheet/PageSetup.php
+++ b/src/PhpSpreadsheet/Worksheet/PageSetup.php
@@ -678,6 +678,9 @@ class PageSetup
             throw new PhpSpreadsheetException('Cell coordinate must not be absolute.');
         }
         $value = strtoupper($value);
+        if (!$this->printArea) {
+            $index = 0;
+        }
 
         if ($method == self::SETPRINTRANGE_OVERWRITE) {
             if ($index == 0) {
@@ -695,7 +698,7 @@ class PageSetup
             }
         } elseif ($method == self::SETPRINTRANGE_INSERT) {
             if ($index == 0) {
-                $this->printArea .= ($this->printArea == '') ? $value : ',' . $value;
+                $this->printArea = $this->printArea ? ($this->printArea . ',' . $value) : $value;
             } else {
                 $printAreas = explode(',', $this->printArea);
                 if ($index < 0) {
diff --git a/tests/PhpSpreadsheetTests/Functional/PrintAreaTest.php b/tests/PhpSpreadsheetTests/Functional/PrintAreaTest.php
index a335fd2f..584f6dd5 100644
--- a/tests/PhpSpreadsheetTests/Functional/PrintAreaTest.php
+++ b/tests/PhpSpreadsheetTests/Functional/PrintAreaTest.php
@@ -22,7 +22,7 @@ class PrintAreaTest extends AbstractFunctional
      */
     public function testPageSetup($format): void
     {
-        // Create new workbook with 3 sheets and different print areas
+        // Create new workbook with 6 sheets and different print areas
         $spreadsheet = new Spreadsheet();
         $worksheet1 = $spreadsheet->getActiveSheet()->setTitle('Sheet 1');
         $worksheet1->getPageSetup()->setPrintArea('A1:B1');
@@ -34,16 +34,25 @@ class PrintAreaTest extends AbstractFunctional
 
         $worksheet4 = $spreadsheet->createSheet()->setTitle('Sheet 4');
         $worksheet4->getPageSetup()->setPrintArea('A4:B4,D1:E4');
+        $worksheet5 = $spreadsheet->createSheet()->setTitle('Sheet 5');
+        $worksheet5->getPageSetup()->addPrintAreaByColumnAndRow(1, 1, 10, 10, 1);
+        $worksheet6 = $spreadsheet->createSheet()->setTitle('Sheet 6');
+        $worksheet6->getPageSetup()->addPrintAreaByColumnAndRow(1, 1, 10, 10, 1);
+        $worksheet6->getPageSetup()->addPrintAreaByColumnAndRow(12, 1, 12, 10, 1);
 
         $reloadedSpreadsheet = $this->writeAndReload($spreadsheet, $format, function (BaseReader $reader): void {
-            $reader->setLoadSheetsOnly(['Sheet 1', 'Sheet 3', 'Sheet 4']);
+            $reader->setLoadSheetsOnly(['Sheet 1', 'Sheet 3', 'Sheet 4', 'Sheet 5', 'Sheet 6']);
         });
 
         $actual1 = $reloadedSpreadsheet->getSheetByName('Sheet 1')->getPageSetup()->getPrintArea();
         $actual3 = $reloadedSpreadsheet->getSheetByName('Sheet 3')->getPageSetup()->getPrintArea();
         $actual4 = $reloadedSpreadsheet->getSheetByName('Sheet 4')->getPageSetup()->getPrintArea();
+        $actual5 = $reloadedSpreadsheet->getSheetByName('Sheet 5')->getPageSetup()->getPrintArea();
+        $actual6 = $reloadedSpreadsheet->getSheetByName('Sheet 6')->getPageSetup()->getPrintArea();
         self::assertSame('A1:B1', $actual1, 'should be able to write and read normal page setup');
         self::assertSame('A3:B3', $actual3, 'should be able to write and read page setup even when skipping sheets');
         self::assertSame('A4:B4,D1:E4', $actual4, 'should be able to write and read page setup with multiple print areas');
+        self::assertSame('A1:J10', $actual5, 'add by column and row');
+        self::assertSame('A1:J10,L1:L10', $actual6, 'multiple add by column and row');
     }
 }

From 763b208a682c8aa64efa64dff5cc341a342ce9e3 Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Sun, 26 Jul 2020 12:19:02 +0900
Subject: [PATCH 102/153] Update CHANGELOG

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 439eb7d1..2d7b4ebe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,7 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Fixed
 
-- Nothing.
+- PrintArea causes exception [#1544](https://github.com/phpoffice/phpspreadsheet/pull/1544) 
 
 ## 1.14.1 - 2020-07-19
 

From 735103c1205a60529f545ca83a9e5d9fbcc18185 Mon Sep 17 00:00:00 2001
From: oleibman <eclipsechasers2@yahoo.com>
Date: Sat, 25 Jul 2020 20:40:49 -0700
Subject: [PATCH 103/153] Improve Coverage for ODS Reader (#1545)

* Improve Coverage for ODS Reader

Reader/ODS/Properties is now 100% covered.
Reader/ODS is covered except for 1 statement. As the original author
put it, "table-header-rows TODO: figure this out ... I'm not sure that
PhpExcel has an API for this". I'm still thinking about it, but, so far,
I agree with the author.

There are minimal code changes.
- Several places test !zip->open() to see whether the test failed.
  However, zip->open() returns true or a string, so the test never
  detects failure. Change to zip->open() !== true. No previous tests.
- Suppress warning messages from simplexml_load_string (there had
  been no tests for invalid xml).
- One document property was misnamed, and one non-existent property
  was tested for.

I added a number of tests, creating an ODS directory, and moving
OdsTest to that directory.

* Scrutinizer Recommendation

Unused variable in one test.

* Update CHANGELOG

Co-authored-by: Adrien Crivelli <adrien.crivelli@gmail.com>
---
 CHANGELOG.md                                  |   2 +-
 src/PhpSpreadsheet/Reader/Ods.php             |  34 +++---
 src/PhpSpreadsheet/Reader/Ods/Properties.php  |   6 +-
 .../Reader/Ods/OdsInfoTest.php                | 110 ++++++++++++++++++
 .../Reader/{ => Ods}/OdsTest.php              |  57 +++++++--
 tests/data/Reader/Ods/corruptMeta.ods         | Bin 0 -> 7196 bytes
 tests/data/Reader/Ods/data.ods                | Bin 11764 -> 12182 bytes
 tests/data/Reader/Ods/nomimetype.ods          | Bin 0 -> 7058 bytes
 8 files changed, 175 insertions(+), 34 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Reader/Ods/OdsInfoTest.php
 rename tests/PhpSpreadsheetTests/Reader/{ => Ods}/OdsTest.php (83%)
 create mode 100644 tests/data/Reader/Ods/corruptMeta.ods
 create mode 100644 tests/data/Reader/Ods/nomimetype.ods

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d7b4ebe..d96323dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Changed
 
-- Nothing.
+- Improve Coverage for ODS Reader [#1545](https://github.com/phpoffice/phpspreadsheet/pull/1544)
 
 ### Deprecated
 
diff --git a/src/PhpSpreadsheet/Reader/Ods.php b/src/PhpSpreadsheet/Reader/Ods.php
index 4f164b6f..b2a6a759 100644
--- a/src/PhpSpreadsheet/Reader/Ods.php
+++ b/src/PhpSpreadsheet/Reader/Ods.php
@@ -11,6 +11,7 @@ use DOMNode;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\Reader\Exception as ReaderException;
 use PhpOffice\PhpSpreadsheet\Reader\Ods\PageSettings;
 use PhpOffice\PhpSpreadsheet\Reader\Ods\Properties as DocumentProperties;
 use PhpOffice\PhpSpreadsheet\Reader\Security\XmlScanner;
@@ -76,11 +77,9 @@ class Ods extends BaseReader
             }
 
             $zip->close();
-
-            return $mimeType === 'application/vnd.oasis.opendocument.spreadsheet';
         }
 
-        return false;
+        return $mimeType === 'application/vnd.oasis.opendocument.spreadsheet';
     }
 
     /**
@@ -95,8 +94,8 @@ class Ods extends BaseReader
         File::assertFile($pFilename);
 
         $zip = new ZipArchive();
-        if (!$zip->open($pFilename)) {
-            throw new Exception('Could not open ' . $pFilename . ' for reading! Error opening file.');
+        if ($zip->open($pFilename) !== true) {
+            throw new ReaderException('Could not open ' . $pFilename . ' for reading! Error opening file.');
         }
 
         $worksheetNames = [];
@@ -149,8 +148,8 @@ class Ods extends BaseReader
         $worksheetInfo = [];
 
         $zip = new ZipArchive();
-        if (!$zip->open($pFilename)) {
-            throw new Exception('Could not open ' . $pFilename . ' for reading! Error opening file.');
+        if ($zip->open($pFilename) !== true) {
+            throw new ReaderException('Could not open ' . $pFilename . ' for reading! Error opening file.');
         }
 
         $xml = new XMLReader();
@@ -198,18 +197,18 @@ class Ods extends BaseReader
                             // Step into the row
                             $xml->read();
                             do {
+                                $doread = true;
                                 if ($xml->name == 'table:table-cell' && $xml->nodeType == XMLReader::ELEMENT) {
                                     if (!$xml->isEmptyElement) {
                                         ++$currCells;
                                         $xml->next();
-                                    } else {
-                                        $xml->read();
+                                        $doread = false;
                                     }
                                 } elseif ($xml->name == 'table:covered-table-cell' && $xml->nodeType == XMLReader::ELEMENT) {
                                     $mergeSize = $xml->getAttribute('table:number-columns-repeated');
                                     $currCells += (int) $mergeSize;
-                                    $xml->read();
-                                } else {
+                                }
+                                if ($doread) {
                                     $xml->read();
                                 }
                             } while ($xml->name != 'table:table-row');
@@ -258,13 +257,13 @@ class Ods extends BaseReader
         $GMT = new DateTimeZone('UTC');
 
         $zip = new ZipArchive();
-        if (!$zip->open($pFilename)) {
+        if ($zip->open($pFilename) !== true) {
             throw new Exception("Could not open {$pFilename} for reading! Error opening file.");
         }
 
         // Meta
 
-        $xml = simplexml_load_string(
+        $xml = @simplexml_load_string(
             $this->securityScanner->scan($zip->getFromName('meta.xml')),
             'SimpleXMLElement',
             Settings::getLibXmlLoaderOptions()
@@ -465,9 +464,10 @@ class Ods extends BaseReader
                                             $type = DataType::TYPE_NUMERIC;
                                             $dataValue = (float) $cellData->getAttributeNS($officeNs, 'value');
 
-                                            if (floor($dataValue) == $dataValue) {
-                                                $dataValue = (int) $dataValue;
-                                            }
+                                            // percentage should always be float
+                                            //if (floor($dataValue) == $dataValue) {
+                                            //    $dataValue = (int) $dataValue;
+                                            //}
                                             $formatting = NumberFormat::FORMAT_PERCENTAGE_00;
 
                                             break;
@@ -488,8 +488,6 @@ class Ods extends BaseReader
                                             if (floor($dataValue) == $dataValue) {
                                                 if ($dataValue == (int) $dataValue) {
                                                     $dataValue = (int) $dataValue;
-                                                } else {
-                                                    $dataValue = (float) $dataValue;
                                                 }
                                             }
 
diff --git a/src/PhpSpreadsheet/Reader/Ods/Properties.php b/src/PhpSpreadsheet/Reader/Ods/Properties.php
index c0b309a9..d0a45e6a 100644
--- a/src/PhpSpreadsheet/Reader/Ods/Properties.php
+++ b/src/PhpSpreadsheet/Reader/Ods/Properties.php
@@ -54,15 +54,11 @@ class Properties
                     $docProps->setLastModifiedBy($propertyValue);
 
                     break;
-                case 'creation-date':
+                case 'date':
                     $creationDate = strtotime($propertyValue);
                     $docProps->setCreated($creationDate);
                     $docProps->setModified($creationDate);
 
-                    break;
-                case 'keyword':
-                    $docProps->setKeywords($propertyValue);
-
                     break;
                 case 'description':
                     $docProps->setDescription($propertyValue);
diff --git a/tests/PhpSpreadsheetTests/Reader/Ods/OdsInfoTest.php b/tests/PhpSpreadsheetTests/Reader/Ods/OdsInfoTest.php
new file mode 100644
index 00000000..1de4252f
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Reader/Ods/OdsInfoTest.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Ods;
+
+use PhpOffice\PhpSpreadsheet\Reader\Exception as ReaderException;
+use PhpOffice\PhpSpreadsheet\Reader\Ods;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @TODO The class doesn't read the bold/italic/underline properties (rich text)
+ */
+class OdsInfoTest extends TestCase
+{
+    public function testReadFileProperties(): void
+    {
+        $filename = 'tests/data/Reader/Ods/data.ods';
+
+        // Load into this instance
+        $reader = new Ods();
+
+        // Test "listWorksheetNames" method
+
+        self::assertEquals([
+            'Sheet1',
+            'Second Sheet',
+        ], $reader->listWorksheetNames($filename));
+    }
+
+    public function testNoMimeType(): void
+    {
+        $filename = 'tests/data/Reader/Ods/nomimetype.ods';
+
+        // Load into this instance
+        $reader = new Ods();
+
+        self::assertTrue($reader->canRead($filename));
+    }
+
+    public function testReadBadFileProperties(): void
+    {
+        $this->expectException(ReaderException::class);
+
+        // Load into this instance
+        $reader = new Ods();
+
+        // Test "listWorksheetNames" method
+
+        self::assertEquals([
+            'Sheet1',
+            'Second Sheet',
+        ], $reader->listWorksheetNames(__FILE__));
+    }
+
+    public function testReadFileInfo(): void
+    {
+        $filename = 'tests/data/Reader/Ods/data.ods';
+
+        // Load into this instance
+        $reader = new Ods();
+
+        // Test "listWorksheetNames" method
+
+        $wsinfo = $reader->listWorkSheetInfo($filename);
+        self::assertEquals([
+            [
+                'worksheetName' => 'Sheet1',
+                'lastColumnLetter' => 'C',
+                'lastColumnIndex' => 2,
+                'totalRows' => 12,
+                'totalColumns' => 3,
+            ],
+            [
+                'worksheetName' => 'Second Sheet',
+                'lastColumnLetter' => 'A',
+                'lastColumnIndex' => 0,
+                'totalRows' => 2,
+                'totalColumns' => 1,
+            ],
+        ], $wsinfo);
+    }
+
+    public function testReadBadFileInfo(): void
+    {
+        $this->expectException(ReaderException::class);
+        $filename = __FILE__;
+
+        // Load into this instance
+        $reader = new Ods();
+
+        // Test "listWorksheetNames" method
+
+        $wsinfo = $reader->listWorkSheetInfo($filename);
+        self::assertEquals([
+            [
+                'worksheetName' => 'Sheet1',
+                'lastColumnLetter' => 'C',
+                'lastColumnIndex' => 2,
+                'totalRows' => 11,
+                'totalColumns' => 3,
+            ],
+            [
+                'worksheetName' => 'Second Sheet',
+                'lastColumnLetter' => 'A',
+                'lastColumnIndex' => 0,
+                'totalRows' => 2,
+                'totalColumns' => 1,
+            ],
+        ], $wsinfo);
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Reader/OdsTest.php b/tests/PhpSpreadsheetTests/Reader/Ods/OdsTest.php
similarity index 83%
rename from tests/PhpSpreadsheetTests/Reader/OdsTest.php
rename to tests/PhpSpreadsheetTests/Reader/Ods/OdsTest.php
index 0aeb5570..8be1aa7c 100644
--- a/tests/PhpSpreadsheetTests/Reader/OdsTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Ods/OdsTest.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace PhpOffice\PhpSpreadsheetTests\Reader;
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Ods;
 
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
 use PhpOffice\PhpSpreadsheet\Document\Properties;
+use PhpOffice\PhpSpreadsheet\Reader\Exception as ReaderException;
 use PhpOffice\PhpSpreadsheet\Reader\Ods;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Style\Font;
@@ -50,30 +51,66 @@ class OdsTest extends TestCase
 
             // Load into this instance
             $reader = new Ods();
-            $this->spreadsheetData = $reader->loadIntoExisting($filename, new Spreadsheet());
+            $this->spreadsheetData = $reader->load($filename);
         }
 
         return $this->spreadsheetData;
     }
 
-    public function testReadFileProperties(): void
+    public function testLoadWorksheets(): void
+    {
+        $spreadsheet = $this->loadDataFile();
+
+        self::assertInstanceOf('PhpOffice\PhpSpreadsheet\Spreadsheet', $spreadsheet);
+
+        self::assertEquals(2, $spreadsheet->getSheetCount());
+
+        $firstSheet = $spreadsheet->getSheet(0);
+        self::assertInstanceOf('PhpOffice\PhpSpreadsheet\Worksheet\Worksheet', $firstSheet);
+
+        $secondSheet = $spreadsheet->getSheet(1);
+        self::assertInstanceOf('PhpOffice\PhpSpreadsheet\Worksheet\Worksheet', $secondSheet);
+        self::assertEquals('Sheet1', $spreadsheet->getSheet(0)->getTitle());
+        self::assertEquals('Second Sheet', $spreadsheet->getSheet(1)->getTitle());
+    }
+
+    public function testLoadOneWorksheet(): void
     {
         $filename = 'tests/data/Reader/Ods/data.ods';
 
         // Load into this instance
         $reader = new Ods();
+        $reader->setLoadSheetsOnly(['Sheet1']);
+        $spreadsheet = $reader->load($filename);
 
-        // Test "listWorksheetNames" method
+        self::assertEquals(1, $spreadsheet->getSheetCount());
 
-        self::assertEquals([
-            'Sheet1',
-            'Second Sheet',
-        ], $reader->listWorksheetNames($filename));
+        self::assertEquals('Sheet1', $spreadsheet->getSheet(0)->getTitle());
     }
 
-    public function testLoadWorksheets(): void
+    public function testLoadBadFile(): void
     {
-        $spreadsheet = $this->loadDataFile();
+        $this->expectException(ReaderException::class);
+        $reader = new Ods();
+        $spreadsheet = $reader->load(__FILE__);
+
+        self::assertInstanceOf('PhpOffice\PhpSpreadsheet\Spreadsheet', $spreadsheet);
+
+        self::assertEquals(2, $spreadsheet->getSheetCount());
+
+        $firstSheet = $spreadsheet->getSheet(0);
+        self::assertInstanceOf('PhpOffice\PhpSpreadsheet\Worksheet\Worksheet', $firstSheet);
+
+        $secondSheet = $spreadsheet->getSheet(1);
+        self::assertInstanceOf('PhpOffice\PhpSpreadsheet\Worksheet\Worksheet', $secondSheet);
+    }
+
+    public function testLoadCorruptFile(): void
+    {
+        $this->expectException(ReaderException::class);
+        $filename = 'tests/data/Reader/Ods/corruptMeta.ods';
+        $reader = new Ods();
+        $spreadsheet = $reader->load($filename);
 
         self::assertInstanceOf('PhpOffice\PhpSpreadsheet\Spreadsheet', $spreadsheet);
 
diff --git a/tests/data/Reader/Ods/corruptMeta.ods b/tests/data/Reader/Ods/corruptMeta.ods
new file mode 100644
index 0000000000000000000000000000000000000000..146befd936ac7bdb297a0510182d56d6464a93de
GIT binary patch
literal 7196
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

literal 0
HcmV?d00001

diff --git a/tests/data/Reader/Ods/data.ods b/tests/data/Reader/Ods/data.ods
index 3171eb6b7e31487b89848a91b89cae9adaa7ad35..2aaad631a8e4abc4dfdf9bf70d5d943220b516c0 100644
GIT binary patch
literal 12182
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

delta 10298
zcmb_?WmF!^vi6I+y95dD1eXxp-QC^YWpF3Ri#r4e9^9Sa1PJc#PS7CXCTD+poqf(-
z_utn)rl-2ArmJgubv^y8PBpyIMOBi8g2o1c;6b2;0u`A=R3+3uwF|D+_cAmPs0=O9
z?j6tq0zrV_p+F!IH<X+<2m}REl2a4^Eh3>};NszvkW(|zP%zU|GSJi0GO{zUePCy#
zVP|J!<KpAw72x4y<KyLg&(F&%AR-_vAtJyVKt(Ge@<CKoR76}_Oj=SxN>*AzOj<%p
zPFh?}R#rk*Syo;}L0LgwMNLjcTUka7P?48YR#a0{k=Id?*V9r|RaH?@*H+ik(@|H}
z*3{P5R@K$j)6g~6)-%;IwAM8;(=)X;)>Shx&^0yEvoY0mv@$d^H8nA}HMg?0HaD@i
zHnp>}HMeuMb8xYAa<_MOvvc)z^a^mbGk3AKb#ioabGGwwvhZ=W3-EGub#ZY9+<o1>
z{e9e>{k+_K{rns}g4}#VJb_4`fDpgHFyG*qfbfK9zV{zRB*9WrV0qOH4XsRF(_kOh
z5P$DH6T465mW4JhWp2LpUQShhVWEMZVL^V;!G0mZ!9iisAyIKL;lYs+QL#~>(b3U?
z5ecC&;OLLw==k)HiSe-ssj*2wMq)%za%^Z~Ty*-!P;f$ARzgH(a%^^bd~$MfQc6Zj
zdMY?QJ3BQoCnGsKI~$x?n3h+XkyDV7SDKw)lvP-sQ&N+k8viL1T$r0tnwM4=8rK+;
z)S8%CT9{q)Ip@=-PlY8FMP*gx#RU~*MU@p5`JZcwD(Wk$>q@`0RM&n1Dr@R1>e}kc
zi|VS&8)_=s>MLt&>uMX@>RLKmo9a4S8#~(D8`}GtI!D?%dz*VkI(h~=`$u~dqXu$v
zd$Nnhi}MBwi+eko=Nqf$nj0sYdcXE`jDPK1>TmDs@9!TR`8qs4GSD|M@^x%%v~Og3
zbYgnq`{el4?D)*`Lf`N-FxEdkF}mFUb@}V?#@N{0_pznvv6-2f>A9ta#f7=0)y27)
z#f8PSrP-C0mC1$e*_EA@wXL<yowc3A?a}_-+1Z`>mF<<;?X{J&^_7FQ{oSqA)4jFJ
z!;PKaW&ddJ==6AR`*i>K^l<O=^ml!AaPe?_c6oMreSG=z>I^u#y*#+SJbS!3y}rJ_
zxqG;KczU?Ie*Ag&>({T+0Co`&2-!?pOjylp`D_(MO?BZ7$jOGgeLDB?U9Ae6SYk?G
z5j;JO-+M;nBF0i{#0HJ9@AFr@DvS9_X?<I^mPK$DS&&J+GUy2`bcZ_T%0h1or*iP4
zBjm22?Ce6pEnwh{Au0Lm8hqP~YDR-R!_uz{`1Lfs^C#!)$=5F54J0n3;;e5_wyYo<
z(2LxN&*mtVICYxX(6rQtuc+EsejUt;1P}-ex3gtM#ubPuj~!UnWF|C@Td?qBRS4_J
zpOM2CXLhbE>Ex4edTsSJ)qO6PR7bgu`3)_^ov=P}2jc=g@a!1_(bENU`_7@SWS4E~
z5*Aq8A;?1K*&i)Fp0MVzO(kl8(%SF^X(2UXA(@X?S5agf%<OGXwQb>3ZU-y-Hvs}J
z!oY!G=_W^+0O-a!#7*WwPqP~9;O8uZ9lO~FR2hF;BJc1pRBq|K@<aEOwz!34v67-8
zi*QY0nGHawVWaQjDm9gBpPf#$LU<jrq{IP)Ba}usL*9q+(J7RIcne<g!87PyMR*sx
zsezc9?ijNN;k=2?JJ9I3_e}rto^algGz@BWoY#hR<z-pAlPu8AA<P?s63wk(6&0yh
z8|%jhd?}Rh%Nabsk?I1makj|)+N3=fGM2LBnJ<8;=rA!>$wthPNnrA4V>0w?6xO62
z7&v}6h14K!76p#HzK_q4?}w4$t+<s`CVK-nd(X@TUJ6M9);?nkNzeH+Of_}bT)$Rq
zLA^UYgljnyzoQ&U4LZp=XQYdV?i~brW%32KI?`xp4YMUfw7DQ5Nh8CjJueK6cf@y)
z^;7_ucb_e{;x`(UO1*BR_yRxdSI9GciC3~&dom@|kLc4qz@RVte$qhB#$-F|fAfp;
zLnKKQtkO!^(4r2%KmR8;!m3+UTPEl{xp7XBFRZO5eEc~_gl`lX;jR}#nnxZ=qf`oN
zy1AR|tLcj=k*y1qtgQC${k^5=<e2R+sPRkz63K`D5YpI=vX!(kt1uO$H?EIDNe104
z5e-%W3&U6=?OP)8ds_%mUBu<`$y?Lhd6jH=OdOn33>}TT=APoQ$Zokd5eODlJwKc<
zG=-AdXwy(SS+rqENH3|aYl|Xb4x$z)4K1Y-{Lq{dzPNBiHm&7u4D)`enn*;U>NS%B
zK9I_7@>aX|LiMIbI65kNC`xlF)R%|>O|ks>RM#2P!*oXPlHQ(a@pYi%khZzaZacZB
z>!ZXM((kUqe=^@34b0;lR8qS_aF|kiR%7(c!f;3i&<Y^2QWeapk@R5uA>e<nAD(|N
zrQff=UU~`YtVd4O*<Ck)q<y0GuA)x<EA{brP$U_U>0S4FX~hmA%>~}5jJZm%`Pr?s
z3GNTJ?yw|JESgnf^(QW-A6@m-;9HR?Dr<T&a(oPbYR81hMB&RU{>n%qA(@Qt5#Yu{
zapJLeVQ%&>L9AagM?Czd<`cECU+9dgSxK%aOFLnO9B&Jak(E^dY>1g#2rTs#ux0Y>
z)d~lwvVKFsv05}Xh!vc?V~aI}#1&#sn>pAytT9gLx5xH&*9HBOG|BTAx6%L3BeKbs
zDPTb1V?e3&t*Z;+O;#*xUAZMk<EYtZum&Gh!%Q?4(^KJ@%`EgUIB*WFN|%{Z0u|H~
zlyzo`OP&Vn948|IummFcA>_o}jkz+gOH~!6SdH`AH7B{+!6s}`K#~S=au)A^ySVnY
zK&1VAxWb<#^Vzam?Kt%kFAb_xWvMLAh$T9ef55FrekHsuz`tM(`m_R~ol#h{KcB1s
zXPyK-p2^m#1)<YHfI%YI*mQ<#kppp4Ri5xi*)VrMT00&$;6{}VJ9fhpWXau%TSrY+
z5n}K<R$60zrOa=^Qp+|&qMCn0?<DIki-HStl~-yOVIEEc)6kB~Cl_cX-*oRil+APi
z19fV*p;J4;nZ^#$sX*71qT3^CpVs-nCY4HE0%a$2uT6oG_Mq`tQlt$%!P+Ail*`3N
zpQJo44jwH9U~U12d3Ku25ppSOwZvRY>d$Uzpjn;tGDR@lEj=q+{_FT^s<gQR@eWqQ
zI*8+NZl6!5D%G#sXf|nnE?*tW^qKtH>xC6nC^eY<vN4|K8?O>$Lj1d>sjhPeHCh53
z`tG*OQ@$azY@<eeT&egpY|(M9^3N(nll;)E!!c6;5?1qZ&Yk?bRuHB^xWw>Spxt#9
z6!`tRQsB;yH0<|X<ger#%kROcrsZFJBIX1vtstDHNU<0fKF{-XzN9_M;d_Q8)NyX=
z;q}%avo6kb6gSa6lcFw<ay)HCZ0wjs@>X0Uw$nOe1zO|8dbf*6hk+-++2+X5q8bvc
zEiqbvUl)YTGv<rUz!n}be!$(r9H>Mt5O5c+xfpR|sR7}|L5*Dnr5uN4cL&?jS-w%s
z3%T09NZ*A4X@+11kMPCCk>SkX{&H(aM~R>WM@H0@oFM0@PU7%wynDZH+&*}^FMzF&
zR!CV&L{ziXLCKm^MO2%!tX}E5g%aLUNRSN3{)q~O!an)A<U-)m9@U)PM7AlW-nZ2g
zP3gUd^*;3Z?s-d#t>&-CtK62B34M0MFNRBRnh(GXMK>df_eMUBtGSwnPtOzaIc$^3
z96_$6XABpIklIMQ=}4aEqmQ_*3VA}*8=Uq&{0!_CiTH>p?s0AoK@pyI34$4rZvaxD
z`r>pI*mVSH-a)2&WB?g2pfAKgeDeCD_t_W^kHVd>^p#puVylx3X6cTyD8+1QyJcFN
zQu!C|M9dkrZJ9tm^5z6S$_uD1{(+c*?wQN}X$RjUZ{4Ti#ZJy>g<bJLD_K6`BDNCK
zelrf12L1I9lBJ>0@dDE?EtlV`vqOM*0-@P`Qst~6?<Xgjl)-CMVh^C>b@)UwK6lmq
z=5SGQXM4T7?&NS?V8}2khW~zW!_)sK!y!k1e??>ehvsaQU;2~Xm*4UE4JuFa1VZa1
z&ox;<PnGm*Ds25e_gZA%m`fp^JPC7*8(mPI^%}_~N}M5U+KZ+>n8zkcH!=e@k_o%7
z^F8HA^Pb<sdADdtwyxSt?MW+M5qiSlNpQG2cu$=Atk)Qy=XRdrPX)by?B;^=47l&T
z4s10&*3Ua;cJfHQfu^C`t4gjs-C}P8?&tTx58iI{C+DY?UlkAa4WUu_eKrXKoB0$d
zd->R0YbPDeFuYhp-MoK7Ur7T~wEbGgoJvVUquK>-P*UzYG;A;=)~;Q=qQQ<Vm~}<f
zVKK+J?t#{=JS)l<R5FS@0wd&?EfX!BG#6o`Hw-yL{82wg&nH@Tat_uXh&=|s-FSJ(
z24pHSynM2e&!=tW{USsil_?;mB_3_c6eJtWkjK%lNR_deWDl1brIQ0ZX)xreRZiK_
zM%j#jHtD!L865zPwi0h=?uvoN30(|#M#Tw|(>$nZm0mAx(&4diVVUC_Lh6yoPiaZQ
zQK#Q?ax}N@8cz%pwmDrL!S*i1n={fXJf0~*EY*E@3nN%=;wZ7ike1=f!r<8+HH{7Z
znf$TvtO({r;mT@xVGBS3R!4qx+9AwBWUfRBHU%Z)u|QmATUdWy{>y6(k`8K_FLhK&
zvm6r2o=@ETTklmb$7%Px0bEt7Ic_@#${mLGo2J(>h{$)qpwCu6+8UG1`LC#O8ULNA
zG`#nE&02b6J49Gs1mt!*X0=hlBE}i^U05l`T~rC>_@7I=h!+8eQX(BIf%EsBa-_Po
zax3C46(jbWQT5q@?70V!y(F88)(v2wc^b^#CAROV<#b8J#l<B)MoK{Kq{R|dwF#Sj
z^|oN!4qAGyVMd22tGEE=`Q{dhc`(QKbj1XxgZT-v7h5XVh{O^3&~i?qf0@8b<412{
zkmT)M1`_Ir>0%&_UP!yZf-tt{CMfu4Y~p=fUj~279io-B(Xg9jv7wVw#l((}ZD>TI
zo3d4$Q#=6qERi&9e^FeTwbVgb5hN(PS>f66(VHK60d585p0KK9$PvS9e2HjMfC`%n
z^+z^-#nDw^9W%|fibkZCn!G!&q85@Kl_RM}9D6<+XCu%Hb5t|;_2G3s82vv$!r##I
zKcU0__g2wA@b>>4Bf#;A`%N=5WKRdS?e8NwNLpM$tXjk<_^*RKJUslr4)$OLN>V^|
zn-4pn8-STv;Fl2|K%zLs4u#RwFM!eB5FwHo<T#?F6MQ~#T<$xbpRbzox}P|Vnc?_3
zadhO_1t#{nGC$jz#$@|QYi*Nas?Q*7q6&x6TozZg{#|f6ZQc;i?Smwj9nUQ4d#SG&
z5hBBM9h7NU>yeJ!je&`<FvM4|5G24ZiZOR7+K7Yp&fckn86%0dsTfJtvIu;)GV>RW
zik-QUcjgYQDqj}HzOSvRWhL>tTxUjGc5{f+y;#%gq4Q%AR2)BA^LEY4=+YR5mXtSo
zI4=qWoS4{>{qhWjzUf;`Zt5?vm6y-7W5m#ViOo!HI$z+#`uZJNG(^})*>D9|!zMCZ
z7ZbB$dMSJ++|}<{aAKY%+n|tSoX)pBIG}<1bWiSrSC*TXlRf{VkJP(IP~>Zn?IERn
zulgf@^t_ZutvpG@mdz$*$8NARq*YY{YKo^fVKDV`Lm=|-1@Vh}6vAGyDjObpG%@2T
zbgZg}Brhf#LWwo`<O{YV`714e-l|C8Qz!<qd&G|-I_}w()l%{ReIv&j)(FeJ48Y5O
zJ9AU~ig<~ln@<%xB^lU4uvK;r*LB@&bhO<2u`YB^Xw`(uFJiewMCpsrCY+3bY$5jO
zA-Wr+Q-WBWtKJ4TY)@E0UssgD3f8LL)SPB`(zd`SY*C?xR3ivENd*GHuie57(Y<sk
z#f0)vFGK7i>Y46)9_Gux9yBs;^JiACIoyqfIo^Zwf*N-r#X}a@I|N1<l2y?LE9@bH
zym#ZZQ$o7AyrdWS$Y}Q3epyiC?C@zr<4|TCKk~Zsro1m5%amX`4RL>=@`{})$!S9p
z&ag(%&n-(g`lLQp0<VL<>gXvSHm7fUC@9*FMK^^?2BnH9Rcx^H(H`!FjKuO=uPm@#
zv8Zhw$R*y6-kXaL8LOxLSfna&vG{Qm$VlV_25l5l^uWl~mBT~5tMMyoQ7#_ugLjdx
zJ`Iq&^;2w>?fcAajvC4xk`a;`iMOiY17lz&Y29P$Wg6Gg3XtCgD+lM+Y3n?!o30eg
z<@FQ{Z-jq@gM{tFd(I7LIDUIe9{j0VkFL5lx*}y-L`CiV`2cd`)?(^tWX;ne9Tn6K
zj(|G4tLhl$;l8<$SqK#Mpt^o6Dakt<p{@x9KX6xF6ot@fDwnD`tbZsUr>9q2h<yLi
z9}Yf!Ep7Q44`3U(eG>I(lsRdcC54!`NLHlaQAGQd%Ou}_e`UcqbBzhF<fj)aG=<vZ
z5lH2#W_7?l9NCLO<_S?N4pQO!_!`1wX9<B{QyhkR>j&#SoZrV!02R>sGTf8ApG>S#
zP3I)RHbmP?1anyny2Za`Jp5@xYi`7N&t$CLURaMx25@~HAX?IpZ`DRlT3gAeOlh3q
zdK+lpFkj~T(^K0J8E);iuUdhtg!?<3ey5KsFW0ZHg7uay^9$=U{Wr%e{ceXk^YL?4
z+SVaQb5nOto9`7nxnm2y2Xv9(cSc+mkXZJgN%<Nf-#(tTtPm;Qem7gyzd!fA)s-c^
zWnS~}WD~UBh^3DCY3Ao)FEIZ(b;WL9uuE(x{zt`y$>{Il8-Kwl$-=?IN?w~}L4!c9
zlpxT5l9S+A3@+$D>?GJ3lNtVR$`V|OP6ifaLPq{4j|t|$<o#Qf3`~NF`ETJ3BO(|T
z1OBguKel`r*nbJJ7-ZlIMpSU%zk6AK@1K8dp!H}J{1AWXea0jOR(R06E>z)dnimCz
z>vk!nRu=~#t%G2aOuqB<7+6O&MX3}Dsr+g^zdltx1D_@&n@J~P7dJtD;^pByAetD;
z*h=W%znkGIoF{Y@)_Pyt**n$bL|l{bbu8+I<7r!OC9kA=wQe97+Kaf3EY68BCvX5W
zKsWzQOl_jVY4VUM5Dty8gD<WXYtCwc@X@u(nLuE^X*@E4e_2;QWNaDJ(cI8Htm?4P
z8yF+hn@8nczERiEa<b9(?|r0qgmK43?jWI(N+OJ5qPn_|>P%uIXg{~8C$N)%8ceJ9
zbamaau@>f`b&?(}lL!lnq0<-)JwbWTJtU!3*!7IvBuA$JeB#~j)DNNb!JP{=g+SM;
zmKhJgN^z(E*=TS#QGHuC@U0i|YTdh}cTSBU>_ycaJJp?nQj_Vb(}Pr~RFLHS-h1Fv
zR}*&Ac6lJU=$;Lwt#T5dp_Cq`eu+~b;OTJsc8}>ZgRtTB_8m)ah=Nz3m6BJsxV!>X
z_5oyHuWiZ?V1QcXBRUgem+e;=t<Wmf*B7T({7R?LJEI?Li{!NlwCld%6=V(7H`9AO
z#(KCPwQpFu(3!e7o02f>S>DKGil)6sCMpoJ+!Y}Rl0U6PSnsHqoj><$apo-5Q{>0#
zD5zi^NDXzmh!HfzJ(vkDcD5P~bcS80PRF7WQLBh!0N9h+)9Xmn+4yH<*wqjPdO0>;
z29gLr8;?gpQ$kS+$PQAS9k=#=vhO}pE39`?&Z})Yf+Clwqid>ntWM%RUJMN(uUBhh
zez@c4CQ8>KTQxC)@PxJuf;<i7$v5$_wefprmvIq&|Fw(8$;j$nC!RJu2R4i+LL&5>
z`VKCc6}YMmXAfyo&(PV*q59a1p~U<(99~(NQVdo}X(19T$KQdwQ4l0i^*Oz#5ndN9
zzH0Tj=fkdt$o3(+M?9sE+zzZl*k<y)rPY91nXg4BI<d`~{aA?|aWN*cG$xNv?%QuS
zmSMI%9erAZDw?D`7uJLW9@W|;ZkUUl>9WCLjeyY(@6cg8`%q1gk%&28-n$S-snUt#
zikRLh*`j^J!kLM<X6GF{RSH-Na}9|iSj}`s&6+p?z^N+M6H5WcL+h<{XsPOa>idB&
zTW6$k&4Pq_2Avp=QJF6}XcA831FO<gnEVnus4Pk{=Jv|PFd64$ly3{H(ym4<RGaZz
zo&bJ~*{~@2R*HkkvP}MK{1PO!TiE_dYv4BABZ#BB@|5Tl@eHem#HeLh$eH^<NzCN4
zaC#YC86R<K&2j=`6m;3=VRIMtpP#$e+xET;H1jQV#auoz_g(0O0^8!ybO%#N7nwVo
zFP!83?H1UG3C9%fQ$*B@;;s^|P1plt*uc2F9WkCP{H6~%@9wvmPXhji2^I2JxV4kT
zvJ=x{f>7AH72n_aznE+GZ_V~yfgc%JXr!GLzLLKaI3xUy{d)HlQT)t9=Yl|m@a_Gf
zn#-Be>yu^n7dZQCti1|g|EJH}yf;*aFBH2chq2eU#3v_K06T<5qc6j%0zuy51uhUn
z{yeKV=qh{W$~^GteAeMiz)ANai0&H|!uGL!r`@}5cMJHJVHMK`Lmlu^>dDVui%y67
zPgohZl4~9;3VVBarv|yB=STrvd@1_fW9O&dZ2cZ*^g?aE8)j96YQZ(rcSJ!U(8A8`
zS^{IL9p6Bmx}8hcOqY;L9XbYR*EWE5<8IRj0kdFUB+n<$T4<jorApTDX`4*3+v9YV
zm*_osMs>&Z`}ikbJWA9z(fjEl`nqKFZW!#eFB#TmlR`ED@G%4oaH@@MIGv}~pCHN&
zrRucZ{m1hAws?A_ww+AkUBs-Cqz-gUJ=B-VEjoLPd>%?`Lw;tqlp$sc3Y7ycXT$oC
zJ5P62^x<F=5aCZK#~8$PjcK!Elmfx=U;ZcaKW{7!KS;JU{_H`M^oRv?hLFRDF5_M`
zx{iidXCh2y@uQzpmEf;~qF#O;=?c7eD&m&-oL(IH4S0RFJ$fJ}$sJq31bjN4oVPDJ
zDU?2Z`~sKzD&y%JKy!~}xi|n|K<?e6B?F;C`W*Hz61#KCxZL>q9VY&PAEe(`?7=(j
z>FnkSzt~(hBoLp!{WdXX7ItF6@U{{MGnF6^DfSTuKNl}mO0C->gT@bOpkPneioD=t
z?9%7mmx)S^iwDcYH@Guz{5Jiz1h0JR^QmdMyp@{Z&-&cL!^Y>o2&vivqPwHVv%vx`
z_XlY#dENfM_$o>>SDK0g)C|O(mMEjzZcmblbS-xd2lWH;KT+{a^RNtNP0Q48+*1y2
zGtC>499hZM_?XwadH#U?7WEqbZAABMyrllRhqx^yob)(}O3uyA@o|*BhVI!0ry!*H
zc=B?VG%|7;*wAb<YM!P64mOSfJ-!#xKN)*`pP}d%EC`fC|98gzJ8AwokNjN_f4{i8
zdE1%0GJDzEt!ZC4tZ<>fc6~-qF3<`ZNji0_T3hU`G1dwyq0PL3z>iA$lR}l7X5xKw
z1?F<iBvp!T7nH#s`dRq)U!Q=rtB3ZTD_TQ661L-0Ru+V@1qU7^J-7pm80p;VwR>*B
zi)D4}8yX&?v{b0(yO?t1gFc3VHv`2`qu#C4eT}+TegjI<qv{{o^s2=gOkgJBrpu!Y
z%F1pc*|^m8gR+((Nx!O@N7)}0t{ky5IH~gQTM4Rbn*`02`1F;~lga?cRO2yP8f3zJ
z2E?=@f|YAk=mVqo_fIc&-RbXgAGcguZ&GIYh_&^Uoy(P+cTJ=B%!)}TL^h1r8K=}<
zDVvT|49uI;6-!_dW@Bu6oe_R#(D5<r@Jzm{=jCE>y=~gZDPnt!ylhLvRfQDs_X6s;
z&Z^v^Cj6Kic)xJq=L7-GFY(?3^<}Qob}{9VV3QwgoNZ;3`1RE?Fr7;&?bl>H_qVQ4
zoq`A(u5Vc#dp?0L;lB^FP1KQ3gYX^$FE15JI)q(Y50%Fz{XQZMhPhK_7@P*?w62xw
zCVs!FqA!Nc{J}#K8qAMG+Qei>=qP#lt5SVT;kx?<r&POJfj$%nVtMC*1nL|z8B_Ho
zrmP$_?L6Zkcu+D@D1uimZnDv~vOqRRW7W<hM?tFUlVRm-|Hf=Rg=}h|;X@fgX*y6|
zu(tfuycJ!vpvC(@HiJeHr!?#KeO$lWxx@HK1}hII7Pc|VAO;gRUfcGPv813Z&BD1Y
z<en<idaDF4C0#N=1@#TSQ@34FsdqH(O*V;JPO5d(y-Id}x$$+fuSzPDn6Mc1o_Pe1
za_d%}$C+lJ@`1lXzGTnD+-<3&{wDUpxlB;~ke8=?-3dME<p^Te?kTs`7#jy`JI;F#
z4}dZ2*m*6LfW<UBKYIRKX02X(5n>RYv5Y<x3%Vqo<iI?@V8m_24DaTp18r5)hsZ)*
zEYxauhue+4Efu*6>Cd^hFC{}`C$5~UK?_4SF((9_W#Dvq{?fR@xg}gB?wuxU+9xIG
z5LeV>4&B{(q?-&UFc6`frO`#DU!iex92Y$X+R8#&gPmJbVnECUa|f+J@ZPFQxTvS7
zOvOmch#>%bV)7hDGs}_m69wMgM49x+6C1D=IQ$ai*mc)99ewA4LG7oh$~*G>3a~4Y
zbNiAfT0>ulAIWT`!%H=lhK;p|vJ={($HLIy6{k&#=q%L>&Y5h~QJR*&%I%H4k#$HZ
zOBN3CO{Ii*9&WYC!fd}f9Y4PEE!M0D7xX!Nd`}Iu8E=s5Y~|&CkRBLol;>B&ZlGSV
zE#9LL<uvpQpQSFGe5oMvyq+`!HpaT5>)45J9GR~UVqQO7bu;`B9BNXc^M9M5Q%~Bp
zaf`6K4lHlDnq;}Ub~v};Dcy6y^2~4Hx1PBUP96pA*K=3E2-cto5aPQpzSXJHrl8!p
z@{Rz;X11K|SS$?dz0am{7qdr)9_<N(kWiyy1z^I7aQ2gT7mZ{jq~Aj>fwj6kgi?$s
zBHOS_rRO%PZ;j)n+rs#<PG=reM=}H>bGT}cJyr#*KKj-R-sa(tXy)e8uxeQ6C#GVH
z7)`G-Xb+fE<RpZ=n{W<Fq{J$hN4=qnOpODQ*cS7l_9Q>qa`*jU<6lo-VI(ItK3C$p
zGR?SdF`ADJM=P8SHAO7WKH?4_$)=uuF`x3BzF3Vvmdscspp`Uu+EyDr&nx8Dh?>u=
zj%IX&6Y~GO8^fR#m?k`@-Ja~beTNTbsytupXdc8IB=gG&9D%aZg)=6Z*r&E4*ro#_
zX%&Rf8{k^QJtZ77(0_C;UTfFPE^q^@#mi}5HmO%R;QZ{KcJ2#V$$hRb=zLUM#=ICe
z8YV3dSa(Z<&$D5UB_R;8PcB@7m+Gfz3l2l<bbl<)Ue?nlbf@OPLS`0X-(waxPdk!<
zf93hD<<0%FYAlB#ps$Mhu?Un4TOR>x5sRyEP~r;h-K|Q7**Lead$^`?>v{$T1`lh!
zK1GKKQ&AnUg}l|$2=@2-7d<npi%T1$jk9Re_G?6rBJ75yl?TD^=H9*(AqB(_J(c=v
z0@6;wOWyI?u0KBifCr=czg?P8B&3PVmyZkxSf(iCRJD~l%bz%%lG^&7i^vCXBK?@1
zgXPjd|8O7Nir3}DExcKwh(2o|wYhIO#FM?|s1qD}<W$QSG3kf<0l;O(bs6fzX1J}5
zA(836d+gFt;0wSiJ#Wq0t3#MIHKg@?*|OO}0~))3;{C~J$?`3talbPfA=&?t(ZEK8
z*ns0FR_w6*YlegsriUQ%uaIpO7Vp$0Z6uDF+3w^=k!vYTWu7j^D9ol6aO-cbJpCpb
z$-8~|IeHmdnwm<4INs8NK2=tK>k{hbx;G9#A9ZY9JF|fi(VctK^Kc0=fDM^zFj=Qp
zI*6^QtI{>zh0xhbsgY!j5!ahGLCj2PE&;dz#GCCGWuw)5|Jk8LcVD@M6V6-@JhcjT
z&r>~iWgTNHBRQ*gakK`DwOg;LgiB*G^UJPNk(0%rc_iS6u6+vb6;Ae-K~O|H1qC;3
zepLnC!oAkdF-VrBdJdkI%KNGWdqR&v@Nn$Ou~X_&T2l2W=E0W1CCU=sa;73uAAv7C
zE>&MO87P8j-jXY)4%*7loCJR>%eNJL?^nvtoumG1wX*9PZX!>C{1uevf2_|rm3oEu
zNI7{*f{bi&GD_;cx9Lpyh6W=hDRTXT)a}DfhyTR1{b&f1iLcuoH*LJM9D&jZ8?z=K
zxr{|r?2Om|hdP6{I==+vLTnD-bDTof&ZME!Nd$t9VTI9jXC)zg%2_N6x@diAzBO(f
zb79pWNsJsiv+MH_#8qQn@$+vs0S^Ad_RXgn2oT8T_id*CVo2-hr~%b6n|@aGjsu3+
z>H(E3Rg79!_#32YG^MjfriA&vcEphlO)ee}x*&X)m7&vdE4()!H81Lrkj;D<zef1s
z5g5%a;I4@H<#qp1bY}E~bDZK5syrZ*b(OkrKz9~eBdRO<?nU-3<s8arP4hcc-LIGh
z@U(y~!D5U{8k0|)djjzJ=T=jG)}bB=vS*l5yi{sk#Bye~BLt$ch*J|=w$X8LV>a?w
zqoTAiNL3ZCN5sC?<-G7!*z^rut|&o`ztMotOfcb7mKuEejJ;He{|6(BmO8?ftVl%x
zuBN#D2IA!k8g3~JNd`6@?J9z%s7X%V*>6~V2)9i?gGNZ=;R4uiw<8@<4FEJWyIe|v
zQedP0`Cpt2JHfs&=I^L2{VQq^kl3JqUl{{4FtGjCoiVU20|({b81SEb4)Wh%@Lx4M
zI+%q8_uoX0KO-R|JPtS$gADb*hPYrLgcQL61DM4B-GjkI2<e3bW@4iKi<`;&E!W_H
z+nJdDlK)tq;ee6<x8<K63S2M}BlTaJf4-!R3sz?Qe_#6JO(HJX=zn|jM{^AKw>P-p
zDRg+VzkL0Bx()YM(=fk774kb&|2bVKJP^p<*umPu+|`ZQ#mquU_CGEE38RtzBTypv
zU<GCZvOm<<KX;}-i2C2fn-tv1jIZ%W>7R@I_r<<{ln>OueK2=3{sY1Pd;EX?WSoE4
WfIyVA;9fdBa3BjhtT)}Cp8o+`AV}N*

diff --git a/tests/data/Reader/Ods/nomimetype.ods b/tests/data/Reader/Ods/nomimetype.ods
new file mode 100644
index 0000000000000000000000000000000000000000..26d53847fa9feaf647b03898d8b89cdb05a3b194
GIT binary patch
literal 7058
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
F{{VDZ14{q^

literal 0
HcmV?d00001


From 6a41381c1d562d9dd48973d0a49c303531ca2ee3 Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Sun, 26 Jul 2020 13:51:13 +0900
Subject: [PATCH 104/153] PSR12 code style

---
 samples/Basic/13_Calculation.php              |  6 +-
 .../Basic/13_CalculationCyclicFormulae.php    |  6 +-
 .../Basic/45_Quadratic_equation_solver.php    |  1 +
 .../Calculation/Calculation.php               | 57 ++++++++-----
 src/PhpSpreadsheet/Calculation/DateTime.php   |  6 +-
 .../Calculation/Engineering.php               |  9 +-
 src/PhpSpreadsheet/Calculation/Financial.php  | 42 ++++++----
 .../Calculation/FormulaParser.php             | 36 +++++---
 src/PhpSpreadsheet/Calculation/Functions.php  |  6 +-
 src/PhpSpreadsheet/Calculation/LookupRef.php  | 33 +++++---
 src/PhpSpreadsheet/Calculation/MathTrig.php   | 48 +++++++----
 .../Calculation/Statistical.php               | 84 ++++++++++++-------
 src/PhpSpreadsheet/Document/Properties.php    | 13 +--
 src/PhpSpreadsheet/Reader/Gnumeric.php        |  6 +-
 src/PhpSpreadsheet/Reader/Ods.php             |  9 +-
 src/PhpSpreadsheet/Reader/Xls.php             | 30 ++++---
 src/PhpSpreadsheet/Reader/Xlsx.php            | 24 ++++--
 .../Reader/Xlsx/ColumnAndRowAttributes.php    | 12 ++-
 .../Reader/Xlsx/ConditionalStyles.php         |  6 +-
 src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php  | 30 ++++---
 .../Reader/Xlsx/SheetViewOptions.php          | 30 ++++---
 src/PhpSpreadsheet/Reader/Xml.php             |  6 +-
 src/PhpSpreadsheet/ReferenceHelper.php        | 12 ++-
 src/PhpSpreadsheet/Shared/Date.php            | 12 ++-
 .../Shared/JAMA/EigenvalueDecomposition.php   |  6 +-
 .../Shared/JAMA/utils/Maths.php               |  1 +
 src/PhpSpreadsheet/Shared/OLE.php             | 68 +++++++--------
 .../Shared/OLE/ChainedBlockStream.php         |  4 +-
 src/PhpSpreadsheet/Shared/OLE/PPS.php         | 12 +--
 src/PhpSpreadsheet/Shared/OLE/PPS/Root.php    | 28 +++----
 src/PhpSpreadsheet/Shared/OLERead.php         |  6 +-
 src/PhpSpreadsheet/Spreadsheet.php            | 12 ++-
 src/PhpSpreadsheet/Style/Alignment.php        |  6 +-
 src/PhpSpreadsheet/Worksheet/AutoFilter.php   | 42 ++++++----
 .../Worksheet/AutoFilter/Column/Rule.php      | 12 ++-
 .../Worksheet/ColumnCellIterator.php          | 24 ++++--
 src/PhpSpreadsheet/Worksheet/Worksheet.php    | 18 ++--
 src/PhpSpreadsheet/Writer/Html.php            |  3 +-
 src/PhpSpreadsheet/Writer/Xls/Parser.php      | 24 ++++--
 src/PhpSpreadsheet/Writer/Xls/Worksheet.php   | 18 ++--
 src/PhpSpreadsheet/Writer/Xlsx/Rels.php       |  6 +-
 .../Writer/Xlsx/StringTable.php               | 12 ++-
 src/PhpSpreadsheet/Writer/Xlsx/Style.php      | 24 ++++--
 src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php  | 18 ++--
 .../Functional/ReadFilterTest.php             | 10 ++-
 .../Reader/Html/HtmlTest.php                  |  1 +
 46 files changed, 566 insertions(+), 313 deletions(-)

diff --git a/samples/Basic/13_Calculation.php b/samples/Basic/13_Calculation.php
index 087b443f..ed2e1dcc 100644
--- a/samples/Basic/13_Calculation.php
+++ b/samples/Basic/13_Calculation.php
@@ -157,8 +157,10 @@ $spreadsheet->getActiveSheet()->setCellValue('E23', 'Mode of both ranges:')
 $helper->log('Calculated data');
 for ($col = 'B'; $col != 'G'; ++$col) {
     for ($row = 14; $row <= 41; ++$row) {
-        if ((($formula = $spreadsheet->getActiveSheet()->getCell($col . $row)->getValue()) !== null) &&
-            ($formula[0] == '=')) {
+        if (
+            (($formula = $spreadsheet->getActiveSheet()->getCell($col . $row)->getValue()) !== null) &&
+            ($formula[0] == '=')
+        ) {
             $helper->log('Value of ' . $col . $row . ' [' . $formula . ']: ' . $spreadsheet->getActiveSheet()->getCell($col . $row)->getCalculatedValue());
         }
     }
diff --git a/samples/Basic/13_CalculationCyclicFormulae.php b/samples/Basic/13_CalculationCyclicFormulae.php
index a446e56e..b7c6a511 100644
--- a/samples/Basic/13_CalculationCyclicFormulae.php
+++ b/samples/Basic/13_CalculationCyclicFormulae.php
@@ -22,8 +22,10 @@ Calculation::getInstance($spreadsheet)->cyclicFormulaCount = 15;
 $helper->log('Calculated data');
 for ($row = 1; $row <= 2; ++$row) {
     for ($col = 'A'; $col != 'C'; ++$col) {
-        if ((($formula = $spreadsheet->getActiveSheet()->getCell($col . $row)->getValue()) !== null) &&
-                ($formula[0] == '=')) {
+        if (
+            (($formula = $spreadsheet->getActiveSheet()->getCell($col . $row)->getValue()) !== null) &&
+                ($formula[0] == '=')
+        ) {
             $helper->log('Value of ' . $col . $row . ' [' . $formula . ']: ' . $spreadsheet->getActiveSheet()->getCell($col . $row)->getCalculatedValue());
         }
     }
diff --git a/samples/Basic/45_Quadratic_equation_solver.php b/samples/Basic/45_Quadratic_equation_solver.php
index a59a0ceb..84c126aa 100644
--- a/samples/Basic/45_Quadratic_equation_solver.php
+++ b/samples/Basic/45_Quadratic_equation_solver.php
@@ -1,4 +1,5 @@
 <?php
+
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 
 require __DIR__ . '/../Header.php';
diff --git a/src/PhpSpreadsheet/Calculation/Calculation.php b/src/PhpSpreadsheet/Calculation/Calculation.php
index 57506ab9..19e2fc89 100644
--- a/src/PhpSpreadsheet/Calculation/Calculation.php
+++ b/src/PhpSpreadsheet/Calculation/Calculation.php
@@ -2754,9 +2754,11 @@ class Calculation
      */
     public static function setArrayReturnType($returnType)
     {
-        if (($returnType == self::RETURN_ARRAY_AS_VALUE) ||
+        if (
+            ($returnType == self::RETURN_ARRAY_AS_VALUE) ||
             ($returnType == self::RETURN_ARRAY_AS_ERROR) ||
-            ($returnType == self::RETURN_ARRAY_AS_ARRAY)) {
+            ($returnType == self::RETURN_ARRAY_AS_ARRAY)
+        ) {
             self::$returnArrayAsType = $returnType;
 
             return true;
@@ -3856,10 +3858,12 @@ class Calculation
             } elseif ((($opCharacter == '~') || ($opCharacter == '|')) && (!$isOperandOrFunction)) {    //    We have to explicitly deny a tilde or pipe, because they are legal
                 return $this->raiseFormulaError("Formula Error: Illegal character '~'"); //        on the stack but not in the input expression
             } elseif ((isset(self::$operators[$opCharacter]) || $isOperandOrFunction) && $expectingOperator) {    //    Are we putting an operator on the stack?
-                while ($stack->count() > 0 &&
+                while (
+                    $stack->count() > 0 &&
                     ($o2 = $stack->last()) &&
                     isset(self::$operators[$o2['value']]) &&
-                    @(self::$operatorAssociativity[$opCharacter] ? self::$operatorPrecedence[$opCharacter] < self::$operatorPrecedence[$o2['value']] : self::$operatorPrecedence[$opCharacter] <= self::$operatorPrecedence[$o2['value']])) {
+                    @(self::$operatorAssociativity[$opCharacter] ? self::$operatorPrecedence[$opCharacter] < self::$operatorPrecedence[$o2['value']] : self::$operatorPrecedence[$opCharacter] <= self::$operatorPrecedence[$o2['value']])
+                ) {
                     $output[] = $stack->pop(); //    Swap operands and higher precedence operators from the stack to the output
                 }
 
@@ -3960,7 +3964,8 @@ class Calculation
                 }
                 ++$index;
             } elseif ($opCharacter == ',') {            //    Is this the separator for function arguments?
-                if (!empty($pendingStoreKey) &&
+                if (
+                    !empty($pendingStoreKey) &&
                     $parenthesisDepthMap[$pendingStoreKey] == 0
                 ) {
                     // We must go to the IF next argument
@@ -4088,14 +4093,18 @@ class Calculation
                         if ($pCellParent !== null && $rangeSheetRef !== $pCellParent->getTitle()) {
                             $refSheet = $pCellParent->getParent()->getSheetByName($rangeSheetRef);
                         }
-                        if ((is_int($startRowColRef)) && (ctype_digit($val)) &&
-                            ($startRowColRef <= 1048576) && ($val <= 1048576)) {
+                        if (
+                            (is_int($startRowColRef)) && (ctype_digit($val)) &&
+                            ($startRowColRef <= 1048576) && ($val <= 1048576)
+                        ) {
                             //    Row range
                             $endRowColRef = ($refSheet !== null) ? $refSheet->getHighestColumn() : 'XFD'; //    Max 16,384 columns for Excel2007
                             $output[count($output) - 1]['value'] = $rangeWS1 . 'A' . $startRowColRef;
                             $val = $rangeWS2 . $endRowColRef . $val;
-                        } elseif ((ctype_alpha($startRowColRef)) && (ctype_alpha($val)) &&
-                            (strlen($startRowColRef) <= 3) && (strlen($val) <= 3)) {
+                        } elseif (
+                            (ctype_alpha($startRowColRef)) && (ctype_alpha($val)) &&
+                            (strlen($startRowColRef) <= 3) && (strlen($val) <= 3)
+                        ) {
                             //    Column range
                             $endRowColRef = ($refSheet !== null) ? $refSheet->getHighestRow() : 1048576; //    Max 1,048,576 rows for Excel2007
                             $output[count($output) - 1]['value'] = $rangeWS1 . strtoupper($startRowColRef) . '1';
@@ -4168,16 +4177,20 @@ class Calculation
                 }
                 //    If we're expecting an operator, but only have a space between the previous and next operands (and both are
                 //        Cell References) then we have an INTERSECTION operator
-                if (($expectingOperator) &&
+                if (
+                    ($expectingOperator) &&
                     ((preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '.*/Ui', substr($formula, $index), $match)) &&
                         ($output[count($output) - 1]['type'] == 'Cell Reference') ||
                         (preg_match('/^' . self::CALCULATION_REGEXP_NAMEDRANGE . '.*/miu', substr($formula, $index), $match)) &&
                         ($output[count($output) - 1]['type'] == 'Named Range' || $output[count($output) - 1]['type'] == 'Value')
-                    )) {
-                    while ($stack->count() > 0 &&
+                    )
+                ) {
+                    while (
+                        $stack->count() > 0 &&
                         ($o2 = $stack->last()) &&
                         isset(self::$operators[$o2['value']]) &&
-                        @(self::$operatorAssociativity[$opCharacter] ? self::$operatorPrecedence[$opCharacter] < self::$operatorPrecedence[$o2['value']] : self::$operatorPrecedence[$opCharacter] <= self::$operatorPrecedence[$o2['value']])) {
+                        @(self::$operatorAssociativity[$opCharacter] ? self::$operatorPrecedence[$opCharacter] < self::$operatorPrecedence[$o2['value']] : self::$operatorPrecedence[$opCharacter] <= self::$operatorPrecedence[$o2['value']])
+                    ) {
                         $output[] = $stack->pop(); //    Swap operands and higher precedence operators from the stack to the output
                     }
                     $stack->push('Binary Operator', '|'); //    Put an Intersect Operator on the stack
@@ -4252,7 +4265,8 @@ class Calculation
                     $storeValue = end($wrappedItem);
                 }
 
-                if (isset($storeValue)
+                if (
+                    isset($storeValue)
                     && (
                         !$storeValueAsBool
                         || Functions::isError($storeValue)
@@ -4286,7 +4300,8 @@ class Calculation
                     $wrappedItem = end($storeValue);
                     $storeValue = end($wrappedItem);
                 }
-                if (isset($storeValue)
+                if (
+                    isset($storeValue)
                     && (
                         $storeValueAsBool
                         || Functions::isError($storeValue)
@@ -4623,9 +4638,11 @@ class Calculation
                     for ($i = 0; $i < $argCount; ++$i) {
                         $arg = $stack->pop();
                         $a = $argCount - $i - 1;
-                        if (($passByReference) &&
+                        if (
+                            ($passByReference) &&
                             (isset(self::$phpSpreadsheetFunctions[$functionName]['passByReference'][$a])) &&
-                            (self::$phpSpreadsheetFunctions[$functionName]['passByReference'][$a])) {
+                            (self::$phpSpreadsheetFunctions[$functionName]['passByReference'][$a])
+                        ) {
                             if ($arg['reference'] === null) {
                                 $args[] = $cellID;
                                 if ($functionName != 'MKMATRIX') {
@@ -4949,9 +4966,11 @@ class Calculation
                 $result = '#VALUE!';
             }
         } else {
-            if ((Functions::getCompatibilityMode() != Functions::COMPATIBILITY_OPENOFFICE) &&
+            if (
+                (Functions::getCompatibilityMode() != Functions::COMPATIBILITY_OPENOFFICE) &&
                 ((is_string($operand1) && !is_numeric($operand1) && strlen($operand1) > 0) ||
-                    (is_string($operand2) && !is_numeric($operand2) && strlen($operand2) > 0))) {
+                    (is_string($operand2) && !is_numeric($operand2) && strlen($operand2) > 0))
+            ) {
                 $result = Functions::VALUE();
             } else {
                 //    If we're dealing with non-matrix operations, execute the necessary operation
diff --git a/src/PhpSpreadsheet/Calculation/DateTime.php b/src/PhpSpreadsheet/Calculation/DateTime.php
index 19860794..bfce2a02 100644
--- a/src/PhpSpreadsheet/Calculation/DateTime.php
+++ b/src/PhpSpreadsheet/Calculation/DateTime.php
@@ -274,9 +274,11 @@ class DateTime
         $year = ($year !== null) ? StringHelper::testStringAsNumeric($year) : 0;
         $month = ($month !== null) ? StringHelper::testStringAsNumeric($month) : 0;
         $day = ($day !== null) ? StringHelper::testStringAsNumeric($day) : 0;
-        if ((!is_numeric($year)) ||
+        if (
+            (!is_numeric($year)) ||
             (!is_numeric($month)) ||
-            (!is_numeric($day))) {
+            (!is_numeric($day))
+        ) {
             return Functions::VALUE();
         }
         $year = (int) $year;
diff --git a/src/PhpSpreadsheet/Calculation/Engineering.php b/src/PhpSpreadsheet/Calculation/Engineering.php
index dcbd5394..1256dd90 100644
--- a/src/PhpSpreadsheet/Calculation/Engineering.php
+++ b/src/PhpSpreadsheet/Calculation/Engineering.php
@@ -1674,7 +1674,8 @@ class Engineering
         $imaginary = ($imaginary === null) ? 0.0 : Functions::flattenSingleValue($imaginary);
         $suffix = ($suffix === null) ? 'i' : Functions::flattenSingleValue($suffix);
 
-        if (((is_numeric($realNumber)) && (is_numeric($imaginary))) &&
+        if (
+            ((is_numeric($realNumber)) && (is_numeric($imaginary))) &&
             (($suffix == 'i') || ($suffix == 'j') || ($suffix == ''))
         ) {
             $complex = new Complex($realNumber, $imaginary, $suffix);
@@ -2729,11 +2730,13 @@ class Engineering
                 }
 
                 return $value;
-            } elseif ((($fromUOM == 'K') || ($fromUOM == 'kel')) &&
+            } elseif (
+                (($fromUOM == 'K') || ($fromUOM == 'kel')) &&
                 (($toUOM == 'K') || ($toUOM == 'kel'))
             ) {
                 return $value;
-            } elseif ((($fromUOM == 'C') || ($fromUOM == 'cel')) &&
+            } elseif (
+                (($fromUOM == 'C') || ($fromUOM == 'cel')) &&
                 (($toUOM == 'C') || ($toUOM == 'cel'))
             ) {
                 return $value;
diff --git a/src/PhpSpreadsheet/Calculation/Financial.php b/src/PhpSpreadsheet/Calculation/Financial.php
index 073e7c48..5a908aa5 100644
--- a/src/PhpSpreadsheet/Calculation/Financial.php
+++ b/src/PhpSpreadsheet/Calculation/Financial.php
@@ -395,9 +395,11 @@ class Financial
             return Functions::VALUE();
         }
 
-        if (($settlement >= $maturity) ||
+        if (
+            ($settlement >= $maturity) ||
             (!self::isValidFrequency($frequency)) ||
-            (($basis < 0) || ($basis > 4))) {
+            (($basis < 0) || ($basis > 4))
+        ) {
             return Functions::NAN();
         }
 
@@ -452,9 +454,11 @@ class Financial
             return Functions::VALUE();
         }
 
-        if (($settlement >= $maturity) ||
+        if (
+            ($settlement >= $maturity) ||
             (!self::isValidFrequency($frequency)) ||
-            (($basis < 0) || ($basis > 4))) {
+            (($basis < 0) || ($basis > 4))
+        ) {
             return Functions::NAN();
         }
 
@@ -520,9 +524,11 @@ class Financial
             return Functions::VALUE();
         }
 
-        if (($settlement >= $maturity) ||
+        if (
+            ($settlement >= $maturity) ||
             (!self::isValidFrequency($frequency)) ||
-            (($basis < 0) || ($basis > 4))) {
+            (($basis < 0) || ($basis > 4))
+        ) {
             return Functions::NAN();
         }
 
@@ -574,9 +580,11 @@ class Financial
             return Functions::VALUE();
         }
 
-        if (($settlement >= $maturity) ||
+        if (
+            ($settlement >= $maturity) ||
             (!self::isValidFrequency($frequency)) ||
-            (($basis < 0) || ($basis > 4))) {
+            (($basis < 0) || ($basis > 4))
+        ) {
             return Functions::NAN();
         }
 
@@ -625,9 +633,11 @@ class Financial
             return Functions::VALUE();
         }
 
-        if (($settlement >= $maturity) ||
+        if (
+            ($settlement >= $maturity) ||
             (!self::isValidFrequency($frequency)) ||
-            (($basis < 0) || ($basis > 4))) {
+            (($basis < 0) || ($basis > 4))
+        ) {
             return Functions::NAN();
         }
 
@@ -678,9 +688,11 @@ class Financial
             return Functions::VALUE();
         }
 
-        if (($settlement >= $maturity) ||
+        if (
+            ($settlement >= $maturity) ||
             (!self::isValidFrequency($frequency)) ||
-            (($basis < 0) || ($basis > 4))) {
+            (($basis < 0) || ($basis > 4))
+        ) {
             return Functions::NAN();
         }
 
@@ -1619,9 +1631,11 @@ class Financial
         $frequency = (int) $frequency;
         $basis = (int) $basis;
 
-        if (($settlement > $maturity) ||
+        if (
+            ($settlement > $maturity) ||
             (!self::isValidFrequency($frequency)) ||
-            (($basis < 0) || ($basis > 4))) {
+            (($basis < 0) || ($basis > 4))
+        ) {
             return Functions::NAN();
         }
 
diff --git a/src/PhpSpreadsheet/Calculation/FormulaParser.php b/src/PhpSpreadsheet/Calculation/FormulaParser.php
index f6c88b26..c11af834 100644
--- a/src/PhpSpreadsheet/Calculation/FormulaParser.php
+++ b/src/PhpSpreadsheet/Calculation/FormulaParser.php
@@ -490,11 +490,13 @@ class FormulaParser
                 continue;
             }
 
-            if (!(
+            if (
+                !(
                 (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) && ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) ||
                 (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) ||
                 ($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND)
-            )) {
+                )
+            ) {
                 continue;
             }
 
@@ -502,11 +504,13 @@ class FormulaParser
                 continue;
             }
 
-            if (!(
+            if (
+                !(
                 (($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) && ($nextToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_START)) ||
                 (($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($nextToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_START)) ||
                 ($nextToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND)
-            )) {
+                )
+            ) {
                 continue;
             }
 
@@ -538,12 +542,14 @@ class FormulaParser
             if ($token->getTokenType() == FormulaToken::TOKEN_TYPE_OPERATORINFIX && $token->getValue() == '-') {
                 if ($i == 0) {
                     $token->setTokenType(FormulaToken::TOKEN_TYPE_OPERATORPREFIX);
-                } elseif ((($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) &&
+                } elseif (
+                    (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) &&
                         ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) ||
                     (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION) &&
                         ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) ||
                     ($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX) ||
-                    ($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND)) {
+                    ($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND)
+                ) {
                     $token->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_MATH);
                 } else {
                     $token->setTokenType(FormulaToken::TOKEN_TYPE_OPERATORPREFIX);
@@ -557,12 +563,14 @@ class FormulaParser
             if ($token->getTokenType() == FormulaToken::TOKEN_TYPE_OPERATORINFIX && $token->getValue() == '+') {
                 if ($i == 0) {
                     continue;
-                } elseif ((($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) &&
+                } elseif (
+                    (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_FUNCTION) &&
                         ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) ||
                     (($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_SUBEXPRESSION) &&
                         ($previousToken->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_STOP)) ||
                     ($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX) ||
-                    ($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND)) {
+                    ($previousToken->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND)
+                ) {
                     $token->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_MATH);
                 } else {
                     continue;
@@ -573,8 +581,10 @@ class FormulaParser
                 continue;
             }
 
-            if ($token->getTokenType() == FormulaToken::TOKEN_TYPE_OPERATORINFIX &&
-                $token->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_NOTHING) {
+            if (
+                $token->getTokenType() == FormulaToken::TOKEN_TYPE_OPERATORINFIX &&
+                $token->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_NOTHING
+            ) {
                 if (strpos('<>=', substr($token->getValue(), 0, 1)) !== false) {
                     $token->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_LOGICAL);
                 } elseif ($token->getValue() == '&') {
@@ -588,8 +598,10 @@ class FormulaParser
                 continue;
             }
 
-            if ($token->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND &&
-                $token->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_NOTHING) {
+            if (
+                $token->getTokenType() == FormulaToken::TOKEN_TYPE_OPERAND &&
+                $token->getTokenSubType() == FormulaToken::TOKEN_SUBTYPE_NOTHING
+            ) {
                 if (!is_numeric($token->getValue())) {
                     if (strtoupper($token->getValue()) == 'TRUE' || strtoupper($token->getValue()) == 'FALSE') {
                         $token->setTokenSubType(FormulaToken::TOKEN_SUBTYPE_LOGICAL);
diff --git a/src/PhpSpreadsheet/Calculation/Functions.php b/src/PhpSpreadsheet/Calculation/Functions.php
index 148d75b3..2a4e6f40 100644
--- a/src/PhpSpreadsheet/Calculation/Functions.php
+++ b/src/PhpSpreadsheet/Calculation/Functions.php
@@ -67,7 +67,8 @@ class Functions
      */
     public static function setCompatibilityMode($compatibilityMode)
     {
-        if (($compatibilityMode == self::COMPATIBILITY_EXCEL) ||
+        if (
+            ($compatibilityMode == self::COMPATIBILITY_EXCEL) ||
             ($compatibilityMode == self::COMPATIBILITY_GNUMERIC) ||
             ($compatibilityMode == self::COMPATIBILITY_OPENOFFICE)
         ) {
@@ -106,7 +107,8 @@ class Functions
      */
     public static function setReturnDateType($returnDateType)
     {
-        if (($returnDateType == self::RETURNDATE_UNIX_TIMESTAMP) ||
+        if (
+            ($returnDateType == self::RETURNDATE_UNIX_TIMESTAMP) ||
             ($returnDateType == self::RETURNDATE_PHP_DATETIME_OBJECT) ||
             ($returnDateType == self::RETURNDATE_EXCEL)
         ) {
diff --git a/src/PhpSpreadsheet/Calculation/LookupRef.php b/src/PhpSpreadsheet/Calculation/LookupRef.php
index 6e817006..7c00ca32 100644
--- a/src/PhpSpreadsheet/Calculation/LookupRef.php
+++ b/src/PhpSpreadsheet/Calculation/LookupRef.php
@@ -286,8 +286,10 @@ class LookupRef
             [$cellAddress1, $cellAddress2] = explode(':', $cellAddress);
         }
 
-        if ((!preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $cellAddress1, $matches)) ||
-            (($cellAddress2 !== null) && (!preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $cellAddress2, $matches)))) {
+        if (
+            (!preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $cellAddress1, $matches)) ||
+            (($cellAddress2 !== null) && (!preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $cellAddress2, $matches)))
+        ) {
             if (!preg_match('/^' . Calculation::CALCULATION_REGEXP_NAMEDRANGE . '$/i', $cellAddress1, $matches)) {
                 return Functions::REF();
             }
@@ -495,7 +497,8 @@ class LookupRef
         // Lookup_array should contain only number, text, or logical values, or empty (null) cells
         foreach ($lookupArray as $i => $lookupArrayValue) {
             //    check the type of the value
-            if ((!is_numeric($lookupArrayValue)) && (!is_string($lookupArrayValue)) &&
+            if (
+                (!is_numeric($lookupArrayValue)) && (!is_string($lookupArrayValue)) &&
                 (!is_bool($lookupArrayValue)) && ($lookupArrayValue !== null)
             ) {
                 return Functions::NA();
@@ -750,18 +753,23 @@ class LookupRef
             $firstLower = StringHelper::strToLower($rowData[$firstColumn]);
 
             // break if we have passed possible keys
-            if ((is_numeric($lookup_value) && is_numeric($rowData[$firstColumn]) && ($rowData[$firstColumn] > $lookup_value)) ||
-                (!is_numeric($lookup_value) && !is_numeric($rowData[$firstColumn]) && ($firstLower > $lookupLower))) {
+            if (
+                (is_numeric($lookup_value) && is_numeric($rowData[$firstColumn]) && ($rowData[$firstColumn] > $lookup_value)) ||
+                (!is_numeric($lookup_value) && !is_numeric($rowData[$firstColumn]) && ($firstLower > $lookupLower))
+            ) {
                 break;
             }
             // remember the last key, but only if datatypes match
-            if ((is_numeric($lookup_value) && is_numeric($rowData[$firstColumn])) ||
-                (!is_numeric($lookup_value) && !is_numeric($rowData[$firstColumn]))) {
+            if (
+                (is_numeric($lookup_value) && is_numeric($rowData[$firstColumn])) ||
+                (!is_numeric($lookup_value) && !is_numeric($rowData[$firstColumn]))
+            ) {
                 if ($not_exact_match) {
                     $rowNumber = $rowKey;
 
                     continue;
-                } elseif (($firstLower == $lookupLower)
+                } elseif (
+                    ($firstLower == $lookupLower)
                     // Spreadsheets software returns first exact match,
                     // we have sorted and we might have broken key orders
                     // we want the first one (by its initial index)
@@ -823,10 +831,12 @@ class LookupRef
             $lookupLower = StringHelper::strToLower($lookup_value);
             $rowDataLower = StringHelper::strToLower($rowData);
 
-            if ($not_exact_match && (
+            if (
+                $not_exact_match && (
                 ($bothNumeric && $rowData > $lookup_value) ||
                 ($bothNotNumeric && $rowDataLower > $lookupLower)
-                )) {
+                )
+            ) {
                 break;
             }
 
@@ -836,7 +846,8 @@ class LookupRef
                     $rowNumber = $rowKey;
 
                     continue;
-                } elseif ($rowDataLower === $lookupLower
+                } elseif (
+                    $rowDataLower === $lookupLower
                     && ($rowNumber === null || $rowKey < $rowNumber)
                 ) {
                     $rowNumber = $rowKey;
diff --git a/src/PhpSpreadsheet/Calculation/MathTrig.php b/src/PhpSpreadsheet/Calculation/MathTrig.php
index 85f94cc2..fa4c74d3 100644
--- a/src/PhpSpreadsheet/Calculation/MathTrig.php
+++ b/src/PhpSpreadsheet/Calculation/MathTrig.php
@@ -147,8 +147,10 @@ class MathTrig
         $xCoordinate = ($xCoordinate !== null) ? $xCoordinate : 0.0;
         $yCoordinate = ($yCoordinate !== null) ? $yCoordinate : 0.0;
 
-        if (((is_numeric($xCoordinate)) || (is_bool($xCoordinate))) &&
-            ((is_numeric($yCoordinate))) || (is_bool($yCoordinate))) {
+        if (
+            ((is_numeric($xCoordinate)) || (is_bool($xCoordinate))) &&
+            ((is_numeric($yCoordinate))) || (is_bool($yCoordinate))
+        ) {
             $xCoordinate = (float) $xCoordinate;
             $yCoordinate = (float) $yCoordinate;
 
@@ -224,8 +226,10 @@ class MathTrig
         $number = Functions::flattenSingleValue($number);
         $significance = Functions::flattenSingleValue($significance);
 
-        if (($significance === null) &&
-            (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC)) {
+        if (
+            ($significance === null) &&
+            (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC)
+        ) {
             $significance = $number / abs($number);
         }
 
@@ -331,8 +335,10 @@ class MathTrig
                 return Functions::NAN();
             }
             $factLoop = floor($factVal);
-            if ((Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) &&
-                ($factVal > $factLoop)) {
+            if (
+                (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC) &&
+                ($factVal > $factLoop)
+            ) {
                 return Functions::NAN();
             }
 
@@ -398,8 +404,10 @@ class MathTrig
         $number = Functions::flattenSingleValue($number);
         $significance = Functions::flattenSingleValue($significance);
 
-        if (($significance === null) &&
-            (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC)) {
+        if (
+            ($significance === null) &&
+            (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_GNUMERIC)
+        ) {
             $significance = $number / abs($number);
         }
 
@@ -1381,8 +1389,10 @@ class MathTrig
             $testCondition = '=' . $arg . $condition;
             $sumValue = array_key_exists($key, $sumArgs) ? $sumArgs[$key] : 0;
 
-            if (is_numeric($sumValue) &&
-                Calculation::getInstance()->_calculateFormulaValue($testCondition)) {
+            if (
+                is_numeric($sumValue) &&
+                Calculation::getInstance()->_calculateFormulaValue($testCondition)
+            ) {
                 // Is it a value within our criteria and only numeric can be added to the result
                 $returnValue += $sumValue;
             }
@@ -1532,8 +1542,10 @@ class MathTrig
 
         $result = 0;
         for ($i = 0; $i < $count; ++$i) {
-            if (((is_numeric($array1[$i])) && (!is_string($array1[$i]))) &&
-                ((is_numeric($array2[$i])) && (!is_string($array2[$i])))) {
+            if (
+                ((is_numeric($array1[$i])) && (!is_string($array1[$i]))) &&
+                ((is_numeric($array2[$i])) && (!is_string($array2[$i])))
+            ) {
                 $result += ($array1[$i] * $array1[$i]) - ($array2[$i] * $array2[$i]);
             }
         }
@@ -1557,8 +1569,10 @@ class MathTrig
 
         $result = 0;
         for ($i = 0; $i < $count; ++$i) {
-            if (((is_numeric($array1[$i])) && (!is_string($array1[$i]))) &&
-                ((is_numeric($array2[$i])) && (!is_string($array2[$i])))) {
+            if (
+                ((is_numeric($array1[$i])) && (!is_string($array1[$i]))) &&
+                ((is_numeric($array2[$i])) && (!is_string($array2[$i])))
+            ) {
                 $result += ($array1[$i] * $array1[$i]) + ($array2[$i] * $array2[$i]);
             }
         }
@@ -1582,8 +1596,10 @@ class MathTrig
 
         $result = 0;
         for ($i = 0; $i < $count; ++$i) {
-            if (((is_numeric($array1[$i])) && (!is_string($array1[$i]))) &&
-                ((is_numeric($array2[$i])) && (!is_string($array2[$i])))) {
+            if (
+                ((is_numeric($array1[$i])) && (!is_string($array1[$i]))) &&
+                ((is_numeric($array2[$i])) && (!is_string($array2[$i])))
+            ) {
                 $result += ($array1[$i] - $array2[$i]) * ($array1[$i] - $array2[$i]);
             }
         }
diff --git a/src/PhpSpreadsheet/Calculation/Statistical.php b/src/PhpSpreadsheet/Calculation/Statistical.php
index b44e6c6f..524438ea 100644
--- a/src/PhpSpreadsheet/Calculation/Statistical.php
+++ b/src/PhpSpreadsheet/Calculation/Statistical.php
@@ -530,9 +530,11 @@ class Statistical
      */
     private static function testAcceptedBoolean($arg, $k)
     {
-        if ((is_bool($arg)) &&
+        if (
+            (is_bool($arg)) &&
             ((!Functions::isCellValue($k) && (Functions::getCompatibilityMode() === Functions::COMPATIBILITY_EXCEL)) ||
-                (Functions::getCompatibilityMode() === Functions::COMPATIBILITY_OPENOFFICE))) {
+                (Functions::getCompatibilityMode() === Functions::COMPATIBILITY_OPENOFFICE))
+        ) {
             $arg = (int) $arg;
         }
 
@@ -547,9 +549,11 @@ class Statistical
      */
     private static function isAcceptedCountable($arg, $k)
     {
-        if (((is_numeric($arg)) && (!is_string($arg))) ||
+        if (
+            ((is_numeric($arg)) && (!is_string($arg))) ||
                 ((is_numeric($arg)) && (!Functions::isCellValue($k)) &&
-                    (Functions::getCompatibilityMode() !== Functions::COMPATIBILITY_GNUMERIC))) {
+                    (Functions::getCompatibilityMode() !== Functions::COMPATIBILITY_GNUMERIC))
+        ) {
             return true;
         }
 
@@ -664,8 +668,10 @@ class Statistical
         $aCount = 0;
         // Loop through arguments
         foreach (Functions::flattenArrayIndexed($args) as $k => $arg) {
-            if ((is_bool($arg)) &&
-                (!Functions::isMatrixValue($k))) {
+            if (
+                (is_bool($arg)) &&
+                (!Functions::isMatrixValue($k))
+            ) {
             } else {
                 if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) && ($arg != '')))) {
                     if (is_bool($arg)) {
@@ -1414,9 +1420,11 @@ class Statistical
             $aCount = -1;
             foreach ($aArgs as $k => $arg) {
                 // Is it a numeric value?
-                if ((is_bool($arg)) &&
+                if (
+                    (is_bool($arg)) &&
                     ((!Functions::isCellValue($k)) ||
-                    (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE))) {
+                    (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE))
+                ) {
                     $arg = (int) $arg;
                 }
                 if ((is_numeric($arg)) && (!is_string($arg))) {
@@ -1968,8 +1976,10 @@ class Statistical
             $count = $summer = 0;
             // Loop through arguments
             foreach ($aArgs as $k => $arg) {
-                if ((is_bool($arg)) &&
-                    (!Functions::isMatrixValue($k))) {
+                if (
+                    (is_bool($arg)) &&
+                    (!Functions::isMatrixValue($k))
+                ) {
                 } else {
                     // Is it a numeric value?
                     if ((is_numeric($arg)) && (!is_string($arg))) {
@@ -3084,8 +3094,10 @@ class Statistical
         $count = $summer = 0;
         // Loop through arguments
         foreach ($aArgs as $k => $arg) {
-            if ((is_bool($arg)) &&
-                (!Functions::isMatrixValue($k))) {
+            if (
+                (is_bool($arg)) &&
+                (!Functions::isMatrixValue($k))
+            ) {
             } else {
                 // Is it a numeric value?
                 if ((is_numeric($arg)) && (!is_string($arg))) {
@@ -3224,8 +3236,10 @@ class Statistical
         if ($aMean !== null) {
             $aCount = -1;
             foreach ($aArgs as $k => $arg) {
-                if ((is_bool($arg)) &&
-                    ((!Functions::isCellValue($k)) || (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE))) {
+                if (
+                    (is_bool($arg)) &&
+                    ((!Functions::isCellValue($k)) || (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE))
+                ) {
                     $arg = (int) $arg;
                 }
                 // Is it a numeric value?
@@ -3270,8 +3284,10 @@ class Statistical
         if ($aMean !== null) {
             $aCount = -1;
             foreach ($aArgs as $k => $arg) {
-                if ((is_bool($arg)) &&
-                    (!Functions::isMatrixValue($k))) {
+                if (
+                    (is_bool($arg)) &&
+                    (!Functions::isMatrixValue($k))
+                ) {
                 } else {
                     // Is it a numeric value?
                     if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) & ($arg != '')))) {
@@ -3320,8 +3336,10 @@ class Statistical
         if ($aMean !== null) {
             $aCount = 0;
             foreach ($aArgs as $k => $arg) {
-                if ((is_bool($arg)) &&
-                    ((!Functions::isCellValue($k)) || (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE))) {
+                if (
+                    (is_bool($arg)) &&
+                    ((!Functions::isCellValue($k)) || (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_OPENOFFICE))
+                ) {
                     $arg = (int) $arg;
                 }
                 // Is it a numeric value?
@@ -3365,8 +3383,10 @@ class Statistical
         if ($aMean !== null) {
             $aCount = 0;
             foreach ($aArgs as $k => $arg) {
-                if ((is_bool($arg)) &&
-                    (!Functions::isMatrixValue($k))) {
+                if (
+                    (is_bool($arg)) &&
+                    (!Functions::isMatrixValue($k))
+                ) {
                 } else {
                     // Is it a numeric value?
                     if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) & ($arg != '')))) {
@@ -3686,11 +3706,15 @@ class Statistical
         $aArgs = Functions::flattenArrayIndexed($args);
         $aCount = 0;
         foreach ($aArgs as $k => $arg) {
-            if ((is_string($arg)) &&
-                (Functions::isValue($k))) {
+            if (
+                (is_string($arg)) &&
+                (Functions::isValue($k))
+            ) {
                 return Functions::VALUE();
-            } elseif ((is_string($arg)) &&
-                (!Functions::isMatrixValue($k))) {
+            } elseif (
+                (is_string($arg)) &&
+                (!Functions::isMatrixValue($k))
+            ) {
             } else {
                 // Is it a numeric value?
                 if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) & ($arg != '')))) {
@@ -3780,11 +3804,15 @@ class Statistical
         $aArgs = Functions::flattenArrayIndexed($args);
         $aCount = 0;
         foreach ($aArgs as $k => $arg) {
-            if ((is_string($arg)) &&
-                (Functions::isValue($k))) {
+            if (
+                (is_string($arg)) &&
+                (Functions::isValue($k))
+            ) {
                 return Functions::VALUE();
-            } elseif ((is_string($arg)) &&
-                (!Functions::isMatrixValue($k))) {
+            } elseif (
+                (is_string($arg)) &&
+                (!Functions::isMatrixValue($k))
+            ) {
             } else {
                 // Is it a numeric value?
                 if ((is_numeric($arg)) || (is_bool($arg)) || ((is_string($arg) & ($arg != '')))) {
diff --git a/src/PhpSpreadsheet/Document/Properties.php b/src/PhpSpreadsheet/Document/Properties.php
index cbaae2db..0876a9ed 100644
--- a/src/PhpSpreadsheet/Document/Properties.php
+++ b/src/PhpSpreadsheet/Document/Properties.php
@@ -457,11 +457,14 @@ class Properties
      */
     public function setCustomProperty($propertyName, $propertyValue = '', $propertyType = null)
     {
-        if (($propertyType === null) || (!in_array($propertyType, [self::PROPERTY_TYPE_INTEGER,
-            self::PROPERTY_TYPE_FLOAT,
-            self::PROPERTY_TYPE_STRING,
-            self::PROPERTY_TYPE_DATE,
-            self::PROPERTY_TYPE_BOOLEAN, ]))) {
+        if (
+            ($propertyType === null) || (!in_array($propertyType, [self::PROPERTY_TYPE_INTEGER,
+                self::PROPERTY_TYPE_FLOAT,
+                self::PROPERTY_TYPE_STRING,
+                self::PROPERTY_TYPE_DATE,
+                self::PROPERTY_TYPE_BOOLEAN,
+            ]))
+        ) {
             if ($propertyValue === null) {
                 $propertyType = self::PROPERTY_TYPE_STRING;
             } elseif (is_float($propertyValue)) {
diff --git a/src/PhpSpreadsheet/Reader/Gnumeric.php b/src/PhpSpreadsheet/Reader/Gnumeric.php
index a29a2b9d..77c9bdf7 100644
--- a/src/PhpSpreadsheet/Reader/Gnumeric.php
+++ b/src/PhpSpreadsheet/Reader/Gnumeric.php
@@ -534,8 +534,10 @@ class Gnumeric extends BaseReader
 
             foreach ($sheet->Styles->StyleRegion as $styleRegion) {
                 $styleAttributes = $styleRegion->attributes();
-                if (($styleAttributes['startRow'] <= $maxRow) &&
-                    ($styleAttributes['startCol'] <= $maxCol)) {
+                if (
+                    ($styleAttributes['startRow'] <= $maxRow) &&
+                    ($styleAttributes['startCol'] <= $maxCol)
+                ) {
                     $startColumn = Coordinate::stringFromColumnIndex((int) $styleAttributes['startCol'] + 1);
                     $startRow = $styleAttributes['startRow'] + 1;
 
diff --git a/src/PhpSpreadsheet/Reader/Ods.php b/src/PhpSpreadsheet/Reader/Ods.php
index b2a6a759..74d65db8 100644
--- a/src/PhpSpreadsheet/Reader/Ods.php
+++ b/src/PhpSpreadsheet/Reader/Ods.php
@@ -317,9 +317,11 @@ class Ods extends BaseReader
                 $worksheetName = $worksheetDataSet->getAttributeNS($tableNs, 'name');
 
                 // Check loadSheetsOnly
-                if (isset($this->loadSheetsOnly)
+                if (
+                    isset($this->loadSheetsOnly)
                     && $worksheetName
-                    && !in_array($worksheetName, $this->loadSheetsOnly)) {
+                    && !in_array($worksheetName, $this->loadSheetsOnly)
+                ) {
                     continue;
                 }
 
@@ -624,7 +626,8 @@ class Ods extends BaseReader
                                 }
 
                                 // Merged cells
-                                if ($cellData->hasAttributeNS($tableNs, 'number-columns-spanned')
+                                if (
+                                    $cellData->hasAttributeNS($tableNs, 'number-columns-spanned')
                                     || $cellData->hasAttributeNS($tableNs, 'number-rows-spanned')
                                 ) {
                                     if (($type !== DataType::TYPE_NULL) || (!$this->readDataOnly)) {
diff --git a/src/PhpSpreadsheet/Reader/Xls.php b/src/PhpSpreadsheet/Reader/Xls.php
index cdac07d0..81cc5b2e 100644
--- a/src/PhpSpreadsheet/Reader/Xls.php
+++ b/src/PhpSpreadsheet/Reader/Xls.php
@@ -1275,8 +1275,10 @@ class Xls extends BaseReader
                 // Extract range
                 if (strpos($definedName['formula'], '!') !== false) {
                     $explodes = Worksheet::extractSheetTitle($definedName['formula'], true);
-                    if (($docSheet = $this->spreadsheet->getSheetByName($explodes[0])) ||
-                        ($docSheet = $this->spreadsheet->getSheetByName(trim($explodes[0], "'")))) {
+                    if (
+                        ($docSheet = $this->spreadsheet->getSheetByName($explodes[0])) ||
+                        ($docSheet = $this->spreadsheet->getSheetByName(trim($explodes[0], "'")))
+                    ) {
                         $extractedRange = $explodes[1];
                         $extractedRange = str_replace('$', '', $extractedRange);
 
@@ -3999,21 +4001,27 @@ class Xls extends BaseReader
 
                 // read STRING record
                 $value = $this->readString();
-            } elseif ((ord($recordData[6]) == 1)
+            } elseif (
+                (ord($recordData[6]) == 1)
                 && (ord($recordData[12]) == 255)
-                && (ord($recordData[13]) == 255)) {
+                && (ord($recordData[13]) == 255)
+            ) {
                 // Boolean formula. Result is in +2; 0=false, 1=true
                 $dataType = DataType::TYPE_BOOL;
                 $value = (bool) ord($recordData[8]);
-            } elseif ((ord($recordData[6]) == 2)
+            } elseif (
+                (ord($recordData[6]) == 2)
                 && (ord($recordData[12]) == 255)
-                && (ord($recordData[13]) == 255)) {
+                && (ord($recordData[13]) == 255)
+            ) {
                 // Error formula. Error code is in +2
                 $dataType = DataType::TYPE_ERROR;
                 $value = Xls\ErrorCode::lookup(ord($recordData[8]));
-            } elseif ((ord($recordData[6]) == 3)
+            } elseif (
+                (ord($recordData[6]) == 3)
                 && (ord($recordData[12]) == 255)
-                && (ord($recordData[13]) == 255)) {
+                && (ord($recordData[13]) == 255)
+            ) {
                 // Formula result is a null string
                 $dataType = DataType::TYPE_NULL;
                 $value = '';
@@ -4599,8 +4607,10 @@ class Xls extends BaseReader
         if ($this->version == self::XLS_BIFF8 && !$this->readDataOnly) {
             $cellRangeAddressList = $this->readBIFF8CellRangeAddressList($recordData);
             foreach ($cellRangeAddressList['cellRangeAddresses'] as $cellRangeAddress) {
-                if ((strpos($cellRangeAddress, ':') !== false) &&
-                    ($this->includeCellRangeFiltered($cellRangeAddress))) {
+                if (
+                    (strpos($cellRangeAddress, ':') !== false) &&
+                    ($this->includeCellRangeFiltered($cellRangeAddress))
+                ) {
                     $this->phpSheet->mergeCells($cellRangeAddress);
                 }
             }
diff --git a/src/PhpSpreadsheet/Reader/Xlsx.php b/src/PhpSpreadsheet/Reader/Xlsx.php
index fb7f0645..381f107e 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx.php
@@ -502,8 +502,10 @@ class Xlsx extends BaseReader
                                 // We shouldn't override any of the built-in MS Excel values (values below id 164)
                                 //  But there's a lot of naughty homebrew xlsx writers that do use "reserved" id values that aren't actually used
                                 //  So we make allowance for them rather than lose formatting masks
-                                if ((int) $xf['numFmtId'] < 164 &&
-                                    NumberFormat::builtInFormatCode((int) $xf['numFmtId']) !== '') {
+                                if (
+                                    (int) $xf['numFmtId'] < 164 &&
+                                    NumberFormat::builtInFormatCode((int) $xf['numFmtId']) !== ''
+                                ) {
                                     $numFmt = NumberFormat::builtInFormatCode((int) $xf['numFmtId']);
                                 }
                             }
@@ -1720,12 +1722,16 @@ class Xlsx extends BaseReader
                         if (isset($run->rPr->color)) {
                             $objText->getFont()->setColor(new Color(self::readColor($run->rPr->color)));
                         }
-                        if ((isset($run->rPr->b['val']) && self::boolean((string) $run->rPr->b['val'])) ||
-                            (isset($run->rPr->b) && !isset($run->rPr->b['val']))) {
+                        if (
+                            (isset($run->rPr->b['val']) && self::boolean((string) $run->rPr->b['val'])) ||
+                            (isset($run->rPr->b) && !isset($run->rPr->b['val']))
+                        ) {
                             $objText->getFont()->setBold(true);
                         }
-                        if ((isset($run->rPr->i['val']) && self::boolean((string) $run->rPr->i['val'])) ||
-                            (isset($run->rPr->i) && !isset($run->rPr->i['val']))) {
+                        if (
+                            (isset($run->rPr->i['val']) && self::boolean((string) $run->rPr->i['val'])) ||
+                            (isset($run->rPr->i) && !isset($run->rPr->i['val']))
+                        ) {
                             $objText->getFont()->setItalic(true);
                         }
                         if (isset($run->rPr->vertAlign, $run->rPr->vertAlign['val'])) {
@@ -1742,8 +1748,10 @@ class Xlsx extends BaseReader
                         } elseif (isset($run->rPr->u, $run->rPr->u['val'])) {
                             $objText->getFont()->setUnderline((string) $run->rPr->u['val']);
                         }
-                        if ((isset($run->rPr->strike['val']) && self::boolean((string) $run->rPr->strike['val'])) ||
-                            (isset($run->rPr->strike) && !isset($run->rPr->strike['val']))) {
+                        if (
+                            (isset($run->rPr->strike['val']) && self::boolean((string) $run->rPr->strike['val'])) ||
+                            (isset($run->rPr->strike) && !isset($run->rPr->strike['val']))
+                        ) {
                             $objText->getFont()->setStrikethrough(true);
                         }
                     }
diff --git a/src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php b/src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
index 339c0584..4134b2f1 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx/ColumnAndRowAttributes.php
@@ -94,8 +94,10 @@ class ColumnAndRowAttributes extends BaseParserClass
         // set columns/rows attributes
         $columnsAttributesAreSet = [];
         foreach ($columnsAttributes as $columnCoordinate => $columnAttributes) {
-            if ($readFilter === null ||
-                !$this->isFilteredColumn($readFilter, $columnCoordinate, $rowsAttributes)) {
+            if (
+                $readFilter === null ||
+                !$this->isFilteredColumn($readFilter, $columnCoordinate, $rowsAttributes)
+            ) {
                 if (!isset($columnsAttributesAreSet[$columnCoordinate])) {
                     $this->setColumnAttributes($columnCoordinate, $columnAttributes);
                     $columnsAttributesAreSet[$columnCoordinate] = true;
@@ -105,8 +107,10 @@ class ColumnAndRowAttributes extends BaseParserClass
 
         $rowsAttributesAreSet = [];
         foreach ($rowsAttributes as $rowCoordinate => $rowAttributes) {
-            if ($readFilter === null ||
-                !$this->isFilteredRow($readFilter, $rowCoordinate, $columnsAttributes)) {
+            if (
+                $readFilter === null ||
+                !$this->isFilteredRow($readFilter, $rowCoordinate, $columnsAttributes)
+            ) {
                 if (!isset($rowsAttributesAreSet[$rowCoordinate])) {
                     $this->setRowAttributes($rowCoordinate, $rowAttributes);
                     $rowsAttributesAreSet[$rowCoordinate] = true;
diff --git a/src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php b/src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
index 668bfd18..4aa48e17 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
@@ -34,13 +34,15 @@ class ConditionalStyles
         $conditionals = [];
         foreach ($xmlSheet->conditionalFormatting as $conditional) {
             foreach ($conditional->cfRule as $cfRule) {
-                if (((string) $cfRule['type'] == Conditional::CONDITION_NONE
+                if (
+                    ((string) $cfRule['type'] == Conditional::CONDITION_NONE
                     || (string) $cfRule['type'] == Conditional::CONDITION_CELLIS
                     || (string) $cfRule['type'] == Conditional::CONDITION_CONTAINSTEXT
                     || (string) $cfRule['type'] == Conditional::CONDITION_CONTAINSBLANKS
                     || (string) $cfRule['type'] == Conditional::CONDITION_NOTCONTAINSBLANKS
                     || (string) $cfRule['type'] == Conditional::CONDITION_EXPRESSION)
-                    && isset($this->dxfs[(int) ($cfRule['dxfId'])])) {
+                    && isset($this->dxfs[(int) ($cfRule['dxfId'])])
+                ) {
                     $conditionals[(string) $conditional['sqref']][(int) ($cfRule['priority'])] = $cfRule;
                 }
             }
diff --git a/src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php b/src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php
index b556703c..536c8948 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx/PageSetup.php
@@ -65,8 +65,10 @@ class PageSetup extends BaseParserClass
             if (isset($xmlSheet->pageSetup['fitToWidth']) && (int) ($xmlSheet->pageSetup['fitToWidth']) >= 0) {
                 $docPageSetup->setFitToWidth((int) ($xmlSheet->pageSetup['fitToWidth']), false);
             }
-            if (isset($xmlSheet->pageSetup['firstPageNumber'], $xmlSheet->pageSetup['useFirstPageNumber']) &&
-                self::boolean((string) $xmlSheet->pageSetup['useFirstPageNumber'])) {
+            if (
+                isset($xmlSheet->pageSetup['firstPageNumber'], $xmlSheet->pageSetup['useFirstPageNumber']) &&
+                self::boolean((string) $xmlSheet->pageSetup['useFirstPageNumber'])
+            ) {
                 $docPageSetup->setFirstPageNumber((int) ($xmlSheet->pageSetup['firstPageNumber']));
             }
             if (isset($xmlSheet->pageSetup['pageOrder'])) {
@@ -87,26 +89,34 @@ class PageSetup extends BaseParserClass
         if ($xmlSheet->headerFooter) {
             $docHeaderFooter = $worksheet->getHeaderFooter();
 
-            if (isset($xmlSheet->headerFooter['differentOddEven']) &&
-                self::boolean((string) $xmlSheet->headerFooter['differentOddEven'])) {
+            if (
+                isset($xmlSheet->headerFooter['differentOddEven']) &&
+                self::boolean((string) $xmlSheet->headerFooter['differentOddEven'])
+            ) {
                 $docHeaderFooter->setDifferentOddEven(true);
             } else {
                 $docHeaderFooter->setDifferentOddEven(false);
             }
-            if (isset($xmlSheet->headerFooter['differentFirst']) &&
-                self::boolean((string) $xmlSheet->headerFooter['differentFirst'])) {
+            if (
+                isset($xmlSheet->headerFooter['differentFirst']) &&
+                self::boolean((string) $xmlSheet->headerFooter['differentFirst'])
+            ) {
                 $docHeaderFooter->setDifferentFirst(true);
             } else {
                 $docHeaderFooter->setDifferentFirst(false);
             }
-            if (isset($xmlSheet->headerFooter['scaleWithDoc']) &&
-                !self::boolean((string) $xmlSheet->headerFooter['scaleWithDoc'])) {
+            if (
+                isset($xmlSheet->headerFooter['scaleWithDoc']) &&
+                !self::boolean((string) $xmlSheet->headerFooter['scaleWithDoc'])
+            ) {
                 $docHeaderFooter->setScaleWithDocument(false);
             } else {
                 $docHeaderFooter->setScaleWithDocument(true);
             }
-            if (isset($xmlSheet->headerFooter['alignWithMargins']) &&
-                !self::boolean((string) $xmlSheet->headerFooter['alignWithMargins'])) {
+            if (
+                isset($xmlSheet->headerFooter['alignWithMargins']) &&
+                !self::boolean((string) $xmlSheet->headerFooter['alignWithMargins'])
+            ) {
                 $docHeaderFooter->setAlignWithMargins(false);
             } else {
                 $docHeaderFooter->setAlignWithMargins(true);
diff --git a/src/PhpSpreadsheet/Reader/Xlsx/SheetViewOptions.php b/src/PhpSpreadsheet/Reader/Xlsx/SheetViewOptions.php
index b3bee899..12358818 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx/SheetViewOptions.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx/SheetViewOptions.php
@@ -59,15 +59,19 @@ class SheetViewOptions extends BaseParserClass
     private function outlines(SimpleXMLElement $sheetPr): void
     {
         if (isset($sheetPr->outlinePr)) {
-            if (isset($sheetPr->outlinePr['summaryRight']) &&
-                !self::boolean((string) $sheetPr->outlinePr['summaryRight'])) {
+            if (
+                isset($sheetPr->outlinePr['summaryRight']) &&
+                !self::boolean((string) $sheetPr->outlinePr['summaryRight'])
+            ) {
                 $this->worksheet->setShowSummaryRight(false);
             } else {
                 $this->worksheet->setShowSummaryRight(true);
             }
 
-            if (isset($sheetPr->outlinePr['summaryBelow']) &&
-                !self::boolean((string) $sheetPr->outlinePr['summaryBelow'])) {
+            if (
+                isset($sheetPr->outlinePr['summaryBelow']) &&
+                !self::boolean((string) $sheetPr->outlinePr['summaryBelow'])
+            ) {
                 $this->worksheet->setShowSummaryBelow(false);
             } else {
                 $this->worksheet->setShowSummaryBelow(true);
@@ -78,8 +82,10 @@ class SheetViewOptions extends BaseParserClass
     private function pageSetup(SimpleXMLElement $sheetPr): void
     {
         if (isset($sheetPr->pageSetUpPr)) {
-            if (isset($sheetPr->pageSetUpPr['fitToPage']) &&
-                !self::boolean((string) $sheetPr->pageSetUpPr['fitToPage'])) {
+            if (
+                isset($sheetPr->pageSetUpPr['fitToPage']) &&
+                !self::boolean((string) $sheetPr->pageSetUpPr['fitToPage'])
+            ) {
                 $this->worksheet->getPageSetup()->setFitToPage(false);
             } else {
                 $this->worksheet->getPageSetup()->setFitToPage(true);
@@ -89,9 +95,11 @@ class SheetViewOptions extends BaseParserClass
 
     private function sheetFormat(SimpleXMLElement $sheetFormatPr): void
     {
-        if (isset($sheetFormatPr['customHeight']) &&
+        if (
+            isset($sheetFormatPr['customHeight']) &&
             self::boolean((string) $sheetFormatPr['customHeight']) &&
-            isset($sheetFormatPr['defaultRowHeight'])) {
+            isset($sheetFormatPr['defaultRowHeight'])
+        ) {
             $this->worksheet->getDefaultRowDimension()
                 ->setRowHeight((float) $sheetFormatPr['defaultRowHeight']);
         }
@@ -101,8 +109,10 @@ class SheetViewOptions extends BaseParserClass
                 ->setWidth((float) $sheetFormatPr['defaultColWidth']);
         }
 
-        if (isset($sheetFormatPr['zeroHeight']) &&
-            ((string) $sheetFormatPr['zeroHeight'] === '1')) {
+        if (
+            isset($sheetFormatPr['zeroHeight']) &&
+            ((string) $sheetFormatPr['zeroHeight'] === '1')
+        ) {
             $this->worksheet->getDefaultRowDimension()->setZeroHeight(true);
         }
     }
diff --git a/src/PhpSpreadsheet/Reader/Xml.php b/src/PhpSpreadsheet/Reader/Xml.php
index fc2f5108..5bf18465 100644
--- a/src/PhpSpreadsheet/Reader/Xml.php
+++ b/src/PhpSpreadsheet/Reader/Xml.php
@@ -400,8 +400,10 @@ class Xml extends BaseReader
         foreach ($xml_ss->Worksheet as $worksheet) {
             $worksheet_ss = $worksheet->attributes($namespaces['ss']);
 
-            if ((isset($this->loadSheetsOnly)) && (isset($worksheet_ss['Name'])) &&
-                (!in_array($worksheet_ss['Name'], $this->loadSheetsOnly))) {
+            if (
+                (isset($this->loadSheetsOnly)) && (isset($worksheet_ss['Name'])) &&
+                (!in_array($worksheet_ss['Name'], $this->loadSheetsOnly))
+            ) {
                 continue;
             }
 
diff --git a/src/PhpSpreadsheet/ReferenceHelper.php b/src/PhpSpreadsheet/ReferenceHelper.php
index 0b0f6dd3..5809e3d4 100644
--- a/src/PhpSpreadsheet/ReferenceHelper.php
+++ b/src/PhpSpreadsheet/ReferenceHelper.php
@@ -129,13 +129,17 @@ class ReferenceHelper
         [$cellColumn, $cellRow] = Coordinate::coordinateFromString($cellAddress);
         $cellColumnIndex = Coordinate::columnIndexFromString($cellColumn);
         //    Is cell within the range of rows/columns if we're deleting
-        if ($pNumRows < 0 &&
+        if (
+            $pNumRows < 0 &&
             ($cellRow >= ($beforeRow + $pNumRows)) &&
-            ($cellRow < $beforeRow)) {
+            ($cellRow < $beforeRow)
+        ) {
             return true;
-        } elseif ($pNumCols < 0 &&
+        } elseif (
+            $pNumCols < 0 &&
             ($cellColumnIndex >= ($beforeColumnIndex + $pNumCols)) &&
-            ($cellColumnIndex < $beforeColumnIndex)) {
+            ($cellColumnIndex < $beforeColumnIndex)
+        ) {
             return true;
         }
 
diff --git a/src/PhpSpreadsheet/Shared/Date.php b/src/PhpSpreadsheet/Shared/Date.php
index cb37515d..180a7159 100644
--- a/src/PhpSpreadsheet/Shared/Date.php
+++ b/src/PhpSpreadsheet/Shared/Date.php
@@ -71,8 +71,10 @@ class Date
      */
     public static function setExcelCalendar($baseDate)
     {
-        if (($baseDate == self::CALENDAR_WINDOWS_1900) ||
-            ($baseDate == self::CALENDAR_MAC_1904)) {
+        if (
+            ($baseDate == self::CALENDAR_WINDOWS_1900) ||
+            ($baseDate == self::CALENDAR_MAC_1904)
+        ) {
             self::$excelCalendar = $baseDate;
 
             return true;
@@ -400,8 +402,10 @@ class Date
                 $segMatcher = false;
                 foreach (explode('"', $pFormatCode) as $subVal) {
                     //    Only test in alternate array entries (the non-quoted blocks)
-                    if (($segMatcher = !$segMatcher) &&
-                        (preg_match('/(^|\])[^\[]*[' . self::$possibleDateFormatCharacters . ']/i', $subVal))) {
+                    if (
+                        ($segMatcher = !$segMatcher) &&
+                        (preg_match('/(^|\])[^\[]*[' . self::$possibleDateFormatCharacters . ']/i', $subVal))
+                    ) {
                         return true;
                     }
                 }
diff --git a/src/PhpSpreadsheet/Shared/JAMA/EigenvalueDecomposition.php b/src/PhpSpreadsheet/Shared/JAMA/EigenvalueDecomposition.php
index f6fbccb8..4c67c3a9 100644
--- a/src/PhpSpreadsheet/Shared/JAMA/EigenvalueDecomposition.php
+++ b/src/PhpSpreadsheet/Shared/JAMA/EigenvalueDecomposition.php
@@ -553,8 +553,10 @@ class EigenvalueDecomposition
                     if ($m == $l) {
                         break;
                     }
-                    if (abs($this->H[$m][$m - 1]) * (abs($q) + abs($r)) <
-                        $eps * (abs($p) * (abs($this->H[$m - 1][$m - 1]) + abs($z) + abs($this->H[$m + 1][$m + 1])))) {
+                    if (
+                        abs($this->H[$m][$m - 1]) * (abs($q) + abs($r)) <
+                        $eps * (abs($p) * (abs($this->H[$m - 1][$m - 1]) + abs($z) + abs($this->H[$m + 1][$m + 1])))
+                    ) {
                         break;
                     }
                     --$m;
diff --git a/src/PhpSpreadsheet/Shared/JAMA/utils/Maths.php b/src/PhpSpreadsheet/Shared/JAMA/utils/Maths.php
index 68c38649..49877b23 100644
--- a/src/PhpSpreadsheet/Shared/JAMA/utils/Maths.php
+++ b/src/PhpSpreadsheet/Shared/JAMA/utils/Maths.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  *    Pythagorean Theorem:.
  *
diff --git a/src/PhpSpreadsheet/Shared/OLE.php b/src/PhpSpreadsheet/Shared/OLE.php
index 25d698a5..d380995c 100644
--- a/src/PhpSpreadsheet/Shared/OLE.php
+++ b/src/PhpSpreadsheet/Shared/OLE.php
@@ -131,55 +131,55 @@ class OLE
             throw new ReaderException('Only Little-Endian encoding is supported.');
         }
         // Size of blocks and short blocks in bytes
-        $this->bigBlockSize = 2 ** self::_readInt2($fh);
-        $this->smallBlockSize = 2 ** self::_readInt2($fh);
+        $this->bigBlockSize = 2 ** self::readInt2($fh);
+        $this->smallBlockSize = 2 ** self::readInt2($fh);
 
         // Skip UID, revision number and version number
         fseek($fh, 44);
         // Number of blocks in Big Block Allocation Table
-        $bbatBlockCount = self::_readInt4($fh);
+        $bbatBlockCount = self::readInt4($fh);
 
         // Root chain 1st block
-        $directoryFirstBlockId = self::_readInt4($fh);
+        $directoryFirstBlockId = self::readInt4($fh);
 
         // Skip unused bytes
         fseek($fh, 56);
         // Streams shorter than this are stored using small blocks
-        $this->bigBlockThreshold = self::_readInt4($fh);
+        $this->bigBlockThreshold = self::readInt4($fh);
         // Block id of first sector in Short Block Allocation Table
-        $sbatFirstBlockId = self::_readInt4($fh);
+        $sbatFirstBlockId = self::readInt4($fh);
         // Number of blocks in Short Block Allocation Table
-        $sbbatBlockCount = self::_readInt4($fh);
+        $sbbatBlockCount = self::readInt4($fh);
         // Block id of first sector in Master Block Allocation Table
-        $mbatFirstBlockId = self::_readInt4($fh);
+        $mbatFirstBlockId = self::readInt4($fh);
         // Number of blocks in Master Block Allocation Table
-        $mbbatBlockCount = self::_readInt4($fh);
+        $mbbatBlockCount = self::readInt4($fh);
         $this->bbat = [];
 
         // Remaining 4 * 109 bytes of current block is beginning of Master
         // Block Allocation Table
         $mbatBlocks = [];
         for ($i = 0; $i < 109; ++$i) {
-            $mbatBlocks[] = self::_readInt4($fh);
+            $mbatBlocks[] = self::readInt4($fh);
         }
 
         // Read rest of Master Block Allocation Table (if any is left)
-        $pos = $this->_getBlockOffset($mbatFirstBlockId);
+        $pos = $this->getBlockOffset($mbatFirstBlockId);
         for ($i = 0; $i < $mbbatBlockCount; ++$i) {
             fseek($fh, $pos);
             for ($j = 0; $j < $this->bigBlockSize / 4 - 1; ++$j) {
-                $mbatBlocks[] = self::_readInt4($fh);
+                $mbatBlocks[] = self::readInt4($fh);
             }
             // Last block id in each block points to next block
-            $pos = $this->_getBlockOffset(self::_readInt4($fh));
+            $pos = $this->getBlockOffset(self::readInt4($fh));
         }
 
         // Read Big Block Allocation Table according to chain specified by $mbatBlocks
         for ($i = 0; $i < $bbatBlockCount; ++$i) {
-            $pos = $this->_getBlockOffset($mbatBlocks[$i]);
+            $pos = $this->getBlockOffset($mbatBlocks[$i]);
             fseek($fh, $pos);
             for ($j = 0; $j < $this->bigBlockSize / 4; ++$j) {
-                $this->bbat[] = self::_readInt4($fh);
+                $this->bbat[] = self::readInt4($fh);
             }
         }
 
@@ -188,11 +188,11 @@ class OLE
         $shortBlockCount = $sbbatBlockCount * $this->bigBlockSize / 4;
         $sbatFh = $this->getStream($sbatFirstBlockId);
         for ($blockId = 0; $blockId < $shortBlockCount; ++$blockId) {
-            $this->sbat[$blockId] = self::_readInt4($sbatFh);
+            $this->sbat[$blockId] = self::readInt4($sbatFh);
         }
         fclose($sbatFh);
 
-        $this->_readPpsWks($directoryFirstBlockId);
+        $this->readPpsWks($directoryFirstBlockId);
 
         return true;
     }
@@ -202,7 +202,7 @@ class OLE
      *
      * @return int
      */
-    public function _getBlockOffset($blockId)
+    public function getBlockOffset($blockId)
     {
         return 512 + $blockId * $this->bigBlockSize;
     }
@@ -247,7 +247,7 @@ class OLE
      *
      * @return int
      */
-    private static function _readInt1($fh)
+    private static function readInt1($fh)
     {
         [, $tmp] = unpack('c', fread($fh, 1));
 
@@ -261,7 +261,7 @@ class OLE
      *
      * @return int
      */
-    private static function _readInt2($fh)
+    private static function readInt2($fh)
     {
         [, $tmp] = unpack('v', fread($fh, 2));
 
@@ -275,7 +275,7 @@ class OLE
      *
      * @return int
      */
-    private static function _readInt4($fh)
+    private static function readInt4($fh)
     {
         [, $tmp] = unpack('V', fread($fh, 4));
 
@@ -290,17 +290,17 @@ class OLE
      *
      * @return bool true on success, PEAR_Error on failure
      */
-    public function _readPpsWks($blockId)
+    public function readPpsWks($blockId)
     {
         $fh = $this->getStream($blockId);
         for ($pos = 0; true; $pos += 128) {
             fseek($fh, $pos, SEEK_SET);
             $nameUtf16 = fread($fh, 64);
-            $nameLength = self::_readInt2($fh);
+            $nameLength = self::readInt2($fh);
             $nameUtf16 = substr($nameUtf16, 0, $nameLength - 2);
             // Simple conversion from UTF-16LE to ISO-8859-1
             $name = str_replace("\x00", '', $nameUtf16);
-            $type = self::_readInt1($fh);
+            $type = self::readInt1($fh);
             switch ($type) {
                 case self::OLE_PPS_TYPE_ROOT:
                     $pps = new OLE\PPS\Root(null, null, []);
@@ -321,19 +321,19 @@ class OLE
             fseek($fh, 1, SEEK_CUR);
             $pps->Type = $type;
             $pps->Name = $name;
-            $pps->PrevPps = self::_readInt4($fh);
-            $pps->NextPps = self::_readInt4($fh);
-            $pps->DirPps = self::_readInt4($fh);
+            $pps->PrevPps = self::readInt4($fh);
+            $pps->NextPps = self::readInt4($fh);
+            $pps->DirPps = self::readInt4($fh);
             fseek($fh, 20, SEEK_CUR);
             $pps->Time1st = self::OLE2LocalDate(fread($fh, 8));
             $pps->Time2nd = self::OLE2LocalDate(fread($fh, 8));
-            $pps->startBlock = self::_readInt4($fh);
-            $pps->Size = self::_readInt4($fh);
+            $pps->startBlock = self::readInt4($fh);
+            $pps->Size = self::readInt4($fh);
             $pps->No = count($this->_list);
             $this->_list[] = $pps;
 
             // check if the PPS tree (starting from root) is complete
-            if (isset($this->root) && $this->_ppsTreeComplete($this->root->No)) {
+            if (isset($this->root) && $this->ppsTreeComplete($this->root->No)) {
                 break;
             }
         }
@@ -367,16 +367,16 @@ class OLE
      *
      * @return bool Whether the PPS tree for the given PPS is complete
      */
-    public function _ppsTreeComplete($index)
+    private function ppsTreeComplete($index)
     {
         return isset($this->_list[$index]) &&
             ($pps = $this->_list[$index]) &&
             ($pps->PrevPps == -1 ||
-                $this->_ppsTreeComplete($pps->PrevPps)) &&
+                $this->ppsTreeComplete($pps->PrevPps)) &&
             ($pps->NextPps == -1 ||
-                $this->_ppsTreeComplete($pps->NextPps)) &&
+                $this->ppsTreeComplete($pps->NextPps)) &&
             ($pps->DirPps == -1 ||
-                $this->_ppsTreeComplete($pps->DirPps));
+                $this->ppsTreeComplete($pps->DirPps));
     }
 
     /**
diff --git a/src/PhpSpreadsheet/Shared/OLE/ChainedBlockStream.php b/src/PhpSpreadsheet/Shared/OLE/ChainedBlockStream.php
index ecaa97ed..cee5cd99 100644
--- a/src/PhpSpreadsheet/Shared/OLE/ChainedBlockStream.php
+++ b/src/PhpSpreadsheet/Shared/OLE/ChainedBlockStream.php
@@ -71,7 +71,7 @@ class ChainedBlockStream
         $this->data = '';
         if (isset($this->params['size']) && $this->params['size'] < $this->ole->bigBlockThreshold && $blockId != $this->ole->root->startBlock) {
             // Block id refers to small blocks
-            $rootPos = $this->ole->_getBlockOffset($this->ole->root->startBlock);
+            $rootPos = $this->ole->getBlockOffset($this->ole->root->startBlock);
             while ($blockId != -2) {
                 $pos = $rootPos + $blockId * $this->ole->bigBlockSize;
                 $blockId = $this->ole->sbat[$blockId];
@@ -81,7 +81,7 @@ class ChainedBlockStream
         } else {
             // Block id refers to big blocks
             while ($blockId != -2) {
-                $pos = $this->ole->_getBlockOffset($blockId);
+                $pos = $this->ole->getBlockOffset($blockId);
                 fseek($this->ole->_file_handle, $pos);
                 $this->data .= fread($this->ole->_file_handle, $this->ole->bigBlockSize);
                 $blockId = $this->ole->bbat[$blockId];
diff --git a/src/PhpSpreadsheet/Shared/OLE/PPS.php b/src/PhpSpreadsheet/Shared/OLE/PPS.php
index 7aa42a14..cf764d0b 100644
--- a/src/PhpSpreadsheet/Shared/OLE/PPS.php
+++ b/src/PhpSpreadsheet/Shared/OLE/PPS.php
@@ -172,7 +172,7 @@ class PPS
      *
      * @return string The binary string
      */
-    public function _getPpsWk()
+    public function getPpsWk()
     {
         $ret = str_pad($this->Name, 64, "\x00");
 
@@ -207,7 +207,7 @@ class PPS
      *
      * @return int The index for this PPS
      */
-    public static function _savePpsSetPnt(&$raList, $to_save, $depth = 0)
+    public static function savePpsSetPnt(&$raList, $to_save, $depth = 0)
     {
         if (!is_array($to_save) || (empty($to_save))) {
             return 0xFFFFFFFF;
@@ -218,7 +218,7 @@ class PPS
             $raList[$cnt]->No = $cnt;
             $raList[$cnt]->PrevPps = 0xFFFFFFFF;
             $raList[$cnt]->NextPps = 0xFFFFFFFF;
-            $raList[$cnt]->DirPps = self::_savePpsSetPnt($raList, @$raList[$cnt]->children, $depth++);
+            $raList[$cnt]->DirPps = self::savePpsSetPnt($raList, @$raList[$cnt]->children, $depth++);
         } else {
             $iPos = floor(count($to_save) / 2);
             $aPrev = array_slice($to_save, 0, $iPos);
@@ -227,9 +227,9 @@ class PPS
             // If the first entry, it's the root... Don't clone it!
             $raList[$cnt] = ($depth == 0) ? $to_save[$iPos] : clone $to_save[$iPos];
             $raList[$cnt]->No = $cnt;
-            $raList[$cnt]->PrevPps = self::_savePpsSetPnt($raList, $aPrev, $depth++);
-            $raList[$cnt]->NextPps = self::_savePpsSetPnt($raList, $aNext, $depth++);
-            $raList[$cnt]->DirPps = self::_savePpsSetPnt($raList, @$raList[$cnt]->children, $depth++);
+            $raList[$cnt]->PrevPps = self::savePpsSetPnt($raList, $aPrev, $depth++);
+            $raList[$cnt]->NextPps = self::savePpsSetPnt($raList, $aNext, $depth++);
+            $raList[$cnt]->DirPps = self::savePpsSetPnt($raList, @$raList[$cnt]->children, $depth++);
         }
 
         return $cnt;
diff --git a/src/PhpSpreadsheet/Shared/OLE/PPS/Root.php b/src/PhpSpreadsheet/Shared/OLE/PPS/Root.php
index 11655c65..5466d2bc 100644
--- a/src/PhpSpreadsheet/Shared/OLE/PPS/Root.php
+++ b/src/PhpSpreadsheet/Shared/OLE/PPS/Root.php
@@ -80,21 +80,21 @@ class Root extends PPS
 
         // Make an array of PPS's (for Save)
         $aList = [];
-        PPS::_savePpsSetPnt($aList, [$this]);
+        PPS::savePpsSetPnt($aList, [$this]);
         // calculate values for header
-        [$iSBDcnt, $iBBcnt, $iPPScnt] = $this->_calcSize($aList); //, $rhInfo);
+        [$iSBDcnt, $iBBcnt, $iPPScnt] = $this->calcSize($aList); //, $rhInfo);
         // Save Header
-        $this->_saveHeader($iSBDcnt, $iBBcnt, $iPPScnt);
+        $this->saveHeader($iSBDcnt, $iBBcnt, $iPPScnt);
 
         // Make Small Data string (write SBD)
-        $this->_data = $this->_makeSmallData($aList);
+        $this->_data = $this->makeSmallData($aList);
 
         // Write BB
-        $this->_saveBigData($iSBDcnt, $aList);
+        $this->saveBigData($iSBDcnt, $aList);
         // Write PPS
-        $this->_savePps($aList);
+        $this->savePps($aList);
         // Write Big Block Depot and BDList and Adding Header informations
-        $this->_saveBbd($iSBDcnt, $iBBcnt, $iPPScnt);
+        $this->saveBbd($iSBDcnt, $iBBcnt, $iPPScnt);
 
         return true;
     }
@@ -106,7 +106,7 @@ class Root extends PPS
      *
      * @return float[] The array of numbers
      */
-    public function _calcSize(&$raList)
+    private function calcSize(&$raList)
     {
         // Calculate Basic Setting
         [$iSBDcnt, $iBBcnt, $iPPScnt] = [0, 0, 0];
@@ -160,7 +160,7 @@ class Root extends PPS
      * @param int $iBBcnt
      * @param int $iPPScnt
      */
-    public function _saveHeader($iSBDcnt, $iBBcnt, $iPPScnt): void
+    private function saveHeader($iSBDcnt, $iBBcnt, $iPPScnt): void
     {
         $FILE = $this->fileHandle;
 
@@ -239,7 +239,7 @@ class Root extends PPS
      * @param int $iStBlk
      * @param array &$raList Reference to array of PPS's
      */
-    public function _saveBigData($iStBlk, &$raList): void
+    private function saveBigData($iStBlk, &$raList): void
     {
         $FILE = $this->fileHandle;
 
@@ -271,7 +271,7 @@ class Root extends PPS
      *
      * @return string
      */
-    public function _makeSmallData(&$raList)
+    private function makeSmallData(&$raList)
     {
         $sRes = '';
         $FILE = $this->fileHandle;
@@ -321,12 +321,12 @@ class Root extends PPS
      *
      * @param array $raList Reference to an array with all PPS's
      */
-    public function _savePps(&$raList): void
+    private function savePps(&$raList): void
     {
         // Save each PPS WK
         $iC = count($raList);
         for ($i = 0; $i < $iC; ++$i) {
-            fwrite($this->fileHandle, $raList[$i]->_getPpsWk());
+            fwrite($this->fileHandle, $raList[$i]->getPpsWk());
         }
         // Adjust for Block
         $iCnt = count($raList);
@@ -343,7 +343,7 @@ class Root extends PPS
      * @param int $iBsize
      * @param int $iPpsCnt
      */
-    public function _saveBbd($iSbdSize, $iBsize, $iPpsCnt): void
+    private function saveBbd($iSbdSize, $iBsize, $iPpsCnt): void
     {
         $FILE = $this->fileHandle;
         // Calculate Basic Setting
diff --git a/src/PhpSpreadsheet/Shared/OLERead.php b/src/PhpSpreadsheet/Shared/OLERead.php
index b6d5422c..7112b090 100644
--- a/src/PhpSpreadsheet/Shared/OLERead.php
+++ b/src/PhpSpreadsheet/Shared/OLERead.php
@@ -180,7 +180,7 @@ class OLERead
 
         // read the directory stream
         $block = $this->rootStartBlock;
-        $this->entry = $this->_readData($block);
+        $this->entry = $this->readData($block);
 
         $this->readPropertySets();
     }
@@ -201,7 +201,7 @@ class OLERead
         $streamData = '';
 
         if ($this->props[$stream]['size'] < self::SMALL_BLOCK_THRESHOLD) {
-            $rootdata = $this->_readData($this->props[$this->rootentry]['startBlock']);
+            $rootdata = $this->readData($this->props[$this->rootentry]['startBlock']);
 
             $block = $this->props[$stream]['startBlock'];
 
@@ -241,7 +241,7 @@ class OLERead
      *
      * @return string Data for standard stream
      */
-    private function _readData($bl)
+    private function readData($bl)
     {
         $block = $bl;
         $data = '';
diff --git a/src/PhpSpreadsheet/Spreadsheet.php b/src/PhpSpreadsheet/Spreadsheet.php
index 322d5f7c..46e97852 100644
--- a/src/PhpSpreadsheet/Spreadsheet.php
+++ b/src/PhpSpreadsheet/Spreadsheet.php
@@ -396,8 +396,10 @@ class Spreadsheet
 
                 break;
             case 'types':
-                if (is_array($this->ribbonBinObjects) &&
-                    isset($this->ribbonBinObjects['data']) && is_array($this->ribbonBinObjects['data'])) {
+                if (
+                    is_array($this->ribbonBinObjects) &&
+                    isset($this->ribbonBinObjects['data']) && is_array($this->ribbonBinObjects['data'])
+                ) {
                     $tmpTypes = array_keys($this->ribbonBinObjects['data']);
                     $ReturnData = array_unique(array_map([$this, 'getExtensionOnly'], $tmpTypes));
                 } else {
@@ -657,8 +659,10 @@ class Spreadsheet
         array_splice($this->workSheetCollection, $pIndex, 1);
 
         // Adjust active sheet index if necessary
-        if (($this->activeSheetIndex >= $pIndex) &&
-            ($pIndex > count($this->workSheetCollection) - 1)) {
+        if (
+            ($this->activeSheetIndex >= $pIndex) &&
+            ($pIndex > count($this->workSheetCollection) - 1)
+        ) {
             --$this->activeSheetIndex;
         }
     }
diff --git a/src/PhpSpreadsheet/Style/Alignment.php b/src/PhpSpreadsheet/Style/Alignment.php
index e54fa2a1..4d97dd2c 100644
--- a/src/PhpSpreadsheet/Style/Alignment.php
+++ b/src/PhpSpreadsheet/Style/Alignment.php
@@ -385,9 +385,11 @@ class Alignment extends Supervisor
     public function setIndent($pValue)
     {
         if ($pValue > 0) {
-            if ($this->getHorizontal() != self::HORIZONTAL_GENERAL &&
+            if (
+                $this->getHorizontal() != self::HORIZONTAL_GENERAL &&
                 $this->getHorizontal() != self::HORIZONTAL_LEFT &&
-                $this->getHorizontal() != self::HORIZONTAL_RIGHT) {
+                $this->getHorizontal() != self::HORIZONTAL_RIGHT
+            ) {
                 $pValue = 0; // indent not supported
             }
         }
diff --git a/src/PhpSpreadsheet/Worksheet/AutoFilter.php b/src/PhpSpreadsheet/Worksheet/AutoFilter.php
index c085b596..c2ded195 100644
--- a/src/PhpSpreadsheet/Worksheet/AutoFilter.php
+++ b/src/PhpSpreadsheet/Worksheet/AutoFilter.php
@@ -643,28 +643,40 @@ class AutoFilter
                         ];
                         foreach ($ruleDataSet as $ruleValue) {
                             $date = $time = '';
-                            if ((isset($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR])) &&
-                                ($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR] !== '')) {
+                            if (
+                                (isset($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR])) &&
+                                ($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR] !== '')
+                            ) {
                                 $date .= sprintf('%04d', $ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_YEAR]);
                             }
-                            if ((isset($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH])) &&
-                                ($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH] != '')) {
+                            if (
+                                (isset($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH])) &&
+                                ($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH] != '')
+                            ) {
                                 $date .= sprintf('%02d', $ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_MONTH]);
                             }
-                            if ((isset($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY])) &&
-                                ($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY] !== '')) {
+                            if (
+                                (isset($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY])) &&
+                                ($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY] !== '')
+                            ) {
                                 $date .= sprintf('%02d', $ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_DAY]);
                             }
-                            if ((isset($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR])) &&
-                                ($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR] !== '')) {
+                            if (
+                                (isset($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR])) &&
+                                ($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR] !== '')
+                            ) {
                                 $time .= sprintf('%02d', $ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_HOUR]);
                             }
-                            if ((isset($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE])) &&
-                                ($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE] !== '')) {
+                            if (
+                                (isset($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE])) &&
+                                ($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE] !== '')
+                            ) {
                                 $time .= sprintf('%02d', $ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_MINUTE]);
                             }
-                            if ((isset($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND])) &&
-                                ($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND] !== '')) {
+                            if (
+                                (isset($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND])) &&
+                                ($ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND] !== '')
+                            ) {
                                 $time .= sprintf('%02d', $ruleValue[AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DATEGROUP_SECOND]);
                             }
                             $dateTime = $date . $time;
@@ -712,8 +724,10 @@ class AutoFilter
                     foreach ($rules as $rule) {
                         //    We should only ever have one Dynamic Filter Rule anyway
                         $dynamicRuleType = $rule->getGrouping();
-                        if (($dynamicRuleType == AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE) ||
-                            ($dynamicRuleType == AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_BELOWAVERAGE)) {
+                        if (
+                            ($dynamicRuleType == AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_ABOVEAVERAGE) ||
+                            ($dynamicRuleType == AutoFilter\Column\Rule::AUTOFILTER_RULETYPE_DYNAMIC_BELOWAVERAGE)
+                        ) {
                             //    Number (Average) based
                             //    Calculate the average
                             $averageFormula = '=AVERAGE(' . $columnID . ($rangeStart[1] + 1) . ':' . $columnID . $rangeEnd[1] . ')';
diff --git a/src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php b/src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php
index c0a15a7c..1aacb0cb 100644
--- a/src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php
+++ b/src/PhpSpreadsheet/Worksheet/AutoFilter/Column/Rule.php
@@ -337,8 +337,10 @@ class Rule
         if (empty($pOperator)) {
             $pOperator = self::AUTOFILTER_COLUMN_RULE_EQUAL;
         }
-        if ((!in_array($pOperator, self::$operators)) &&
-            (!in_array($pOperator, self::$topTenValue))) {
+        if (
+            (!in_array($pOperator, self::$operators)) &&
+            (!in_array($pOperator, self::$topTenValue))
+        ) {
             throw new PhpSpreadsheetException('Invalid operator for column AutoFilter Rule.');
         }
         $this->operator = $pOperator;
@@ -365,10 +367,12 @@ class Rule
      */
     public function setGrouping($pGrouping)
     {
-        if (($pGrouping !== null) &&
+        if (
+            ($pGrouping !== null) &&
             (!in_array($pGrouping, self::$dateTimeGroups)) &&
             (!in_array($pGrouping, self::$dynamicTypes)) &&
-            (!in_array($pGrouping, self::$topTenType))) {
+            (!in_array($pGrouping, self::$topTenType))
+        ) {
             throw new PhpSpreadsheetException('Invalid rule type for column AutoFilter Rule.');
         }
         $this->grouping = $pGrouping;
diff --git a/src/PhpSpreadsheet/Worksheet/ColumnCellIterator.php b/src/PhpSpreadsheet/Worksheet/ColumnCellIterator.php
index ec16fbe5..12420d77 100644
--- a/src/PhpSpreadsheet/Worksheet/ColumnCellIterator.php
+++ b/src/PhpSpreadsheet/Worksheet/ColumnCellIterator.php
@@ -137,9 +137,11 @@ class ColumnCellIterator extends CellIterator
     {
         do {
             ++$this->currentRow;
-        } while (($this->onlyExistingCells) &&
+        } while (
+            ($this->onlyExistingCells) &&
             (!$this->worksheet->cellExistsByColumnAndRow($this->columnIndex, $this->currentRow)) &&
-            ($this->currentRow <= $this->endRow));
+            ($this->currentRow <= $this->endRow)
+        );
     }
 
     /**
@@ -149,9 +151,11 @@ class ColumnCellIterator extends CellIterator
     {
         do {
             --$this->currentRow;
-        } while (($this->onlyExistingCells) &&
+        } while (
+            ($this->onlyExistingCells) &&
             (!$this->worksheet->cellExistsByColumnAndRow($this->columnIndex, $this->currentRow)) &&
-            ($this->currentRow >= $this->startRow));
+            ($this->currentRow >= $this->startRow)
+        );
     }
 
     /**
@@ -170,15 +174,19 @@ class ColumnCellIterator extends CellIterator
     protected function adjustForExistingOnlyRange(): void
     {
         if ($this->onlyExistingCells) {
-            while ((!$this->worksheet->cellExistsByColumnAndRow($this->columnIndex, $this->startRow)) &&
-                ($this->startRow <= $this->endRow)) {
+            while (
+                (!$this->worksheet->cellExistsByColumnAndRow($this->columnIndex, $this->startRow)) &&
+                ($this->startRow <= $this->endRow)
+            ) {
                 ++$this->startRow;
             }
             if ($this->startRow > $this->endRow) {
                 throw new PhpSpreadsheetException('No cells exist within the specified range');
             }
-            while ((!$this->worksheet->cellExistsByColumnAndRow($this->columnIndex, $this->endRow)) &&
-                ($this->endRow >= $this->startRow)) {
+            while (
+                (!$this->worksheet->cellExistsByColumnAndRow($this->columnIndex, $this->endRow)) &&
+                ($this->endRow >= $this->startRow)
+            ) {
                 --$this->endRow;
             }
             if ($this->endRow < $this->startRow) {
diff --git a/src/PhpSpreadsheet/Worksheet/Worksheet.php b/src/PhpSpreadsheet/Worksheet/Worksheet.php
index e2b0dd87..3acab637 100644
--- a/src/PhpSpreadsheet/Worksheet/Worksheet.php
+++ b/src/PhpSpreadsheet/Worksheet/Worksheet.php
@@ -433,9 +433,11 @@ class Worksheet implements IComparable
             throw new Exception('Sheet code name cannot be empty.');
         }
         // Some of the printable ASCII characters are invalid:  * : / \ ? [ ] and  first and last characters cannot be a "'"
-        if ((str_replace(self::$invalidCharacters, '', $pValue) !== $pValue) ||
+        if (
+            (str_replace(self::$invalidCharacters, '', $pValue) !== $pValue) ||
             (Shared\StringHelper::substring($pValue, -1, 1) == '\'') ||
-            (Shared\StringHelper::substring($pValue, 0, 1) == '\'')) {
+            (Shared\StringHelper::substring($pValue, 0, 1) == '\'')
+        ) {
             throw new Exception('Invalid character found in sheet code name');
         }
 
@@ -1188,8 +1190,10 @@ class Worksheet implements IComparable
         }
 
         // Named range?
-        if ((!preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $pCoordinate, $matches)) &&
-            (preg_match('/^' . Calculation::CALCULATION_REGEXP_NAMEDRANGE . '$/i', $pCoordinate, $matches))) {
+        if (
+            (!preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $pCoordinate, $matches)) &&
+            (preg_match('/^' . Calculation::CALCULATION_REGEXP_NAMEDRANGE . '$/i', $pCoordinate, $matches))
+        ) {
             $namedRange = NamedRange::resolveRange($pCoordinate, $this);
             if ($namedRange !== null) {
                 $pCoordinate = $namedRange->getRange();
@@ -1286,8 +1290,10 @@ class Worksheet implements IComparable
         }
 
         // Named range?
-        if ((!preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $pCoordinate, $matches)) &&
-            (preg_match('/^' . Calculation::CALCULATION_REGEXP_NAMEDRANGE . '$/i', $pCoordinate, $matches))) {
+        if (
+            (!preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $pCoordinate, $matches)) &&
+            (preg_match('/^' . Calculation::CALCULATION_REGEXP_NAMEDRANGE . '$/i', $pCoordinate, $matches))
+        ) {
             $namedRange = NamedRange::resolveRange($pCoordinate, $this);
             if ($namedRange !== null) {
                 $pCoordinate = $namedRange->getRange();
diff --git a/src/PhpSpreadsheet/Writer/Html.php b/src/PhpSpreadsheet/Writer/Html.php
index ec8fec7d..5c21b3a9 100644
--- a/src/PhpSpreadsheet/Writer/Html.php
+++ b/src/PhpSpreadsheet/Writer/Html.php
@@ -1368,7 +1368,8 @@ class Html extends BaseWriter
 
                 // General horizontal alignment: Actual horizontal alignment depends on dataType
                 $sharedStyle = $pSheet->getParent()->getCellXfByIndex($cell->getXfIndex());
-                if ($sharedStyle->getAlignment()->getHorizontal() == Alignment::HORIZONTAL_GENERAL
+                if (
+                    $sharedStyle->getAlignment()->getHorizontal() == Alignment::HORIZONTAL_GENERAL
                     && isset($this->cssStyles['.' . $cell->getDataType()]['text-align'])
                 ) {
                     $cssClass['text-align'] = $this->cssStyles['.' . $cell->getDataType()]['text-align'];
diff --git a/src/PhpSpreadsheet/Writer/Xls/Parser.php b/src/PhpSpreadsheet/Writer/Xls/Parser.php
index 621853c0..e3b01260 100644
--- a/src/PhpSpreadsheet/Writer/Xls/Parser.php
+++ b/src/PhpSpreadsheet/Writer/Xls/Parser.php
@@ -1172,9 +1172,11 @@ class Parser
             return $this->createTree('ptgUplus', $result2, '');
         }
         $result = $this->term();
-        while (($this->currentToken == '+') ||
+        while (
+            ($this->currentToken == '+') ||
                ($this->currentToken == '-') ||
-               ($this->currentToken == '^')) {
+               ($this->currentToken == '^')
+        ) {
             if ($this->currentToken == '+') {
                 $this->advance();
                 $result2 = $this->term();
@@ -1215,8 +1217,10 @@ class Parser
     private function term()
     {
         $result = $this->fact();
-        while (($this->currentToken == '*') ||
-               ($this->currentToken == '/')) {
+        while (
+            ($this->currentToken == '*') ||
+               ($this->currentToken == '/')
+        ) {
             if ($this->currentToken == '*') {
                 $this->advance();
                 $result2 = $this->fact();
@@ -1271,8 +1275,10 @@ class Parser
             $this->advance();
 
             return $result;
-        } elseif (preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+:(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+$/', $this->currentToken) ||
-                preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+\.\.(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+$/', $this->currentToken)) {
+        } elseif (
+            preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+:(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+$/', $this->currentToken) ||
+                preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+\.\.(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+$/', $this->currentToken)
+        ) {
             // if it's a range A1:B2 or $A$1:$B$2
             // must be an error?
             $result = $this->createTree($this->currentToken, '', '');
@@ -1419,11 +1425,13 @@ class Parser
             $polish .= $converted_tree;
         }
         // if it's a function convert it here (so we can set it's arguments)
-        if (preg_match("/^[A-Z0-9\xc0-\xdc\\.]+$/", $tree['value']) &&
+        if (
+            preg_match("/^[A-Z0-9\xc0-\xdc\\.]+$/", $tree['value']) &&
             !preg_match('/^([A-Ia-i]?[A-Za-z])(\d+)$/', $tree['value']) &&
             !preg_match('/^[A-Ia-i]?[A-Za-z](\\d+)\\.\\.[A-Ia-i]?[A-Za-z](\\d+)$/', $tree['value']) &&
             !is_numeric($tree['value']) &&
-            !isset($this->ptg[$tree['value']])) {
+            !isset($this->ptg[$tree['value']])
+        ) {
             // left subtree for a function is always an array.
             if ($tree['left'] != '') {
                 $left_tree = $this->toReversePolish($tree['left']);
diff --git a/src/PhpSpreadsheet/Writer/Xls/Worksheet.php b/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
index eb6b479d..a1c485c2 100644
--- a/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
+++ b/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
@@ -544,8 +544,10 @@ class Worksheet extends BIFFwriter
             // Write ConditionalFormattingTable records
             foreach ($arrConditionalStyles as $cellCoordinate => $conditionalStyles) {
                 foreach ($conditionalStyles as $conditional) {
-                    if ($conditional->getConditionType() == Conditional::CONDITION_EXPRESSION
-                        || $conditional->getConditionType() == Conditional::CONDITION_CELLIS) {
+                    if (
+                        $conditional->getConditionType() == Conditional::CONDITION_EXPRESSION
+                        || $conditional->getConditionType() == Conditional::CONDITION_CELLIS
+                    ) {
                         if (!isset($arrConditional[$conditional->getHashCode()])) {
                             // This hash code has been handled
                             $arrConditional[$conditional->getHashCode()] = true;
@@ -3086,7 +3088,8 @@ class Worksheet extends BIFFwriter
             $bFormatFill = 0;
         }
         // Font
-        if ($conditional->getStyle()->getFont()->getName() != null
+        if (
+            $conditional->getStyle()->getFont()->getName() != null
             || $conditional->getStyle()->getFont()->getSize() != null
             || $conditional->getStyle()->getFont()->getBold() != null
             || $conditional->getStyle()->getFont()->getItalic() != null
@@ -3094,7 +3097,8 @@ class Worksheet extends BIFFwriter
             || $conditional->getStyle()->getFont()->getSubscript() != null
             || $conditional->getStyle()->getFont()->getUnderline() != null
             || $conditional->getStyle()->getFont()->getStrikethrough() != null
-            || $conditional->getStyle()->getFont()->getColor()->getARGB() != null) {
+            || $conditional->getStyle()->getFont()->getColor()->getARGB() != null
+        ) {
             $bFormatFont = 1;
         } else {
             $bFormatFont = 0;
@@ -4447,8 +4451,10 @@ class Worksheet extends BIFFwriter
         $arrConditional = [];
         foreach ($this->phpSheet->getConditionalStylesCollection() as $cellCoordinate => $conditionalStyles) {
             foreach ($conditionalStyles as $conditional) {
-                if ($conditional->getConditionType() == Conditional::CONDITION_EXPRESSION
-                    || $conditional->getConditionType() == Conditional::CONDITION_CELLIS) {
+                if (
+                    $conditional->getConditionType() == Conditional::CONDITION_EXPRESSION
+                    || $conditional->getConditionType() == Conditional::CONDITION_CELLIS
+                ) {
                     if (!in_array($conditional->getHashCode(), $arrConditional)) {
                         $arrConditional[] = $conditional->getHashCode();
                     }
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Rels.php b/src/PhpSpreadsheet/Writer/Xlsx/Rels.php
index a4e5769e..79841404 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/Rels.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/Rels.php
@@ -317,8 +317,10 @@ class Rels extends WriterPart
         $i = 1;
         $iterator = $pWorksheet->getDrawingCollection()->getIterator();
         while ($iterator->valid()) {
-            if ($iterator->current() instanceof \PhpOffice\PhpSpreadsheet\Worksheet\Drawing
-                || $iterator->current() instanceof MemoryDrawing) {
+            if (
+                $iterator->current() instanceof \PhpOffice\PhpSpreadsheet\Worksheet\Drawing
+                || $iterator->current() instanceof MemoryDrawing
+            ) {
                 // Write relationship for image drawing
                 /** @var \PhpOffice\PhpSpreadsheet\Worksheet\Drawing $drawing */
                 $drawing = $iterator->current();
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/StringTable.php b/src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
index 872d0343..b0f7d6d4 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/StringTable.php
@@ -38,16 +38,20 @@ class StringTable extends WriterPart
         foreach ($pSheet->getCoordinates() as $coordinate) {
             $cell = $pSheet->getCell($coordinate);
             $cellValue = $cell->getValue();
-            if (!is_object($cellValue) &&
+            if (
+                !is_object($cellValue) &&
                 ($cellValue !== null) &&
                 $cellValue !== '' &&
                 !isset($aFlippedStringTable[$cellValue]) &&
-                ($cell->getDataType() == DataType::TYPE_STRING || $cell->getDataType() == DataType::TYPE_STRING2 || $cell->getDataType() == DataType::TYPE_NULL)) {
+                ($cell->getDataType() == DataType::TYPE_STRING || $cell->getDataType() == DataType::TYPE_STRING2 || $cell->getDataType() == DataType::TYPE_NULL)
+            ) {
                 $aStringTable[] = $cellValue;
                 $aFlippedStringTable[$cellValue] = true;
-            } elseif ($cellValue instanceof RichText &&
+            } elseif (
+                $cellValue instanceof RichText &&
                 ($cellValue !== null) &&
-                !isset($aFlippedStringTable[$cellValue->getHashCode()])) {
+                !isset($aFlippedStringTable[$cellValue->getHashCode()])
+            ) {
                 $aStringTable[] = $cellValue;
                 $aFlippedStringTable[$cellValue->getHashCode()] = true;
             }
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Style.php b/src/PhpSpreadsheet/Writer/Xlsx/Style.php
index 74300a9c..0c43fbf4 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/Style.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/Style.php
@@ -152,8 +152,10 @@ class Style extends WriterPart
     private function writeFill(XMLWriter $objWriter, Fill $pFill): void
     {
         // Check if this is a pattern type or gradient type
-        if ($pFill->getFillType() === Fill::FILL_GRADIENT_LINEAR ||
-            $pFill->getFillType() === Fill::FILL_GRADIENT_PATH) {
+        if (
+            $pFill->getFillType() === Fill::FILL_GRADIENT_LINEAR ||
+            $pFill->getFillType() === Fill::FILL_GRADIENT_PATH
+        ) {
             // Gradient fill
             $this->writeGradientFill($objWriter, $pFill);
         } elseif ($pFill->getFillType() !== null) {
@@ -479,15 +481,21 @@ class Style extends WriterPart
 
         // protection
         if (($pStyle->getProtection()->getLocked() !== null) || ($pStyle->getProtection()->getHidden() !== null)) {
-            if ($pStyle->getProtection()->getLocked() !== Protection::PROTECTION_INHERIT ||
-                $pStyle->getProtection()->getHidden() !== Protection::PROTECTION_INHERIT) {
+            if (
+                $pStyle->getProtection()->getLocked() !== Protection::PROTECTION_INHERIT ||
+                $pStyle->getProtection()->getHidden() !== Protection::PROTECTION_INHERIT
+            ) {
                 $objWriter->startElement('protection');
-                if (($pStyle->getProtection()->getLocked() !== null) &&
-                    ($pStyle->getProtection()->getLocked() !== Protection::PROTECTION_INHERIT)) {
+                if (
+                    ($pStyle->getProtection()->getLocked() !== null) &&
+                    ($pStyle->getProtection()->getLocked() !== Protection::PROTECTION_INHERIT)
+                ) {
                     $objWriter->writeAttribute('locked', ($pStyle->getProtection()->getLocked() == Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
                 }
-                if (($pStyle->getProtection()->getHidden() !== null) &&
-                    ($pStyle->getProtection()->getHidden() !== Protection::PROTECTION_INHERIT)) {
+                if (
+                    ($pStyle->getProtection()->getHidden() !== null) &&
+                    ($pStyle->getProtection()->getHidden() !== Protection::PROTECTION_INHERIT)
+                ) {
                     $objWriter->writeAttribute('hidden', ($pStyle->getProtection()->getHidden() == Protection::PROTECTION_PROTECTED ? 'true' : 'false'));
                 }
                 $objWriter->endElement();
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php b/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
index 759d9611..b6a6fc39 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php
@@ -314,8 +314,10 @@ class Worksheet extends WriterPart
         }
 
         // Set Zero Height row
-        if ((string) $pSheet->getDefaultRowDimension()->getZeroHeight() === '1' ||
-            strtolower((string) $pSheet->getDefaultRowDimension()->getZeroHeight()) == 'true') {
+        if (
+            (string) $pSheet->getDefaultRowDimension()->getZeroHeight() === '1' ||
+            strtolower((string) $pSheet->getDefaultRowDimension()->getZeroHeight()) == 'true'
+        ) {
             $objWriter->writeAttribute('zeroHeight', '1');
         }
 
@@ -466,9 +468,11 @@ class Worksheet extends WriterPart
 
     private static function writeOtherCondElements(XMLWriter $objWriter, Conditional $conditional, string $cellCoordinate): void
     {
-        if ($conditional->getConditionType() == Conditional::CONDITION_CELLIS
+        if (
+            $conditional->getConditionType() == Conditional::CONDITION_CELLIS
             || $conditional->getConditionType() == Conditional::CONDITION_CONTAINSTEXT
-            || $conditional->getConditionType() == Conditional::CONDITION_EXPRESSION) {
+            || $conditional->getConditionType() == Conditional::CONDITION_EXPRESSION
+        ) {
             foreach ($conditional->getConditions() as $formula) {
                 // Formula
                 $objWriter->writeElement('formula', Xlfn::addXlfn($formula));
@@ -791,9 +795,11 @@ class Worksheet extends WriterPart
                         }
 
                         foreach ($rules as $rule) {
-                            if (($column->getFilterType() === Column::AUTOFILTER_FILTERTYPE_FILTER) &&
+                            if (
+                                ($column->getFilterType() === Column::AUTOFILTER_FILTERTYPE_FILTER) &&
                                 ($rule->getOperator() === Rule::AUTOFILTER_COLUMN_RULE_EQUAL) &&
-                                ($rule->getValue() === '')) {
+                                ($rule->getValue() === '')
+                            ) {
                                 //    Filter rule for Blanks
                                 $objWriter->writeAttribute('blank', 1);
                             } elseif ($rule->getRuleType() === Rule::AUTOFILTER_RULETYPE_DYNAMICFILTER) {
diff --git a/tests/PhpSpreadsheetTests/Functional/ReadFilterTest.php b/tests/PhpSpreadsheetTests/Functional/ReadFilterTest.php
index efca228c..9ab86baa 100644
--- a/tests/PhpSpreadsheetTests/Functional/ReadFilterTest.php
+++ b/tests/PhpSpreadsheetTests/Functional/ReadFilterTest.php
@@ -90,13 +90,13 @@ class ReadFilterTest extends AbstractFunctional
     }
 
     /**
-     * @see \PhpOffice\PhpSpreadsheet\Reader\IReadFilter::readCell()
-     *
      * @param string $column Column address (as a string value like "A", or "IV")
      * @param int $row Row number
      * @param string $worksheetName Optional worksheet name
      *
      * @return bool
+     *
+     * @see \PhpOffice\PhpSpreadsheet\Reader\IReadFilter::readCell()
      */
     public function readFilterReadCell($column, $row, $worksheetName = '')
     {
@@ -112,8 +112,10 @@ class ReadFilterTest extends AbstractFunctional
         }
 
         $col = sprintf('%04s', $column);
-        if ($col > sprintf('%04s', $columnMax) ||
-            $col < sprintf('%04s', $columnMin)) {
+        if (
+            $col > sprintf('%04s', $columnMax) ||
+            $col < sprintf('%04s', $columnMin)
+        ) {
             return false;
         }
 
diff --git a/tests/PhpSpreadsheetTests/Reader/Html/HtmlTest.php b/tests/PhpSpreadsheetTests/Reader/Html/HtmlTest.php
index 2f584029..14bdb39a 100644
--- a/tests/PhpSpreadsheetTests/Reader/Html/HtmlTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Html/HtmlTest.php
@@ -5,6 +5,7 @@ namespace PhpOffice\PhpSpreadsheetTests\Reader\Html;
 use PhpOffice\PhpSpreadsheet\Reader\Exception as ReaderException;
 use PhpOffice\PhpSpreadsheet\Reader\Html;
 use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PhpOffice\PhpSpreadsheet\Style\Border;
 use PhpOffice\PhpSpreadsheet\Style\Font;
 use PHPUnit\Framework\TestCase;
 

From 48f8b5c1f2be2dc69cc14a3c8894d0e6e391a80e Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Sun, 26 Jul 2020 14:48:06 +0900
Subject: [PATCH 105/153] Move phpcs config to file

---
 .phpcs.xml.dist                               | 22 +++++++++++++++++++
 composer.json                                 |  2 +-
 .../Calculation/Calculation.php               |  6 ++---
 3 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 .phpcs.xml.dist

diff --git a/.phpcs.xml.dist b/.phpcs.xml.dist
new file mode 100644
index 00000000..3eafb6ca
--- /dev/null
+++ b/.phpcs.xml.dist
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="PHP_CodeSniffer"
+         xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd">
+
+    <file>samples</file>
+    <file>src</file>
+    <file>tests</file>
+
+    <exclude-pattern>samples/Header.php</exclude-pattern>
+    <exclude-pattern>*/tests/Core/*/*Test\.(inc|css|js)$</exclude-pattern>
+
+    <arg name="report-width" value="200"/>
+    <arg name="parallel" value="80"/>
+    <arg name="cache" value="/tmp/.phpspreadsheet.phpcs-cache"/>
+    <arg name="colors"/>
+    <arg value="np"/>
+
+    <!-- Include the whole PSR12 standard -->
+    <rule ref="PSR12">
+        <exclude name="PSR2.Methods.MethodDeclaration.Underscore"/>
+    </rule>
+</ruleset>
diff --git a/composer.json b/composer.json
index 32df7bac..00b6fe9e 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
     "scripts": {
         "check": [
             "php-cs-fixer fix --ansi --dry-run --diff",
-            "phpcs --report-width=200 samples/ src/ tests/ --ignore=samples/Header.php --standard=PSR12 -n",
+            "phpcs",
             "phpunit --color=always"
         ],
         "fix": [
diff --git a/src/PhpSpreadsheet/Calculation/Calculation.php b/src/PhpSpreadsheet/Calculation/Calculation.php
index 19e2fc89..10ba064a 100644
--- a/src/PhpSpreadsheet/Calculation/Calculation.php
+++ b/src/PhpSpreadsheet/Calculation/Calculation.php
@@ -3277,7 +3277,7 @@ class Calculation
         }
 
         //    Parse the formula and return the token stack
-        return $this->_parseFormula($formula);
+        return $this->internalParseFormula($formula);
     }
 
     /**
@@ -3418,7 +3418,7 @@ class Calculation
 
         //    Parse the formula onto the token stack and calculate the value
         $this->cyclicReferenceStack->push($wsCellReference);
-        $cellValue = $this->processTokenStack($this->_parseFormula($formula, $pCell), $cellID, $pCell);
+        $cellValue = $this->processTokenStack($this->internalParseFormula($formula, $pCell), $cellID, $pCell);
         $this->cyclicReferenceStack->pop();
 
         // Save to calculation cache
@@ -3765,7 +3765,7 @@ class Calculation
      *
      * @return bool
      */
-    private function _parseFormula($formula, ?Cell $pCell = null)
+    private function internalParseFormula($formula, ?Cell $pCell = null)
     {
         if (($formula = $this->convertMatrixReferences(trim($formula))) === false) {
             return false;

From 8d788b4dc66cb9173811875c6694c442712f5812 Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Sun, 26 Jul 2020 15:05:54 +0900
Subject: [PATCH 106/153] Travis use same config for phpcs

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index afe5911a..77eed441 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@ jobs:
       php: 7.4
       script:
         - ./vendor/bin/php-cs-fixer fix --diff --verbose --dry-run
-        - ./vendor/bin/phpcs --report-width=200 samples/ src/ tests/ --ignore=samples/Header.php --standard=PSR2 -n
+        - ./vendor/bin/phpcs
 
     - stage: Coverage
       php: 7.4

From 8b0aaf7ecf92b3b501e9af120cee1a855ebe832b Mon Sep 17 00:00:00 2001
From: Mark Baker <mark@lange.demon.co.uk>
Date: Sun, 26 Jul 2020 12:00:06 +0200
Subject: [PATCH 107/153] Named formula implementation, and improved handling
 of Defined Names generally  (#1535)

* Initial work modifying the way named ranges are stored, and handled by the calculation engine
This should provide better support for:
  - both union and intersection operators in composite named range values
  - MS Excel implementation of the union operator duplicating values
  - named formulae
  - named ranges and formulae that reference other named ranges and formulae
  - ranges and formulae that reference multiple ranges across multiple worksheets

* Initial work on handling defined names (named ranges and named formulae) correctly
 - UTF-8 names (already extracted as a separate PR and merged)
 - distinction between named ranges and named formulae
 - correct handling of union and intersection operators in named ranges
 - correct evaluation of named range operators in calculations
 - calculation support for named formulae
 - support for nested ranges and formulae (named ranges and formulae that reference other named ranges/formulae) in calculations

* Minor tweaks before resolving merge conflicts

* Fix extractSheetTitle() method to work on the last ! in a cell reference rather than the first

* Throw exception if a the reference to a defined name in a formula doesn't exist as a defined name

* Properly assess scope for defined names in calculation engine

* Elimination of some redundant code

* Minor tweaks to simplify entries o the stack where we need to check type

* Ensure correct scoping rules are applied when evaluating named ranges and formulae

* Adjustments to Gnumeric Reader for new defined names structure

* Initial work modifying the Ods Reader to handle named ranges, they weren't actually supported previously... this is still ongoing work

* Handle Ranges formatted as 3-d ranges, as long as the references are both to the same worksheet

* Additional testing for Named Ranges formatted as 3-d ranges, as long as the references are both to the same worksheet

* Skip composite named range tests for the moment

* Clean handling for `undefined name` exception when thrown in the calculation engine. Catch and replace with `#NAME?`

* Adjust method we use to determine whether a defined name is a range or a formula

* PHPCS Recommendations

* PHP doesn't support `mixed` yet, at least not at the minium version that we're working with

* More phpcs fixes

* More phpcs appeasements

* Final phpcs fixes for the moment
Still have a lot of echo and var_dump() statements in the code that scrutinizer will hate, but they stay for the moment while this is still WIP

* Please let this be the last of the phpcs fixes

* Unit tests to determine whether a defined name value is a range value or a formula

* phpcs appeasement

* Named tests from provider

* Initial steps for named ranges and formulae in the Ods Reader

* Reading pseudo-3d range addresses in Ods; treat second sheet reference as being identical to the first, which is the majority of cases where this will occur

* Initial work on Gnumeric reader for named ranges and formulae

* Suppress debug logging again

* Remove more debugging displays

* Last minor tweaks before phase two

* Minor refinements

* And all for the want of a space

* A little tidying up

* More tidying up

* phpcs fix

* Modify defined names in rebindParent()

* Renaming variables

* Resolve an issue with locally scoped defined names that don't contain any worksheet reference

* Keep phpcs happy

* Fix quote handling in regexp

* Fix a couple of scrutinizer issues

* Fix a couple of scrutinizer issues

* Update Xlsx Writer to work with the new defined name internal definition
Additional validation checks

* When adding new defined names through the readers, worksheet may not exist if we're only loading selected sheets rather than the full spreadsheet

* If the only thing that phpcs can pickup on is strings in double quotes instead of single quotes, then I know I'm getting close to ready

* Refactor Defined Names logic for Xlsx Writer into its own class

* phpcs keeping me on my toes

* Restore a couple of files that I managed to change without intending to

* Initial work on Ods Write to provide support for saving named ranges and formulae

* Resolve commas to semi-colons s argument separator when writing named formulae for Ods

* Extract Named Expression Writer for Ods into its own class

* Keep phpcs happy

* Refactoring of formula conversion when reading SpreadsheetML; preparation for reading named ranges because they will also need to use the same conversion method

* First pass at reading Named Ranges/Formulae from SpreadsheetML format xml files

* Remove unused namespace reference

* Defined names being written correctly for Xls; but not yet writing cell formulae that reference those defined names... that's the next big step
And I anticipate that defined names that reference other defined names will also be a problem

* Just to keep phpcs happy
... and yes, I know that there are still diagnostic echo statements in the code

* I had to miss some of the phpcs issues didn't I

* Work on the Xls Writer's Parser Tree to identify named range tokens in a formula, and to distinguish them from function tokens

* Still working on packing that d*** defined name reference in the writer

* Throw an exception in the Parser for saving Xls output if we encounter a defined name in a formula... writer will simply write the calculated cell value, and not the formula as at present
Strip out diagnostic output

* Some phpcs appeasement

* Fix a couple of Scrutinizer issues

* Additional verifications to differentiate a formula from a range value
Add explicit getters/setters for named ranges, named formulae and defined names
Additional unit tests

* Styling for closures

* Remove redundant docblocks

* Spaces

* Gah! Namespace use complaints

* Consistency of making calls to DefinedName rather than NamedRange; NamedRange should now be used only for Named Ranges, and should exclude Named Formulae

* Styling

* spurious newline

* No need to test for variable === null when we're typing it in the function argument definition

* Additional unit tests for local/global scoped named ranges and formulae; and a fix to getNamedFormula()

* Fix silly typo that led to breaking test

* Void return signature for unit tests

* Why weren't these picked up in the last pass?

* Refactoring of getNamedRange()/getNamedFormula()

* Eliminate unused constants, and defaults for private method parameters when always called with a value

* Use strict comparisons when comparing object hash codes

* Initial update to documentation for working with named formulae

* Fix for calculation of relative cell references in named ranges/formulae

* Fix current named range tests, because we should be using absolute references; tests for relative named ranges to be added later

* Fix for calculation of relative cell references in named ranges/formulae

* Updates to changelog and documentation for handling of absolute/relative references in named ranges

* Fix last remaining unit test with a named range reference

* Refactor formula conversion for Ods into a separate class; I hadn't realised that it previously wrote formulae as the MS Excel syntax without any conversion to Ods format

* Fix Ods Writer test xml to reflect Ods-native format for formula

* Docblocks

* Drop dollar prefix from Ods formulae and ranges unless it's necessary

* Set the formula convertor in the content writer constructor

* Documentation update

* Minor updates

* Remove var_dumps from file

* Fix the spurious single quote that was breaking named expressions in the Ods Writer... big sigh of relief that I finally spotted it

* Starting work on documentation for Defined Names, and some examples of using Named Ranges and Formulae

* Starting work on documentation for Defined Names, and some examples of using Named Ranges and Formulae

* Example of a relative named range for the documentation

* Mustn't have phpcs problems in sample code either

* More updates to the documentation

* That should conclude the documentation for Named Ranges, now time to move on to documenting Named Formulae

* That should conclude the documentation for Named Ranges, now time to move on to documenting Named Formulae

* PHPCS appeasement in sample code

* Initial documentation on Named Formulae

* PHPCS appeasements

* Additional comments in the documentation, and modify the named range name validation to support a \ as the first character in a name

* Fix breaking build

* Make defined names case-insensitive

* Fix case-insensitivity

* Improved documentation, and additional unit tests

* Additional unit tests, and a fix for removing a globally scoped defined name even if a worksheet is specified in the method call

* Fix unit test for removing named formulae

* Use assertCount instead of assertSame

* Forgotten voids

* Fix arguments for assertCount

* Unit tests for removing defined names, and a fix for removing locally scoped names

* Unit tests for absolute and relative named ranges in calculation engine, and fix an issue with worksheet name in the offset adjustments for relative references

* PHPCS Appeasement

* Additional unit tests, more documentation, and a fix to the calculation engine when no worksheet reference is provided with a named formula

* PHPCS appeasements

* Additional documentation and examples of using Named Formulae

* Additional examples to go with documentation

* A few minor phpcs appeasements

* Minor refactor of updateFormulaReferencesAnyWorksheet() method

* Discard an unused method argument

* Additional unit tests

* Additional unit tests

* Remove unused argument

* Stricter typing

* Fix return typehinting from remove named range/formula; should return the Spreadsheet object

* Use return typehint of self rather than explicit object type

* Redundant code just to keep scrutinizer happy

* Minor change to handle merge conflict

* phpcs fixes after merge

* Namespace usage ordering

* Please let this be the last phpcs fix needed

Co-authored-by: Adrien Crivelli <adrien.crivelli@gmail.com>
---
 CHANGELOG.md                                  |  26 +-
 docs/topics/defined-names.md                  | 593 ++++++++++++++++++
 docs/topics/recipes.md                        |  63 +-
 samples/DefinedNames/AbsoluteNamedRange.php   |  63 ++
 .../CrossWorksheetNamedFormula.php            |  99 +++
 .../DefinedNames/NamedFormulaeAndRanges.php   |  74 +++
 samples/DefinedNames/RelativeNamedRange.php   |  66 ++
 samples/DefinedNames/RelativeNamedRange2.php  |  69 ++
 .../RelativeNamedRangeAsFunction.php          |  72 +++
 samples/DefinedNames/ScopedNamedRange.php     |  81 +++
 samples/DefinedNames/ScopedNamedRange2.php    |  98 +++
 samples/DefinedNames/SimpleNamedFormula.php   |  52 ++
 samples/DefinedNames/SimpleNamedRange.php     |  46 ++
 .../Calculation/Calculation.php               | 151 +++--
 .../Calculation/Engine/Logger.php             |  14 +
 src/PhpSpreadsheet/Calculation/Functions.php  |   2 +-
 src/PhpSpreadsheet/Calculation/LookupRef.php  |   2 +-
 src/PhpSpreadsheet/Cell/AddressHelper.php     |  48 +-
 src/PhpSpreadsheet/Cell/Cell.php              |   2 +
 src/PhpSpreadsheet/DefinedName.php            | 263 ++++++++
 src/PhpSpreadsheet/NamedFormula.php           |  45 ++
 src/PhpSpreadsheet/NamedRange.php             | 230 +------
 src/PhpSpreadsheet/Reader/Gnumeric.php        |  21 +-
 src/PhpSpreadsheet/Reader/Ods.php             | 127 +++-
 src/PhpSpreadsheet/Reader/Xlsx.php            |  36 +-
 src/PhpSpreadsheet/Reader/Xml.php             |  84 +--
 src/PhpSpreadsheet/ReferenceHelper.php        | 146 ++++-
 src/PhpSpreadsheet/Spreadsheet.php            | 208 +++++-
 src/PhpSpreadsheet/Worksheet/BaseDrawing.php  |   2 +-
 src/PhpSpreadsheet/Worksheet/Worksheet.php    |  24 +-
 src/PhpSpreadsheet/Writer/Ods/Content.php     |  19 +-
 src/PhpSpreadsheet/Writer/Ods/Formula.php     | 119 ++++
 .../Writer/Ods/NamedExpressions.php           | 126 ++++
 src/PhpSpreadsheet/Writer/Xls.php             |   2 +-
 src/PhpSpreadsheet/Writer/Xls/Parser.php      |  49 +-
 src/PhpSpreadsheet/Writer/Xls/Workbook.php    |  77 ++-
 src/PhpSpreadsheet/Writer/Xls/Worksheet.php   |   1 -
 .../Writer/Xlsx/DefinedNames.php              | 223 +++++++
 src/PhpSpreadsheet/Writer/Xlsx/Workbook.php   | 185 +-----
 .../DefinedNamesCalculationTest.php           |  98 +++
 .../Calculation/Engine/RangeTest.php          |  64 +-
 .../Calculation/FormulaAsStringTest.php       |   4 +-
 .../DefinedNameFormulaTest.php                | 167 +++++
 tests/PhpSpreadsheetTests/DefinedNameTest.php | 124 ++++
 .../PhpSpreadsheetTests/NamedFormulaTest.php  | 126 ++++
 tests/PhpSpreadsheetTests/NamedRangeTest.php  | 126 ++++
 .../ReferenceHelperTest.php                   |  17 +
 .../Writer/Xls/FormulaErrTest.php             |   2 +-
 .../Writer/Xls/WorkbookTest.php               |   2 +-
 .../DefinedNames/NamedFormulae.xlsx           | Bin 0 -> 9216 bytes
 .../Calculation/DefinedNames/NamedRanges.xlsx | Bin 0 -> 9221 bytes
 ...renceHelperFormulaUpdatesMultipleSheet.php |  88 +++
 tests/data/Writer/Ods/content-with-data.xml   |   2 +-
 53 files changed, 3771 insertions(+), 657 deletions(-)
 create mode 100644 docs/topics/defined-names.md
 create mode 100644 samples/DefinedNames/AbsoluteNamedRange.php
 create mode 100644 samples/DefinedNames/CrossWorksheetNamedFormula.php
 create mode 100644 samples/DefinedNames/NamedFormulaeAndRanges.php
 create mode 100644 samples/DefinedNames/RelativeNamedRange.php
 create mode 100644 samples/DefinedNames/RelativeNamedRange2.php
 create mode 100644 samples/DefinedNames/RelativeNamedRangeAsFunction.php
 create mode 100644 samples/DefinedNames/ScopedNamedRange.php
 create mode 100644 samples/DefinedNames/ScopedNamedRange2.php
 create mode 100644 samples/DefinedNames/SimpleNamedFormula.php
 create mode 100644 samples/DefinedNames/SimpleNamedRange.php
 create mode 100644 src/PhpSpreadsheet/DefinedName.php
 create mode 100644 src/PhpSpreadsheet/NamedFormula.php
 create mode 100644 src/PhpSpreadsheet/Writer/Ods/Formula.php
 create mode 100644 src/PhpSpreadsheet/Writer/Ods/NamedExpressions.php
 create mode 100644 src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/DefinedNamesCalculationTest.php
 create mode 100644 tests/PhpSpreadsheetTests/DefinedNameFormulaTest.php
 create mode 100644 tests/PhpSpreadsheetTests/DefinedNameTest.php
 create mode 100644 tests/PhpSpreadsheetTests/NamedFormulaTest.php
 create mode 100644 tests/PhpSpreadsheetTests/NamedRangeTest.php
 create mode 100644 tests/data/Calculation/DefinedNames/NamedFormulae.xlsx
 create mode 100644 tests/data/Calculation/DefinedNames/NamedRanges.xlsx
 create mode 100644 tests/data/ReferenceHelperFormulaUpdatesMultipleSheet.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d96323dd..9dfe3dfe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,14 +11,36 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 - Implemented Page Order for Xlsx and Xls Readers, and provided Page Settings (Orientation, Scale, Horizontal/Vertical Centering, Page Order, Margins) support for Ods, Gnumeric and Xls Readers [#1559](https://github.com/PHPOffice/PhpSpreadsheet/pull/1559)
 - Implementation of the Excel `LOGNORM.DIST()`, `NORM.S.DIST()`, `GAMMA()` and `GAUSS()` functions. [#1588](https://github.com/PHPOffice/PhpSpreadsheet/pull/1588)
+- Named formula implementation, and improved handling of Defined Names generally [#1535](https://github.com/PHPOffice/PhpSpreadsheet/pull/1535)
+  - Defined Names are now case-insensitive
+  - Distinction between named ranges and named formulae
+  - Correct handling of union and intersection operators in named ranges
+  - Correct evaluation of named range operators in calculations
+  - fix resolution of relative named range values in the calculation engine; previously all named range values had been treated as absolute.
+  - Calculation support for named formulae
+  - Support for nested ranges and formulae (named ranges and formulae that reference other named ranges/formulae) in calculations
+  - Introduction of a helper to convert address formats between R1C1 and A1 (and the reverse)
+  - Proper support for both named ranges and named formulae in all appropriate Readers
+    - **Xlsx** (Previously only simple named ranges were supported)
+    - **Xls** (Previously only simple named ranges were supported)
+    - **Gnumeric** (Previously neither named ranges nor formulae were supported)
+    - **Ods** (Previously neither named ranges nor formulae were supported)
+    - **Xml** (Previously neither named ranges nor formulae were supported)
+  - Proper support for named ranges and named formulae in all appropriate Writers
+    - **Xlsx** (Previously only simple named ranges were supported)
+    - **Xls** (Previously neither named ranges nor formulae were supported) - Still not supported, but some parser issues resolved that previously failed to differentiate between a defined name and a function name
+    - **Ods** (Previously neither named ranges nor formulae were supported)
 
 ### Changed
 
 - Improve Coverage for ODS Reader [#1545](https://github.com/phpoffice/phpspreadsheet/pull/1544)
+- Named formula implementation, and improved handling of Defined Names generally [#1535](https://github.com/PHPOffice/PhpSpreadsheet/pull/1535)
+  - fix resolution of relative named range values in the calculation engine; previously all named range values had been treated as absolute.
 
 ### Deprecated
 
-- Nothing.
+-   **IMPORTANT NOTE:** This Introduces a **BC break** in the handling of named ranges. Previously, a named range cell reference of `B2` would be treated identically to a named range cell reference of `$B2` or `B$2` or `$B$2` because the calculation engine treated then all as absolute references. These changes "fix" that, so the calculation engine now handles relative references in named ranges correctly.
+  This change that resolves previously incorrect behaviour in the calculation may affect users who have dynamically defined named ranges using relative references when they should have used absolute references.
 
 ### Removed
 
@@ -41,8 +63,6 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Changed
 
-- nothing
-
 ## 1.14.0 - 2020-06-29
 
 ### Added
diff --git a/docs/topics/defined-names.md b/docs/topics/defined-names.md
new file mode 100644
index 00000000..2dd4fe68
--- /dev/null
+++ b/docs/topics/defined-names.md
@@ -0,0 +1,593 @@
+# Defined Names
+
+There are two types of Defined Names in MS Excel and other Spreadsheet formats: Named Ranges and Named Formulae. Between them, they can add a lot of power to your Spreadsheets, but they need to be used correctly.
+
+Working examples for all the code shown in this document can be found in the `/samples/DefinedNames` folder.
+
+## Named Ranges
+
+A Named Range provides a name reference to a cell or a range of cells. You can then reference that cell or cells by that name within a formula.
+
+As an example, I'll create a simple Calculator that adds Tax to a Price.
+
+```php
+// Set up some basic data
+$worksheet
+    ->setCellValue('A1', 'Tax Rate:')
+    ->setCellValue('B1', '=19%')
+    ->setCellValue('A3', 'Net Price:')
+    ->setCellValue('B3', 12.99)
+    ->setCellValue('A4', 'Tax:')
+    ->setCellValue('A5', 'Price including Tax:');
+
+// Define named ranges
+$spreadsheet->addNamedRange( new \PhpOffice\PhpSpreadsheet\NamedRange('TAX_RATE', $worksheet, '=$B$1') );
+$spreadsheet->addNamedRange( new \PhpOffice\PhpSpreadsheet\NamedRange('PRICE', $worksheet, '=$B$3') );
+
+// Reference that defined name in a formula
+$worksheet
+    ->setCellValue('B4', '=PRICE*TAX_RATE')
+    ->setCellValue('B5', '=PRICE*(1+TAX_RATE)');
+
+echo sprintf(
+    'With a Tax Rate of %.2f and a net price of %.2f, Tax is %.2f and the gross price is %.2f',
+    $worksheet->getCell('B1')->getCalculatedValue(),
+    $worksheet->getCell('B3')->getValue(),
+    $worksheet->getCell('B4')->getCalculatedValue(),
+    $worksheet->getCell('B5')->getCalculatedValue()
+), PHP_EOL;
+```
+`/samples/DefinedNames/SimpleNamedRange.php`
+
+This makes formulae in the generated spreadsheet easier to understand when viewing it them MS Excel. Using these Named Ranges (providing meaningful human-readable names for cells) makes the purpose of the formula immediately clear. We don't need to look for cell `B2` to see what it is, the name tells us.
+
+And, if the Tax Rate changes to 16%, then we only need to change the value in cell `B1` to the new Tax rate (`=16%`), or if we want to calculate the Tax Charges for a different net price, that will immediately be reflected in all the calculations that reference those Named Ranges. No matter whereabouts in the worksheet I used that Named Range, it always references the value in cell `B1`.
+
+In fact, because we were required to specify a worksheet when we defined the name, that name is available from any worksheet within the spreadsheet, and always means cell `B2` in this worksheet (but see the notes on Named Range Scope below).
+
+### Absolute Named Ranges
+
+In the above example, when I define the Named Range values (e.g. `'=$B$1'`), I used a `$` before both the row and the column. This made the Named Range an Absolute Reference.
+
+Another example:
+```php
+// Set up some basic data for a timesheet
+$worksheet
+    ->setCellValue('A1', 'Charge Rate/hour:')
+    ->setCellValue('B1', '7.50')
+    ->setCellValue('A3', 'Date')
+    ->setCellValue('B3', 'Hours')
+    ->setCellValue('C3', 'Charge');
+
+// Define named range using an absolute cell reference
+$spreadsheet->addNamedRange( new NamedRange('CHARGE_RATE', $worksheet, '=$B$1') );
+
+$workHours = [
+    '2020-0-06' => 7.5,
+    '2020-0-07' => 7.25,
+    '2020-0-08' => 6.5,
+    '2020-0-09' => 7.0,
+    '2020-0-10' => 5.5,
+];
+
+// Populate the Timesheet
+$startRow = 4;
+$row = $startRow;
+foreach ($workHours as $date => $hours) {
+    $worksheet
+        ->setCellValue("A{$row}", $date)
+        ->setCellValue("B{$row}", $hours)
+        ->setCellValue("C{$row}", "=B{$row}*CHARGE_RATE");
+    $row++;
+}
+$endRow = $row - 1;
+
+++$row;
+$worksheet
+    ->setCellValue("B{$row}", "=SUM(B{$startRow}:B{$endRow})")
+    ->setCellValue("C{$row}", "=SUM(C{$startRow}:C{$endRow})");
+
+
+echo sprintf(
+    'Worked %.2f hours at a rate of %.2f - Charge to the client is %.2f',
+    $worksheet->getCell("B{$row}")->getCalculatedValue(),
+    $worksheet->getCell('B1')->getValue(),
+    $worksheet->getCell("C{$row}")->getCalculatedValue()
+), PHP_EOL;
+```
+`/samples/DefinedNames/AbsoluteNamedRange.php`
+
+Because the Named Range `CHARGE_RATE` is defined as an Absolute cell reference, then it always references cell `B2` no matter where it is referenced in a formula in the spreadsheet.
+
+### Relative Named Ranges
+
+The previous example showed a simple timesheet using an Absolute Reference for the Charge Rate, used to calculate our billed charges to client.
+
+The use of `B{$row}` in our formula (at least it will appear as an actual cell reference in MS Excel if we save the file and open it) requires a bit of mental agility to remember that column `B` is our hours for that day. Why can't we use another Named Range called something like `HOURS_PER_DAY` to make the formula more easily readable and meaningful.
+
+But if we used an Absolute Named Range for `HOURS_PER_DAY`, then we'd need a different Named Range for each day (`MONDAY_HOURS_PER_DAY`, `TUESDAY_HOURS_PER_DAY`, etc), and a different formula for each day of the week; if we kept a monthly timesheet, we would have to defined a different Named Range for every day of the month... and that's a lot more trouble than it's worth, and quickly becomes unmanageable.
+
+This is where Relative Named Ranges are very useful.
+
+```php
+// Set up some basic data for a timesheet
+$worksheet
+    ->setCellValue('A1', 'Charge Rate/hour:')
+    ->setCellValue('B1', '7.50')
+    ->setCellValue('A3', 'Date')
+    ->setCellValue('B3', 'Hours')
+    ->setCellValue('C3', 'Charge');
+
+// Define named ranges
+// CHARGE_RATE is an absolute cell reference that always points to cell B1
+$spreadsheet->addNamedRange( new NamedRange('CHARGE_RATE', $worksheet, '=$B$1') );
+// HOURS_PER_DAY is a relative cell reference that always points to column B, but to a cell in the row where it is used 
+$spreadsheet->addNamedRange( new NamedRange('HOURS_PER_DAY', $worksheet, '=$B1') );
+
+$workHours = [
+    '2020-0-06' => 7.5,
+    '2020-0-07' => 7.25,
+    '2020-0-08' => 6.5,
+    '2020-0-09' => 7.0,
+    '2020-0-10' => 5.5,
+];
+
+// Populate the Timesheet
+$startRow = 4;
+$row = $startRow;
+foreach ($workHours as $date => $hours) {
+    $worksheet
+        ->setCellValue("A{$row}", $date)
+        ->setCellValue("B{$row}", $hours)
+        ->setCellValue("C{$row}", "=HOURS_PER_DAY*CHARGE_RATE");
+    $row++;
+}
+$endRow = $row - 1;
+
+++$row;
+$worksheet
+    ->setCellValue("B{$row}", "=SUM(B{$startRow}:B{$endRow})")
+    ->setCellValue("C{$row}", "=SUM(C{$startRow}:C{$endRow})");
+
+
+echo sprintf(
+    'Worked %.2f hours at a rate of %.2f - Charge to the client is %.2f',
+    $worksheet->getCell("B{$row}")->getCalculatedValue(),
+    $worksheet->getCell('B1')->getValue(),
+    $worksheet->getCell("C{$row}")->getCalculatedValue()
+), PHP_EOL;
+```
+`/samples/DefinedNames/RelativeNamedRange.php`
+
+The difference in the cell definition for `HOURS_PER_DAY` (`'=$B1'`) is that we have a `$` in front of the column `B`, but not in front of the row number. The `$` makes the column absolute: no matter where in the worksheet we use this name, it always references column `B`. Without a `$`in front of the row number, we make the row number relative, relative to the row where the name appears in a formula, so it effectively replaces the `1` with its own row number when it executes the calculation.
+
+When it is used in the formula in row 4, then it references cell `B4`, when it appears in row 5, it references cell `B5`, and so on. Using a Relative Named Range, we can use the same Named Range to refer to cells in different rows (and/or different columns), so we can re-use the same Named Range to refer to different cells relative to the row (or column) where we use them.
+
+---
+
+Named Ranges aren't limited to a single cell, but can point to a range of cells. A common use case might be to provide a series of column totals at the bottom of a dataset. Let's take our timesheet, and modify it just slightly to use a Relative column range for that purpose.
+
+I won't replicate the entire code from the previous example, because I'm only changing a few lines; but we just replace the block:
+```php
+++$row;
+$worksheet
+    ->setCellValue("B{$row}", "=SUM(B{$startRow}:B{$endRow})")
+    ->setCellValue("C{$row}", "=SUM(C{$startRow}:C{$endRow})");
+```
+with:
+```php
+// COLUMN_TOTAL is another relative cell reference that always points to the same range of rows but to cell in the column where it is used
+$spreadsheet->addNamedRange( new NamedRange('COLUMN_DATA_VALUES', $worksheet, "=A\${$startRow}:A\${$endRow}") );
+
+++$row;
+$worksheet
+    ->setCellValue("B{$row}", "=SUM(COLUMN_DATA_VALUES)")
+    ->setCellValue("C{$row}", "=SUM(COLUMN_DATA_VALUES)");
+```
+`/samples/DefinedNames/RelativeNamedRange2.php`
+
+Now that I've specified column as relative in the definition of `COLUMN_DATA_VALUES` with an address of column `A`, and the rows are absolute. When the same Relative Named Range is used in column `B`,it references cells in column `B` rather than `A`; and when it is used in column `C`, it references cells in column `C`.
+
+While we still have a piece of code (`"=A\${$startRow}:A\${$endRow}"`) that isn't easily human-readable, when we open the generated spreadsheet in MS Excel, the displayed formula in for the cells for the totals is immediately understandable.
+
+### Named Range Scope
+
+Whenever we define a Named Range, we are required to specify a worksheet, and that name is then available from any worksheet within the spreadsheet, and always means that cell or cell range in the specified worksheet.
+
+```php
+// Set up some basic data for a timesheet
+$worksheet
+    ->setCellValue('A1', 'Charge Rate/hour:')
+    ->setCellValue('B1', '7.50');
+
+// Define a global named range on the first worksheet for our Charge Rate
+// CHARGE_RATE is an absolute cell reference that always points to cell B1
+// Because it is defined globally, it will still be usable from any worksheet in the spreadsheet
+$spreadsheet->addNamedRange( new NamedRange('CHARGE_RATE', $worksheet, '=$B$1') );
+
+// Create a second worksheet as our client timesheet
+$worksheet = $spreadsheet->addSheet(new \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet($spreadsheet, 'Client Timesheet'));
+
+// Define named ranges
+// HOURS_PER_DAY is a relative cell reference that always points to column B, but to a cell in the row where it is used
+$spreadsheet->addNamedRange( new NamedRange('HOURS_PER_DAY', $worksheet, '=$B1') );
+
+// Set up some basic data for a timesheet
+$worksheet
+    ->setCellValue('A1', 'Date')
+    ->setCellValue('B1', 'Hours')
+    ->setCellValue('C1', 'Charge');
+
+$workHours = [
+    '2020-0-06' => 7.5,
+    '2020-0-07' => 7.25,
+    '2020-0-08' => 6.5,
+    '2020-0-09' => 7.0,
+    '2020-0-10' => 5.5,
+];
+
+// Populate the Timesheet
+$startRow = 2;
+$row = $startRow;
+foreach ($workHours as $date => $hours) {
+    $worksheet
+        ->setCellValue("A{$row}", $date)
+        ->setCellValue("B{$row}", $hours)
+        ->setCellValue("C{$row}", "=HOURS_PER_DAY*CHARGE_RATE");
+    $row++;
+}
+$endRow = $row - 1;
+
+// COLUMN_TOTAL is another relative cell reference that always points to the same range of rows but to cell in the column where it is used
+$spreadsheet->addNamedRange( new NamedRange('COLUMN_DATA_VALUES', $worksheet, "=A\${$startRow}:A\${$endRow}") );
+
+++$row;
+$worksheet
+    ->setCellValue("B{$row}", "=SUM(COLUMN_DATA_VALUES)")
+    ->setCellValue("C{$row}", "=SUM(COLUMN_DATA_VALUES)");
+
+echo sprintf(
+    'Worked %.2f hours at a rate of %s - Charge to the client is %.2f',
+    $worksheet->getCell("B{$row}")->getCalculatedValue(),
+    $chargeRateCellValue = $spreadsheet
+        ->getSheetByName($spreadsheet->getNamedRange('CHARGE_RATE')->getWorksheet()->getTitle())
+        ->getCell($spreadsheet->getNamedRange('CHARGE_RATE')->getCellsInRange()[0])->getValue(),
+    $worksheet->getCell("C{$row}")->getCalculatedValue()
+), PHP_EOL;
+```
+`/samples/DefinedNames/ScopedNamedRange.php`
+
+Even though `CHARGE_RATE` references a cell on a different worksheet, because is set as global (the default) it is accessible from any worksheet in the spreadsheet. so when we reference it in formulae on the second timesheet worksheet, we are able to access the value from that first worksheet and use it in our calculations.
+
+---
+
+However, a Named Range can be locally scoped so that it is only available when referenced from a specific worksheet, or it can be globally scoped. This means that you can use the same Named Range name with different values on different worksheets.
+
+Building further on our timesheet, perhaps we use a different worksheet for each client, and we use the same hourly rate when billing most of our clients; but for one particular client (perhaps doing work for a a friend) we use a lower rate.
+
+```php
+$clients = [
+    'Client #1 - Full Hourly Rate' => [
+        '2020-0-06' => 2.5,
+        '2020-0-07' => 2.25,
+        '2020-0-08' => 6.0,
+        '2020-0-09' => 3.0,
+        '2020-0-10' => 2.25,
+    ],
+    'Client #2 - Full Hourly Rate' => [
+        '2020-0-06' => 1.5,
+        '2020-0-07' => 2.75,
+        '2020-0-08' => 0.0,
+        '2020-0-09' => 4.5,
+        '2020-0-10' => 3.5,
+    ],
+    'Client #3 - Reduced Hourly Rate' => [
+        '2020-0-06' => 3.5,
+        '2020-0-07' => 2.5,
+        '2020-0-08' => 1.5,
+        '2020-0-09' => 0.0,
+        '2020-0-10' => 1.25,
+    ],
+];
+
+foreach ($clients as $clientName => $workHours) {
+    $worksheet = $spreadsheet->addSheet(new \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet($spreadsheet, $clientName));
+
+    // Set up some basic data for a timesheet
+    $worksheet
+        ->setCellValue('A1', 'Charge Rate/hour:')
+        ->setCellValue('B1', '7.50')
+        ->setCellValue('A3', 'Date')
+        ->setCellValue('B3', 'Hours')
+        ->setCellValue('C3', 'Charge');
+    ;
+
+    // Define named ranges
+    // CHARGE_RATE is an absolute cell reference that always points to cell B1
+    $spreadsheet->addNamedRange( new NamedRange('CHARGE_RATE', $worksheet, '=$B$1', true) );
+    // HOURS_PER_DAY is a relative cell reference that always points to column B, but to a cell in the row where it is used
+    $spreadsheet->addNamedRange( new NamedRange('HOURS_PER_DAY', $worksheet, '=$B1', true) );
+
+    // Populate the Timesheet
+    $startRow = 4;
+    $row = $startRow;
+    foreach ($workHours as $date => $hours) {
+        $worksheet
+            ->setCellValue("A{$row}", $date)
+            ->setCellValue("B{$row}", $hours)
+            ->setCellValue("C{$row}", "=HOURS_PER_DAY*CHARGE_RATE");
+        $row++;
+    }
+    $endRow = $row - 1;
+
+    // COLUMN_TOTAL is another relative cell reference that always points to the same range of rows but to cell in the column where it is used
+    $spreadsheet->addNamedRange( new NamedRange('COLUMN_TOTAL', $worksheet, "=A\${$startRow}:A\${$endRow}", true) );
+
+    ++$row;
+    $worksheet
+        ->setCellValue("B{$row}", "=SUM(COLUMN_TOTAL)")
+        ->setCellValue("C{$row}", "=SUM(COLUMN_TOTAL)");
+}
+$spreadsheet->removeSheetByIndex(0);
+
+// Set the reduced charge rate for our special client
+$worksheet
+    ->setCellValue("B1", 4.5);
+
+foreach ($spreadsheet->getAllSheets() as $worksheet) {
+    echo sprintf(
+        'Worked %.2f hours for "%s" at a rate of %.2f - Charge to the client is %.2f',
+        $worksheet->getCell("B{$row}")->getCalculatedValue(),
+        $worksheet->getTitle(),
+        $worksheet->getCell('B1')->getValue(),
+        $worksheet->getCell("C{$row}")->getCalculatedValue()
+    ), PHP_EOL;
+}
+```
+`/samples/DefinedNames/ScopedNamedRange2.php`
+
+Now we are creating three worksheets for each of three different clients. Because each Named Range is linked to a worksheet, we need to create three sets of Named Ranges, so that we don't simply reference the cells on only one of the worksheets; but because we are locally scoping them (note the extra boolean argument used when we define the Named Ranges) we can use the same names on each worksheet, and they will reference the correct cells when we use them in our formulae on that worksheet.
+
+When Named Ranges are being evaluated, the logic looks first to see if there is a locally scoped Named Range defined for the current worksheet. If there is, then that is the Named Range that will be used in the calculation. If no locally scoped Named Range with that name is found, the logic then looks to see if there is a globally scoped Named Range definition, and will use that if it is found. If no Named Range of the required name is found scoped to the current worksheet, or globally scoped, then a `#NAME` error will be returned.
+
+## Named Formulae
+
+A Named Formula is a stored formula, or part of a formula, that can be referenced in cells by name, and re-used in many different places within the spreadsheet.
+
+As an example, I'll modify the simple Tax Calculator that I created as my example for Named Ranges.
+
+```php
+// Add some Named Formulae
+// The first to store our tax rate
+$spreadsheet->addNamedFormula(new NamedFormula('TAX_RATE', $worksheet, '=19%'));
+// The second to calculate the Tax on a Price value (Note that `PRICE` is defined later as a Named Range)
+$spreadsheet->addNamedFormula(new NamedFormula('TAX', $worksheet, '=PRICE*TAX_RATE'));
+
+// Set up some basic data
+$worksheet
+    ->setCellValue('A1', 'Tax Rate:')
+    ->setCellValue('B1', '=TAX_RATE')
+    ->setCellValue('A3', 'Net Price:')
+    ->setCellValue('B3', 19.99)
+    ->setCellValue('A4', 'Tax:')
+    ->setCellValue('A5', 'Price including Tax:');
+
+// Define a named range that we can use in our formulae
+$spreadsheet->addNamedRange(new NamedRange('PRICE', $worksheet, '=$B$3'));
+
+// Reference the defined formulae in worksheet formulae
+$worksheet
+    ->setCellValue('B4', '=TAX')
+    ->setCellValue('B5', '=PRICE+TAX');
+
+echo sprintf(
+    'With a Tax Rate of %.2f and a net price of %.2f, Tax is %.2f and the gross price is %.2f',
+    $worksheet->getCell('B1')->getCalculatedValue(),
+    $worksheet->getCell('B3')->getValue(),
+    $worksheet->getCell('B4')->getCalculatedValue(),
+    $worksheet->getCell('B5')->getCalculatedValue()
+), PHP_EOL;
+```
+`/samples/DefinedNames/SimpleNamedFormula.php`
+
+There are a few points to note here:
+
+Firstly. we are actually storing the tax rate in a named formula (`TAX_RATE`) rather than as a cell value. When we display the tax rate in cell `B1`, we are really storing an instruction for MS Excel to evaluate the formula and display the result in that cell.
+
+Then we are using a Named Formula `TAX` that references both another Named Formula (`TAX_RATE`) and a Named Range (`PRICE`) and executes a calculation using them both (`PRICE * TAX_RATE`).
+
+Finally, we are using the formula `TAX` in two different contexts. Once to display the tax value (in cell `B4`); and a second time as part of another formula (`PRICE + TAX`) in cell `B5`.
+
+---
+
+Named Formulae aren't just restricted tosimple mathematics, but can include MS EXcel functions as well to provide a lot of flexibility; and they can reference values on other worksheets.
+
+```php
+$worksheet = $spreadsheet->setActiveSheetIndex(0);
+setYearlyData($worksheet,'2019', $data2019);
+$worksheet = $spreadsheet->addSheet(new Worksheet($spreadsheet));
+setYearlyData($worksheet,'2020', $data2020);
+$worksheet = $spreadsheet->addSheet(new Worksheet($spreadsheet));
+setYearlyData($worksheet,'2020', [], 'GROWTH');
+
+function setYearlyData(Worksheet $worksheet, string $year, $yearlyData, ?string $title = null) {
+    // Set up some basic data
+    $worksheetTitle = $title ?: $year;
+    $worksheet
+        ->setTitle($worksheetTitle)
+        ->setCellValue('A1', 'Month')
+        ->setCellValue('B1', $worksheetTitle  === 'GROWTH' ? 'Growth' : 'Sales')
+        ->setCellValue('C1', $worksheetTitle  === 'GROWTH' ? 'Profit Growth' : 'Margin')
+        ->setCellValue('A2', Date::stringToExcel("{$year}-01-01"));
+    for ($row = 3; $row <= 13; ++$row) {
+        $worksheet->setCellValue("A{$row}", "=NEXT_MONTH");
+    }
+
+    if (!empty($yearlyData)) {
+        $worksheet->fromArray($yearlyData, null, 'B2');
+    } else {
+        for ($row = 2; $row <= 13; ++$row) {
+            $worksheet->setCellValue("B{$row}", "=GROWTH");
+            $worksheet->setCellValue("C{$row}", "=PROFIT_GROWTH");
+        }
+    }
+
+    $worksheet->getStyle('A1:C1')
+        ->getFont()->setBold(true);
+    $worksheet->getStyle('A2:A13')
+        ->getNumberFormat()
+        ->setFormatCode('mmmm');
+    $worksheet->getStyle('B2:C13')
+        ->getNumberFormat()
+        ->setFormatCode($worksheetTitle  === 'GROWTH' ? '0.00%' : '_-€* #,##0_-');
+}
+
+// Add some Named Formulae
+// The first to store our tax rate
+$spreadsheet->addNamedFormula(new NamedFormula('NEXT_MONTH', $worksheet, "=EDATE(OFFSET(\$A1,-1,0),1)"));
+$spreadsheet->addNamedFormula(new NamedFormula('GROWTH', $worksheet, "=IF('2020'!\$B1=\"\",\"-\",(('2020'!\$B1/'2019'!\$B1)-1))"));
+$spreadsheet->addNamedFormula(new NamedFormula('PROFIT_GROWTH', $worksheet, "=IF('2020'!\$C1=\"\",\"-\",(('2020'!\$C1/'2019'!\$C1)-1))"));
+
+for ($row = 2; $row<=7; ++$row) {
+    $month = $worksheet->getCell("A{$row}")->getFormattedValue();
+    $growth = $worksheet->getCell("B{$row}")->getFormattedValue();
+    $profitGrowth = $worksheet->getCell("C{$row}")->getFormattedValue();
+
+    echo "Growth for {$month} is {$growth}, with a Profit Growth of {$profitGrowth}", PHP_EOL;
+}
+```
+`/samples/DefinedNames/CrossWorksheetNamedFormula.php`
+
+Here we're creating two Named Formulae that both use the `IF()` function, and that compare values on two different worksheets, and calculate the percentage difference between the two. We're also creating a Named Formula that uses the `OFFSET()` function to reference the cell immediately above the current Relative cell reference.
+
+## Combining Named Ranges and Formulae
+
+For a slightly more complex example combining Named Ranges and Named Formulae, we can build on our client timesheet.
+
+```php
+// Set up some basic data for a timesheet
+$worksheet
+    ->setCellValue('A1', 'Charge Rate/hour:')
+    ->setCellValue('B1', '7.50')
+    ->setCellValue('A3', 'Date')
+    ->setCellValue('B3', 'Hours')
+    ->setCellValue('C3', 'Charge');
+
+// Define named ranges
+// CHARGE_RATE is an absolute cell reference that always points to cell B1
+$spreadsheet->addNamedRange(new NamedRange('CHARGE_RATE', $worksheet, '=$B$1'));
+// HOURS_PER_DAY is a relative cell reference that always points to column B, but to a cell in the row where it is used
+$spreadsheet->addNamedRange(new NamedRange('HOURS_PER_DAY', $worksheet, '=$B1'));
+// Set up the formula for calculating the daily charge
+$spreadsheet->addNamedFormula(new NamedFormula('DAILY_CHARGE', null, '=HOURS_PER_DAY*CHARGE_RATE'));
+// Set up the formula for calculating the column totals
+$spreadsheet->addNamedFormula(new NamedFormula('COLUMN_TOTALS', null, '=SUM(COLUMN_DATA_VALUES)'));
+
+
+$workHours = [
+    '2020-0-06' => 7.5,
+    '2020-0-07' => 7.25,
+    '2020-0-08' => 6.5,
+    '2020-0-09' => 7.0,
+    '2020-0-10' => 5.5,
+];
+
+// Populate the Timesheet
+$startRow = 4;
+$row = $startRow;
+foreach ($workHours as $date => $hours) {
+    $worksheet
+        ->setCellValue("A{$row}", $date)
+        ->setCellValue("B{$row}", $hours)
+        ->setCellValue("C{$row}", '=DAILY_CHARGE');
+    ++$row;
+}
+$endRow = $row - 1;
+
+// COLUMN_TOTAL is another relative cell reference that always points to the same range of rows but to cell in the column where it is used
+$spreadsheet->addNamedRange(new NamedRange('COLUMN_DATA_VALUES', $worksheet, "=A\${$startRow}:A\${$endRow}"));
+
+++$row;
+$worksheet
+    ->setCellValue("B{$row}", '=COLUMN_TOTALS')
+    ->setCellValue("C{$row}", '=COLUMN_TOTALS');
+
+echo sprintf(
+    'Worked %.2f hours at a rate of %.2f - Charge to the client is %.2f',
+    $worksheet->getCell("B{$row}")->getCalculatedValue(),
+    $worksheet->getCell('B1')->getValue(),
+    $worksheet->getCell("C{$row}")->getCalculatedValue()
+), PHP_EOL;
+```
+`/samples/DefinedNames/NamedFormulaeAndRanges.php`
+
+The main point to notice in this example is that you must specify a Worksheet for Named Ranges, but that it isn't required for Named Formulae; in fact, specifying a Worksheet for named Formulae can lead to MS Excel errors when a saved file is opened. Generally, it is far safer to specify a null Worksheet value when creating a Named Formula, unless it references cell values explicitly, or you wish to scope it to that Worksheet.
+
+It also doesn't matter what order we define our Named Ranges and Formulae, even when some are dependent on others: this only matters when we try to use them in a cell calculation, or when we save the file; and as long as every Defined Name has been defined at that point, then it isn't important. In this case, we couldn't define `COLUMN_DATA_VALUES` until we new the range of rows that it needed to contain; but we could still define the `COLUMN_TOTALS` formula before that.
+
+## Additional Comments
+
+### Helper
+
+In all the examples so far, we have explicitly used the `NamedRange` and `NamedFormula` classes, and the Spreadsheet's `addNamedRange()` and `addNamedFormula()` methods, e.g.
+```php
+$spreadsheet->addNamedRange(new NamedRange('HOURS_PER_DAY', $worksheet, '=$B1'));
+```
+However, this can lead to errors if we accidentally set a formula value for a Named Range, or a range value for a Named Formula.
+
+As a helper, the DefinedName class provides a static method that can identify whether the value expression is a Range or a Formula, and instantiate the appropriate class.
+```php
+$this->spreadsheet->addDefinedName(
+    DefinedName::createInstance('FOO', $this->spreadsheet->getSheetByName('Sheet #2'), '=16%', true)
+);
+```
+
+### Naming Names
+
+The names that you assign to Defined Name must follow the following set of rules:
+ - The first character of a name must be one of the following characters:
+   - letter (including UTF-8 letters)
+   - underscore (`_`)
+ - Remaining characters in the name can be
+   - letters (including UTF-8 letters)
+   - numbers (including UTF-8 numbers)
+   - periods (`.`)
+   - underscore characters (`_`)
+ - The following are not allowed:
+   - Space characters are not allowed as part of a name.
+   - Names can't look like cell addresses, such as A35 or R2C2
+ - Names are not case sensitive. For example, `North` and `NORTH` are treated as the same name.
+
+### Limitations
+
+PHPSpreadsheet doesn't yet fully validate the names that you use, so it is possible to create a spreadsheet in PHPSpreadsheet that will break when you save and try to open it in MS Excel; or that will break PHPSpreadsheet when they are referenced in a cell.
+So please be sensible when creating names, and follow the rules listed above.
+
+---
+
+There is nothing to stop you creating a Defined Name that matches an existing Function name
+```php
+$spreadsheet->addNamedFormula(new NamedFormula('SUM', $worksheet, '=SUM(A1:E5)'));
+```
+And this will work without problems in MS Excel. However, it is not guaranteed to work correctly in PHPSpreadsheet; and will certainly cause confusion for anybody reading it; so it is not recommended. Names exist to give clarity to the person reading the spreadsheet, and a cell containing `=SUM` is even harder to understand (what is it the sum of?) than a cell containing `=SUM(B4:B8)`. Use names that provide meaning, like `SUM_OF_WORKED_HOURS`.
+
+---
+
+You cannot have a Named Range and a Named Formula with the same name, unless they are differently scoped.
+
+---
+
+MS Excel uses some "special tricks" to simulate Relative Named Ranges where the row or column comes before the current row or column, useful if you want to get column totals that don't include the current cell. These "tricks" aren't supported by PHPSpreadsheet, but can be simulated using the `OFFSET()` function in a Named Formula.
+In our `RelativeNamedRange2.php` example, we explicitly created the `COLUMN_DATA_VALUES` Named Range using only the rows that we knew should be included, so that we weren't including the current row (where we were displaying the total) and creating a cyclic reference:
+```php
+// COLUMN_TOTAL is another relative cell reference that always points to the same range of rows but to cell in the column where it is used
+$spreadsheet->addNamedRange(new NamedRange('COLUMN_DATA_VALUES', $worksheet, "=A\${$startRow}:A\${$endRow}"));
+```
+We could instead have created a Named Function using `OFFSET()` to specify just the start row, and offset the end row by -1 row:
+```php
+// COLUMN_TOTAL is another relative cell reference that always points to the same range of rows but to cell in the column where it is used
+// To avoid including the current row,or having to hard-code the range itself (as we did in the previous example)
+//    we wrap it in a named formula using the OFFSET() function
+$spreadsheet->addNamedFormula(new NamedFormula('COLUMN_DATA_VALUES', $worksheet, "=OFFSET(A\$4:A1, -1, 0)"));
+```
+as demonstrated in example `RelativeNamedRangeAsFunction.php`.
diff --git a/docs/topics/recipes.md b/docs/topics/recipes.md
index f85576a2..86448301 100644
--- a/docs/topics/recipes.md
+++ b/docs/topics/recipes.md
@@ -1368,14 +1368,73 @@ $spreadsheet->getActiveSheet()->setCellValue('B1', 'Maarten');
 $spreadsheet->getActiveSheet()->setCellValue('B2', 'Balliauw');
 
 // Define named ranges
-$spreadsheet->addNamedRange( new \PhpOffice\PhpSpreadsheet\NamedRange('PersonFN', $spreadsheet->getActiveSheet(), 'B1') );
-$spreadsheet->addNamedRange( new \PhpOffice\PhpSpreadsheet\NamedRange('PersonLN', $spreadsheet->getActiveSheet(), 'B2') );
+$spreadsheet->addNamedRange( new \PhpOffice\PhpSpreadsheet\NamedRange('PersonFN', $spreadsheet->getActiveSheet(), '$B$1'));
+$spreadsheet->addNamedRange( new \PhpOffice\PhpSpreadsheet\NamedRange('PersonLN', $spreadsheet->getActiveSheet(), '$B$2'));
 ```
 
 Optionally, a fourth parameter can be passed defining the named range
 local (i.e. only usable on the current worksheet). Named ranges are
 global by default.
 
+## Define a named formula
+
+In addition to named ranges, PhpSpreadsheet also supports the definition of named formulae. These can be
+defined using the following code:
+
+```php
+// Add some data
+$spreadsheet->setActiveSheetIndex(0);
+$worksheet = $spreadsheet->getActiveSheet();
+$worksheet
+    ->setCellValue('A1', 'Product')
+    ->setCellValue('B1', 'Quantity')
+    ->setCellValue('C1', 'Unit Price')
+    ->setCellValue('D1', 'Price')
+    ->setCellValue('E1', 'VAT')
+    ->setCellValue('F1', 'Total');
+
+// Define named formula
+$spreadsheet->addNamedFormula( new \PhpOffice\PhpSpreadsheet\NamedFormula('GERMAN_VAT_RATE', $worksheet, '=16.0%'));
+$spreadsheet->addNamedFormula( new \PhpOffice\PhpSpreadsheet\NamedFormula('CALCULATED_PRICE', $worksheet, '=$B1*$C1'));
+$spreadsheet->addNamedFormula( new \PhpOffice\PhpSpreadsheet\NamedFormula('GERMAN_VAT', $worksheet, '=$D1*GERMAN_VAT_RATE'));
+$spreadsheet->addNamedFormula( new \PhpOffice\PhpSpreadsheet\NamedFormula('TOTAL_INCLUDING_VAT', $worksheet, '=$D1+$E1'));
+
+$worksheet
+    ->setCellValue('A2', 'Advanced Web Application Architecture')
+    ->setCellValue('B2', 2)
+    ->setCellValue('C2', 23.0)
+    ->setCellValue('D2', '=CALCULATED_PRICE')
+    ->setCellValue('E2', '=GERMAN_VAT')
+    ->setCellValue('F2', '=TOTAL_INCLUDING_VAT');
+$spreadsheet->getActiveSheet()
+    ->setCellValue('A3', 'Object Design Style Guide')
+    ->setCellValue('B3', 5)
+    ->setCellValue('C3', 12.0)
+    ->setCellValue('D3', '=CALCULATED_PRICE')
+    ->setCellValue('E3', '=GERMAN_VAT')
+    ->setCellValue('F3', '=TOTAL_INCLUDING_VAT');
+$spreadsheet->getActiveSheet()
+    ->setCellValue('A4', 'PHP For the Web')
+    ->setCellValue('B4', 3)
+    ->setCellValue('C4', 10.0)
+    ->setCellValue('D4', '=CALCULATED_PRICE')
+    ->setCellValue('E4', '=GERMAN_VAT')
+    ->setCellValue('F4', '=TOTAL_INCLUDING_VAT');
+
+// Use a relative named range to provide the totals for rows 2-4
+$spreadsheet->addNamedRange( new \PhpOffice\PhpSpreadsheet\NamedRange('COLUMN_TOTAL', $worksheet, '=A$2:A$4') );
+
+$spreadsheet->getActiveSheet()
+    ->setCellValue('B6', '=SUBTOTAL(109,COLUMN_TOTAL)')
+    ->setCellValue('D6', '=SUBTOTAL(109,COLUMN_TOTAL)')
+    ->setCellValue('E6', '=SUBTOTAL(109,COLUMN_TOTAL)')
+    ->setCellValue('F6', '=SUBTOTAL(109,COLUMN_TOTAL)');
+```
+
+As with named ranges, an optional fourth parameter can be passed defining the named formula
+scope as local (i.e. only usable on the specified worksheet). Otherwise, named formulae are
+global by default.
+
 ## Redirect output to a client's web browser
 
 Sometimes, one really wants to output a file to a client''s browser,
diff --git a/samples/DefinedNames/AbsoluteNamedRange.php b/samples/DefinedNames/AbsoluteNamedRange.php
new file mode 100644
index 00000000..450de667
--- /dev/null
+++ b/samples/DefinedNames/AbsoluteNamedRange.php
@@ -0,0 +1,63 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\IOFactory;
+use PhpOffice\PhpSpreadsheet\NamedRange;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+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__ . '/../Bootstrap.php';
+
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->setActiveSheetIndex(0);
+
+// Set up some basic data for a timesheet
+$worksheet
+    ->setCellValue('A1', 'Charge Rate/hour:')
+    ->setCellValue('B1', '7.50')
+    ->setCellValue('A3', 'Date')
+    ->setCellValue('B3', 'Hours')
+    ->setCellValue('C3', 'Charge');
+
+// Define named range using an absolute cell reference
+$spreadsheet->addNamedRange(new NamedRange('CHARGE_RATE', $worksheet, '=$B$1'));
+
+$workHours = [
+    '2020-0-06' => 7.5,
+    '2020-0-07' => 7.25,
+    '2020-0-08' => 6.5,
+    '2020-0-09' => 7.0,
+    '2020-0-10' => 5.5,
+];
+
+// Populate the Timesheet
+$startRow = 4;
+$row = $startRow;
+foreach ($workHours as $date => $hours) {
+    $worksheet
+        ->setCellValue("A{$row}", $date)
+        ->setCellValue("B{$row}", $hours)
+        ->setCellValue("C{$row}", "=B{$row}*CHARGE_RATE");
+    ++$row;
+}
+$endRow = $row - 1;
+
+++$row;
+$worksheet
+    ->setCellValue("B{$row}", "=SUM(B{$startRow}:B{$endRow})")
+    ->setCellValue("C{$row}", "=SUM(C{$startRow}:C{$endRow})");
+
+echo sprintf(
+    'Worked %.2f hours at a rate of %.2f - Charge to the client is %.2f',
+    $worksheet->getCell("B{$row}")->getCalculatedValue(),
+    $worksheet->getCell('B1')->getValue(),
+    $worksheet->getCell("C{$row}")->getCalculatedValue()
+), PHP_EOL;
+
+$outputFileName = 'AbsoluteNamedRange.xlsx';
+$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
+$writer->save($outputFileName);
diff --git a/samples/DefinedNames/CrossWorksheetNamedFormula.php b/samples/DefinedNames/CrossWorksheetNamedFormula.php
new file mode 100644
index 00000000..b441e0f7
--- /dev/null
+++ b/samples/DefinedNames/CrossWorksheetNamedFormula.php
@@ -0,0 +1,99 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\IOFactory;
+use PhpOffice\PhpSpreadsheet\NamedFormula;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+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__ . '/../Bootstrap.php';
+
+$spreadsheet = new Spreadsheet();
+
+$data2019 = [
+    [151600, 21600],
+    [160320, 30320],
+    [243500, 73500],
+    [113450, 13450],
+    [143200, 23200],
+    [134000, 14000],
+    [89400, -10600],
+    [184500, 24500],
+    [100800, 800],
+    [241850, 5150],
+    [142425, 12425],
+    [243400, 43400],
+];
+
+$data2020 = [
+    [183250, 33250],
+    [210350, 40350],
+    [298650, 48650],
+    [140550, 20550],
+    [183145, 33145],
+    [172355, 22355],
+];
+
+$worksheet = $spreadsheet->setActiveSheetIndex(0);
+setYearlyData($worksheet, '2019', $data2019);
+$worksheet = $spreadsheet->addSheet(new Worksheet($spreadsheet));
+setYearlyData($worksheet, '2020', $data2020);
+$worksheet = $spreadsheet->addSheet(new Worksheet($spreadsheet));
+setYearlyData($worksheet, '2020', [], 'GROWTH');
+
+function setYearlyData(Worksheet $worksheet, string $year, $yearlyData, ?string $title = null): void
+{
+    // Set up some basic data
+    $worksheetTitle = $title ?: $year;
+    $worksheet
+        ->setTitle($worksheetTitle)
+        ->setCellValue('A1', 'Month')
+        ->setCellValue('B1', $worksheetTitle === 'GROWTH' ? 'Growth' : 'Sales')
+        ->setCellValue('C1', $worksheetTitle === 'GROWTH' ? 'Profit Growth' : 'Margin')
+        ->setCellValue('A2', Date::stringToExcel("{$year}-01-01"));
+    for ($row = 3; $row <= 13; ++$row) {
+        $worksheet->setCellValue("A{$row}", '=NEXT_MONTH');
+    }
+
+    if (!empty($yearlyData)) {
+        $worksheet->fromArray($yearlyData, null, 'B2');
+    } else {
+        for ($row = 2; $row <= 13; ++$row) {
+            $worksheet->setCellValue("B{$row}", '=GROWTH');
+            $worksheet->setCellValue("C{$row}", '=PROFIT_GROWTH');
+        }
+    }
+
+    $worksheet->getStyle('A1:C1')
+        ->getFont()->setBold(true);
+    $worksheet->getStyle('A2:A13')
+        ->getNumberFormat()
+        ->setFormatCode('mmmm');
+    $worksheet->getStyle('B2:C13')
+        ->getNumberFormat()
+        ->setFormatCode($worksheetTitle === 'GROWTH' ? '0.00%' : '_-€* #,##0_-');
+}
+
+// Add some Named Formulae
+// The first to store our tax rate
+$spreadsheet->addNamedFormula(new NamedFormula('NEXT_MONTH', $worksheet, '=EDATE(OFFSET($A1,-1,0),1)'));
+$spreadsheet->addNamedFormula(new NamedFormula('GROWTH', $worksheet, "=IF('2020'!\$B1=\"\",\"-\",(('2020'!\$B1/'2019'!\$B1)-1))"));
+$spreadsheet->addNamedFormula(new NamedFormula('PROFIT_GROWTH', $worksheet, "=IF('2020'!\$C1=\"\",\"-\",(('2020'!\$C1/'2019'!\$C1)-1))"));
+
+for ($row = 2; $row <= 7; ++$row) {
+    $month = $worksheet->getCell("A{$row}")->getFormattedValue();
+    $growth = $worksheet->getCell("B{$row}")->getFormattedValue();
+    $profitGrowth = $worksheet->getCell("C{$row}")->getFormattedValue();
+
+    echo "Growth for {$month} is {$growth}, with a Profit Growth of {$profitGrowth}", PHP_EOL;
+}
+
+$outputFileName = 'CrossWorksheetNamedFormula.xlsx';
+$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
+$writer->save($outputFileName);
diff --git a/samples/DefinedNames/NamedFormulaeAndRanges.php b/samples/DefinedNames/NamedFormulaeAndRanges.php
new file mode 100644
index 00000000..b3f94efc
--- /dev/null
+++ b/samples/DefinedNames/NamedFormulaeAndRanges.php
@@ -0,0 +1,74 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\IOFactory;
+use PhpOffice\PhpSpreadsheet\NamedFormula;
+use PhpOffice\PhpSpreadsheet\NamedRange;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+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__ . '/../Bootstrap.php';
+
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->setActiveSheetIndex(0);
+
+// Set up some basic data for a timesheet
+$worksheet
+    ->setCellValue('A1', 'Charge Rate/hour:')
+    ->setCellValue('B1', '7.50')
+    ->setCellValue('A3', 'Date')
+    ->setCellValue('B3', 'Hours')
+    ->setCellValue('C3', 'Charge');
+
+// Define named ranges
+// CHARGE_RATE is an absolute cell reference that always points to cell B1
+$spreadsheet->addNamedRange(new NamedRange('CHARGE_RATE', $worksheet, '=$B$1'));
+// HOURS_PER_DAY is a relative cell reference that always points to column B, but to a cell in the row where it is used
+$spreadsheet->addNamedRange(new NamedRange('HOURS_PER_DAY', $worksheet, '=$B1'));
+// Set up the formula for calculating the daily charge
+$spreadsheet->addNamedFormula(new NamedFormula('DAILY_CHARGE', null, '=HOURS_PER_DAY*CHARGE_RATE'));
+// Set up the formula for calculating the column totals
+$spreadsheet->addNamedFormula(new NamedFormula('COLUMN_TOTALS', null, '=SUM(COLUMN_DATA_VALUES)'));
+
+$workHours = [
+    '2020-0-06' => 7.5,
+    '2020-0-07' => 7.25,
+    '2020-0-08' => 6.5,
+    '2020-0-09' => 7.0,
+    '2020-0-10' => 5.5,
+];
+
+// Populate the Timesheet
+$startRow = 4;
+$row = $startRow;
+foreach ($workHours as $date => $hours) {
+    $worksheet
+        ->setCellValue("A{$row}", $date)
+        ->setCellValue("B{$row}", $hours)
+        ->setCellValue("C{$row}", '=DAILY_CHARGE');
+    ++$row;
+}
+$endRow = $row - 1;
+
+// COLUMN_TOTAL is another relative cell reference that always points to the same range of rows but to cell in the column where it is used
+$spreadsheet->addNamedRange(new NamedRange('COLUMN_DATA_VALUES', $worksheet, "=A\${$startRow}:A\${$endRow}"));
+
+++$row;
+$worksheet
+    ->setCellValue("B{$row}", '=COLUMN_TOTALS')
+    ->setCellValue("C{$row}", '=COLUMN_TOTALS');
+
+echo sprintf(
+    'Worked %.2f hours at a rate of %.2f - Charge to the client is %.2f',
+    $worksheet->getCell("B{$row}")->getCalculatedValue(),
+    $worksheet->getCell('B1')->getValue(),
+    $worksheet->getCell("C{$row}")->getCalculatedValue()
+), PHP_EOL;
+
+$outputFileName = 'NamedFormulaeAndRanges.xlsx';
+$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
+$writer->save($outputFileName);
diff --git a/samples/DefinedNames/RelativeNamedRange.php b/samples/DefinedNames/RelativeNamedRange.php
new file mode 100644
index 00000000..1f712017
--- /dev/null
+++ b/samples/DefinedNames/RelativeNamedRange.php
@@ -0,0 +1,66 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\IOFactory;
+use PhpOffice\PhpSpreadsheet\NamedRange;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+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__ . '/../Bootstrap.php';
+
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->setActiveSheetIndex(0);
+
+// Set up some basic data for a timesheet
+$worksheet
+    ->setCellValue('A1', 'Charge Rate/hour:')
+    ->setCellValue('B1', '7.50')
+    ->setCellValue('A3', 'Date')
+    ->setCellValue('B3', 'Hours')
+    ->setCellValue('C3', 'Charge');
+
+// Define named ranges
+// CHARGE_RATE is an absolute cell reference that always points to cell B1
+$spreadsheet->addNamedRange(new NamedRange('CHARGE_RATE', $worksheet, '=$B$1'));
+// HOURS_PER_DAY is a relative cell reference that always points to column B, but to a cell in the row where it is used
+$spreadsheet->addNamedRange(new NamedRange('HOURS_PER_DAY', $worksheet, '=$B1'));
+
+$workHours = [
+    '2020-0-06' => 7.5,
+    '2020-0-07' => 7.25,
+    '2020-0-08' => 6.5,
+    '2020-0-09' => 7.0,
+    '2020-0-10' => 5.5,
+];
+
+// Populate the Timesheet
+$startRow = 4;
+$row = $startRow;
+foreach ($workHours as $date => $hours) {
+    $worksheet
+        ->setCellValue("A{$row}", $date)
+        ->setCellValue("B{$row}", $hours)
+        ->setCellValue("C{$row}", '=HOURS_PER_DAY*CHARGE_RATE');
+    ++$row;
+}
+$endRow = $row - 1;
+
+++$row;
+$worksheet
+    ->setCellValue("B{$row}", "=SUM(B{$startRow}:B{$endRow})")
+    ->setCellValue("C{$row}", "=SUM(C{$startRow}:C{$endRow})");
+
+echo sprintf(
+    'Worked %.2f hours at a rate of %.2f - Charge to the client is %.2f',
+    $worksheet->getCell("B{$row}")->getCalculatedValue(),
+    $worksheet->getCell('B1')->getValue(),
+    $worksheet->getCell("C{$row}")->getCalculatedValue()
+), PHP_EOL;
+
+$outputFileName = 'RelativeNamedRange.xlsx';
+$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
+$writer->save($outputFileName);
diff --git a/samples/DefinedNames/RelativeNamedRange2.php b/samples/DefinedNames/RelativeNamedRange2.php
new file mode 100644
index 00000000..b6a6f8d1
--- /dev/null
+++ b/samples/DefinedNames/RelativeNamedRange2.php
@@ -0,0 +1,69 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\IOFactory;
+use PhpOffice\PhpSpreadsheet\NamedRange;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+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__ . '/../Bootstrap.php';
+
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->setActiveSheetIndex(0);
+
+// Set up some basic data for a timesheet
+$worksheet
+    ->setCellValue('A1', 'Charge Rate/hour:')
+    ->setCellValue('B1', '7.50')
+    ->setCellValue('A3', 'Date')
+    ->setCellValue('B3', 'Hours')
+    ->setCellValue('C3', 'Charge');
+
+// Define named ranges
+// CHARGE_RATE is an absolute cell reference that always points to cell B1
+$spreadsheet->addNamedRange(new NamedRange('CHARGE_RATE', $worksheet, '=$B$1'));
+// HOURS_PER_DAY is a relative cell reference that always points to column B, but to a cell in the row where it is used
+$spreadsheet->addNamedRange(new NamedRange('HOURS_PER_DAY', $worksheet, '=$B1'));
+
+$workHours = [
+    '2020-0-06' => 7.5,
+    '2020-0-07' => 7.25,
+    '2020-0-08' => 6.5,
+    '2020-0-09' => 7.0,
+    '2020-0-10' => 5.5,
+];
+
+// Populate the Timesheet
+$startRow = 4;
+$row = $startRow;
+foreach ($workHours as $date => $hours) {
+    $worksheet
+        ->setCellValue("A{$row}", $date)
+        ->setCellValue("B{$row}", $hours)
+        ->setCellValue("C{$row}", '=HOURS_PER_DAY*CHARGE_RATE');
+    ++$row;
+}
+$endRow = $row - 1;
+
+// COLUMN_TOTAL is another relative cell reference that always points to the same range of rows but to cell in the column where it is used
+$spreadsheet->addNamedRange(new NamedRange('COLUMN_DATA_VALUES', $worksheet, "=A\${$startRow}:A\${$endRow}"));
+
+++$row;
+$worksheet
+    ->setCellValue("B{$row}", '=SUM(COLUMN_DATA_VALUES)')
+    ->setCellValue("C{$row}", '=SUM(COLUMN_DATA_VALUES)');
+
+echo sprintf(
+    'Worked %.2f hours at a rate of %.2f - Charge to the client is %.2f',
+    $worksheet->getCell("B{$row}")->getCalculatedValue(),
+    $worksheet->getCell('B1')->getValue(),
+    $worksheet->getCell("C{$row}")->getCalculatedValue()
+), PHP_EOL;
+
+$outputFileName = 'RelativeNamedRange2.xlsx';
+$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
+$writer->save($outputFileName);
diff --git a/samples/DefinedNames/RelativeNamedRangeAsFunction.php b/samples/DefinedNames/RelativeNamedRangeAsFunction.php
new file mode 100644
index 00000000..527cd43b
--- /dev/null
+++ b/samples/DefinedNames/RelativeNamedRangeAsFunction.php
@@ -0,0 +1,72 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\IOFactory;
+use PhpOffice\PhpSpreadsheet\NamedFormula;
+use PhpOffice\PhpSpreadsheet\NamedRange;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+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__ . '/../Bootstrap.php';
+
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->setActiveSheetIndex(0);
+
+// Set up some basic data for a timesheet
+$worksheet
+    ->setCellValue('A1', 'Charge Rate/hour:')
+    ->setCellValue('B1', '7.50')
+    ->setCellValue('A3', 'Date')
+    ->setCellValue('B3', 'Hours')
+    ->setCellValue('C3', 'Charge');
+
+// Define named ranges
+// CHARGE_RATE is an absolute cell reference that always points to cell B1
+$spreadsheet->addNamedRange(new NamedRange('CHARGE_RATE', $worksheet, '=$B$1'));
+// HOURS_PER_DAY is a relative cell reference that always points to column B, but to a cell in the row where it is used
+$spreadsheet->addNamedRange(new NamedRange('HOURS_PER_DAY', $worksheet, '=$B1'));
+
+$workHours = [
+    '2020-0-06' => 7.5,
+    '2020-0-07' => 7.25,
+    '2020-0-08' => 6.5,
+    '2020-0-09' => 7.0,
+    '2020-0-10' => 5.5,
+];
+
+// Populate the Timesheet
+$startRow = 4;
+$row = $startRow;
+foreach ($workHours as $date => $hours) {
+    $worksheet
+        ->setCellValue("A{$row}", $date)
+        ->setCellValue("B{$row}", $hours)
+        ->setCellValue("C{$row}", '=HOURS_PER_DAY*CHARGE_RATE');
+    ++$row;
+}
+$endRow = $row - 1;
+
+// COLUMN_TOTAL is another relative cell reference that always points to the same range of rows but to cell in the column where it is used
+// To avoid including the current row,or having to hard-code the range itself (as we did in the previous example)
+//    we wrap it in a named formula using the OFFSET() function
+$spreadsheet->addNamedFormula(new NamedFormula('COLUMN_DATA_VALUES', $worksheet, '=OFFSET(A$4:A1, -1, 0)'));
+
+++$row;
+$worksheet
+    ->setCellValue("B{$row}", '=SUM(COLUMN_DATA_VALUES)')
+    ->setCellValue("C{$row}", '=SUM(COLUMN_DATA_VALUES)');
+
+echo sprintf(
+    'Worked %.2f hours at a rate of %.2f - Charge to the client is %.2f',
+    $worksheet->getCell("B{$row}")->getCalculatedValue(),
+    $worksheet->getCell('B1')->getValue(),
+    $worksheet->getCell("C{$row}")->getCalculatedValue()
+), PHP_EOL;
+
+$outputFileName = 'RelativeNamedRangeAsFunction.xlsx';
+$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
+$writer->save($outputFileName);
diff --git a/samples/DefinedNames/ScopedNamedRange.php b/samples/DefinedNames/ScopedNamedRange.php
new file mode 100644
index 00000000..5ea7e48a
--- /dev/null
+++ b/samples/DefinedNames/ScopedNamedRange.php
@@ -0,0 +1,81 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\IOFactory;
+use PhpOffice\PhpSpreadsheet\NamedRange;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+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__ . '/../Bootstrap.php';
+
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->setActiveSheetIndex(0);
+$worksheet->setTitle('Base Data');
+
+// Set up some basic data for a timesheet
+$worksheet
+    ->setCellValue('A1', 'Charge Rate/hour:')
+    ->setCellValue('B1', '7.50');
+
+// Define a global named range on the first worksheet for our Charge Rate
+// CHARGE_RATE is an absolute cell reference that always points to cell B1
+// Because it is defined globally, it will still be usable from any worksheet in the spreadsheet
+$spreadsheet->addNamedRange(new NamedRange('CHARGE_RATE', $worksheet, '=$B$1'));
+
+// Create a second worksheet as our client timesheet
+$worksheet = $spreadsheet->addSheet(new \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet($spreadsheet, 'Client Timesheet'));
+
+// Define named ranges
+// HOURS_PER_DAY is a relative cell reference that always points to column B, but to a cell in the row where it is used
+$spreadsheet->addNamedRange(new NamedRange('HOURS_PER_DAY', $worksheet, '=$B1'));
+
+// Set up some basic data for a timesheet
+$worksheet
+    ->setCellValue('A1', 'Date')
+    ->setCellValue('B1', 'Hours')
+    ->setCellValue('C1', 'Charge');
+
+$workHours = [
+    '2020-0-06' => 7.5,
+    '2020-0-07' => 7.25,
+    '2020-0-08' => 6.5,
+    '2020-0-09' => 7.0,
+    '2020-0-10' => 5.5,
+];
+
+// Populate the Timesheet
+$startRow = 2;
+$row = $startRow;
+foreach ($workHours as $date => $hours) {
+    $worksheet
+        ->setCellValue("A{$row}", $date)
+        ->setCellValue("B{$row}", $hours)
+        ->setCellValue("C{$row}", '=HOURS_PER_DAY*CHARGE_RATE');
+    ++$row;
+}
+$endRow = $row - 1;
+
+// COLUMN_TOTAL is another relative cell reference that always points to the same range of rows but to cell in the column where it is used
+$spreadsheet->addNamedRange(new NamedRange('COLUMN_DATA_VALUES', $worksheet, "=A\${$startRow}:A\${$endRow}"));
+
+++$row;
+$worksheet
+    ->setCellValue("B{$row}", '=SUM(COLUMN_DATA_VALUES)')
+    ->setCellValue("C{$row}", '=SUM(COLUMN_DATA_VALUES)');
+
+echo sprintf(
+    'Worked %.2f hours at a rate of %s - Charge to the client is %.2f',
+    $worksheet->getCell("B{$row}")->getCalculatedValue(),
+    $chargeRateCellValue = $spreadsheet
+        ->getSheetByName($spreadsheet->getNamedRange('CHARGE_RATE')->getWorksheet()->getTitle())
+        ->getCell($spreadsheet->getNamedRange('CHARGE_RATE')->getCellsInRange()[0])->getValue(),
+    $worksheet->getCell("C{$row}")->getCalculatedValue()
+), PHP_EOL;
+
+$outputFileName = 'ScopedNamedRange.xlsx';
+$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
+$writer->save($outputFileName);
diff --git a/samples/DefinedNames/ScopedNamedRange2.php b/samples/DefinedNames/ScopedNamedRange2.php
new file mode 100644
index 00000000..8e610418
--- /dev/null
+++ b/samples/DefinedNames/ScopedNamedRange2.php
@@ -0,0 +1,98 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\IOFactory;
+use PhpOffice\PhpSpreadsheet\NamedRange;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+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__ . '/../Bootstrap.php';
+
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->setActiveSheetIndex(0);
+
+$clients = [
+    'Client #1 - Full Hourly Rate' => [
+        '2020-0-06' => 2.5,
+        '2020-0-07' => 2.25,
+        '2020-0-08' => 6.0,
+        '2020-0-09' => 3.0,
+        '2020-0-10' => 2.25,
+    ],
+    'Client #2 - Full Hourly Rate' => [
+        '2020-0-06' => 1.5,
+        '2020-0-07' => 2.75,
+        '2020-0-08' => 0.0,
+        '2020-0-09' => 4.5,
+        '2020-0-10' => 3.5,
+    ],
+    'Client #3 - Reduced Hourly Rate' => [
+        '2020-0-06' => 3.5,
+        '2020-0-07' => 2.5,
+        '2020-0-08' => 1.5,
+        '2020-0-09' => 0.0,
+        '2020-0-10' => 1.25,
+    ],
+];
+
+foreach ($clients as $clientName => $workHours) {
+    $worksheet = $spreadsheet->addSheet(new \PhpOffice\PhpSpreadsheet\Worksheet\Worksheet($spreadsheet, $clientName));
+
+    // Set up some basic data for a timesheet
+    $worksheet
+        ->setCellValue('A1', 'Charge Rate/hour:')
+        ->setCellValue('B1', '7.50')
+        ->setCellValue('A3', 'Date')
+        ->setCellValue('B3', 'Hours')
+        ->setCellValue('C3', 'Charge');
+
+    // Define named ranges
+    // CHARGE_RATE is an absolute cell reference that always points to cell B1
+    $spreadsheet->addNamedRange(new NamedRange('CHARGE_RATE', $worksheet, '=$B$1', true));
+    // HOURS_PER_DAY is a relative cell reference that always points to column B, but to a cell in the row where it is used
+    $spreadsheet->addNamedRange(new NamedRange('HOURS_PER_DAY', $worksheet, '=$B1', true));
+
+    // Populate the Timesheet
+    $startRow = 4;
+    $row = $startRow;
+    foreach ($workHours as $date => $hours) {
+        $worksheet
+            ->setCellValue("A{$row}", $date)
+            ->setCellValue("B{$row}", $hours)
+            ->setCellValue("C{$row}", '=HOURS_PER_DAY*CHARGE_RATE');
+        ++$row;
+    }
+    $endRow = $row - 1;
+
+    // COLUMN_TOTAL is another relative cell reference that always points to the same range of rows but to cell in the column where it is used
+    $spreadsheet->addNamedRange(new NamedRange('COLUMN_TOTAL', $worksheet, "=A\${$startRow}:A\${$endRow}", true));
+
+    ++$row;
+    $worksheet
+        ->setCellValue("B{$row}", '=SUM(COLUMN_TOTAL)')
+        ->setCellValue("C{$row}", '=SUM(COLUMN_TOTAL)');
+}
+$spreadsheet->removeSheetByIndex(0);
+
+// Set the reduced charge rate for our special client
+$worksheet
+    ->setCellValue('B1', 4.5);
+
+foreach ($spreadsheet->getAllSheets() as $worksheet) {
+    echo sprintf(
+        'Worked %.2f hours for "%s" at a rate of %.2f - Charge to the client is %.2f',
+        $worksheet->getCell("B{$row}")->getCalculatedValue(),
+        $worksheet->getTitle(),
+        $worksheet->getCell('B1')->getValue(),
+        $worksheet->getCell("C{$row}")->getCalculatedValue()
+    ), PHP_EOL;
+}
+$worksheet = $spreadsheet->setActiveSheetIndex(0);
+
+$outputFileName = 'ScopedNamedRange2.xlsx';
+$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
+$writer->save($outputFileName);
diff --git a/samples/DefinedNames/SimpleNamedFormula.php b/samples/DefinedNames/SimpleNamedFormula.php
new file mode 100644
index 00000000..8e0fc972
--- /dev/null
+++ b/samples/DefinedNames/SimpleNamedFormula.php
@@ -0,0 +1,52 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\IOFactory;
+use PhpOffice\PhpSpreadsheet\NamedFormula;
+use PhpOffice\PhpSpreadsheet\NamedRange;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+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__ . '/../Bootstrap.php';
+
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->setActiveSheetIndex(0);
+
+// Add some Named Formulae
+// The first to store our tax rate
+$spreadsheet->addNamedFormula(new NamedFormula('TAX_RATE', $worksheet, '=19%'));
+// The second to calculate the Tax on a Price value (Note that `PRICE` is defined later as a Named Range)
+$spreadsheet->addNamedFormula(new NamedFormula('TAX', $worksheet, '=PRICE*TAX_RATE'));
+
+// Set up some basic data
+$worksheet
+    ->setCellValue('A1', 'Tax Rate:')
+    ->setCellValue('B1', '=TAX_RATE')
+    ->setCellValue('A3', 'Net Price:')
+    ->setCellValue('B3', 19.99)
+    ->setCellValue('A4', 'Tax:')
+    ->setCellValue('A5', 'Price including Tax:');
+
+// Define a named range that we can use in our formulae
+$spreadsheet->addNamedRange(new NamedRange('PRICE', $worksheet, '=$B$3'));
+
+// Reference the defined formulae in worksheet formulae
+$worksheet
+    ->setCellValue('B4', '=TAX')
+    ->setCellValue('B5', '=PRICE+TAX');
+
+echo sprintf(
+    'With a Tax Rate of %.2f and a net price of %.2f, Tax is %.2f and the gross price is %.2f',
+    $worksheet->getCell('B1')->getCalculatedValue(),
+    $worksheet->getCell('B3')->getValue(),
+    $worksheet->getCell('B4')->getCalculatedValue(),
+    $worksheet->getCell('B5')->getCalculatedValue()
+), PHP_EOL;
+
+$outputFileName = 'SimpleNamedFormula.xlsx';
+$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
+$writer->save($outputFileName);
diff --git a/samples/DefinedNames/SimpleNamedRange.php b/samples/DefinedNames/SimpleNamedRange.php
new file mode 100644
index 00000000..ee05c68f
--- /dev/null
+++ b/samples/DefinedNames/SimpleNamedRange.php
@@ -0,0 +1,46 @@
+<?php
+
+use PhpOffice\PhpSpreadsheet\IOFactory;
+use PhpOffice\PhpSpreadsheet\NamedRange;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+
+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__ . '/../Bootstrap.php';
+
+$spreadsheet = new Spreadsheet();
+$worksheet = $spreadsheet->setActiveSheetIndex(0);
+
+// Set up some basic data
+$worksheet
+    ->setCellValue('A1', 'Tax Rate:')
+    ->setCellValue('B1', '=19%')
+    ->setCellValue('A3', 'Net Price:')
+    ->setCellValue('B3', 12.99)
+    ->setCellValue('A4', 'Tax:')
+    ->setCellValue('A5', 'Price including Tax:');
+
+// Define named ranges
+$spreadsheet->addNamedRange(new NamedRange('TAX_RATE', $worksheet, '=$B$1'));
+$spreadsheet->addNamedRange(new NamedRange('PRICE', $worksheet, '=$B$3'));
+
+// Reference that defined name in a formula
+$worksheet
+    ->setCellValue('B4', '=PRICE*TAX_RATE')
+    ->setCellValue('B5', '=PRICE*(1+TAX_RATE)');
+
+echo sprintf(
+    'With a Tax Rate of %.2f and a net price of %.2f, Tax is %.2f and the gross price is %.2f',
+    $worksheet->getCell('B1')->getCalculatedValue(),
+    $worksheet->getCell('B3')->getValue(),
+    $worksheet->getCell('B4')->getCalculatedValue(),
+    $worksheet->getCell('B5')->getCalculatedValue()
+), PHP_EOL;
+
+$outputFileName = 'SimpleNamedRange.xlsx';
+$writer = IOFactory::createWriter($spreadsheet, 'Xlsx');
+$writer->save($outputFileName);
diff --git a/src/PhpSpreadsheet/Calculation/Calculation.php b/src/PhpSpreadsheet/Calculation/Calculation.php
index 10ba064a..8cb1c297 100644
--- a/src/PhpSpreadsheet/Calculation/Calculation.php
+++ b/src/PhpSpreadsheet/Calculation/Calculation.php
@@ -7,7 +7,8 @@ use PhpOffice\PhpSpreadsheet\Calculation\Engine\Logger;
 use PhpOffice\PhpSpreadsheet\Calculation\Token\Stack;
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
-use PhpOffice\PhpSpreadsheet\NamedRange;
+use PhpOffice\PhpSpreadsheet\DefinedName;
+use PhpOffice\PhpSpreadsheet\ReferenceHelper;
 use PhpOffice\PhpSpreadsheet\Shared;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
@@ -27,8 +28,13 @@ class Calculation
     const CALCULATION_REGEXP_FUNCTION = '@?(?:_xlfn\.)?([\p{L}][\p{L}\p{N}\.]*)[\s]*\(';
     //    Cell reference (cell or range of cells, with or without a sheet reference)
     const CALCULATION_REGEXP_CELLREF = '((([^\s,!&%^\/\*\+<>=-]*)|(\'[^\']*\')|(\"[^\"]*\"))!)?\$?\b([a-z]{1,3})\$?(\d{1,7})(?![\w.])';
-    //    Named Range of cells
-    const CALCULATION_REGEXP_NAMEDRANGE = '((([^\s,!&%^\/\*\+<>=-]*)|(\'[^\']*\')|(\"[^\"]*\"))!)?([_\p{L}][_\p{L}\p{N}\.]*)';
+    //    Cell reference (with or without a sheet reference) ensuring absolute/relative
+    const CALCULATION_REGEXP_CELLREF_RELATIVE = '((([^\s\(,!&%^\/\*\+<>=-]*)|(\'[^\']*\')|(\"[^\"]*\"))!)?(\$?\b[a-z]{1,3})(\$?\d{1,7})(?![\w.])';
+    //    Cell ranges ensuring absolute/relative
+    const CALCULATION_REGEXP_COLUMNRANGE_RELATIVE = '(\$?[a-z]{1,3}):(\$?[a-z]{1,3})';
+    const CALCULATION_REGEXP_ROWRANGE_RELATIVE = '(\$?\d{1,7}):(\$?\d{1,7})';
+    //    Defined Names: Named Range of cells, or Named Formulae
+    const CALCULATION_REGEXP_DEFINEDNAME = '((([^\s,!&%^\/\*\+<>=-]*)|(\'[^\']*\')|(\"[^\"]*\"))!)?([_\p{L}][_\p{L}\p{N}\.]*)';
     //    Error
     const CALCULATION_REGEXP_ERROR = '\#[A-Z][A-Z0_\/]*[!\?]?';
 
@@ -128,6 +134,13 @@ class Calculation
      */
     public $formulaError;
 
+    /**
+     * Reference Helper.
+     *
+     * @var ReferenceHelper
+     */
+    private static $referenceHelper;
+
     /**
      * An array of the nested cell references accessed by the calculation engine, used for the debug log.
      *
@@ -2660,6 +2673,7 @@ class Calculation
         $this->spreadsheet = $spreadsheet;
         $this->cyclicReferenceStack = new CyclicReferenceStack();
         $this->debugLog = new Logger($this->cyclicReferenceStack);
+        self::$referenceHelper = ReferenceHelper::getInstance();
     }
 
     private static function loadLocales(): void
@@ -3395,6 +3409,7 @@ class Calculation
         if (($cellID !== null) && ($this->getValueFromCache($wsCellReference, $cellValue))) {
             return $cellValue;
         }
+        $this->debugLog->writeDebugLog('Evaluating formula for cell ', $wsCellReference);
 
         if (($wsTitle[0] !== "\x00") && ($this->cyclicReferenceStack->onStack($wsCellReference))) {
             if ($this->cyclicFormulaCount <= 0) {
@@ -3416,6 +3431,7 @@ class Calculation
             }
         }
 
+        $this->debugLog->writeDebugLog('Formula for cell ', $wsCellReference, ' is ', $formula);
         //    Parse the formula onto the token stack and calculate the value
         $this->cyclicReferenceStack->push($wsCellReference);
         $cellValue = $this->processTokenStack($this->internalParseFormula($formula, $pCell), $cellID, $pCell);
@@ -3776,13 +3792,13 @@ class Calculation
         $pCellParent = ($pCell !== null) ? $pCell->getWorksheet() : null;
 
         $regexpMatchString = '/^(' . self::CALCULATION_REGEXP_FUNCTION .
-            '|' . self::CALCULATION_REGEXP_CELLREF .
-            '|' . self::CALCULATION_REGEXP_NUMBER .
-            '|' . self::CALCULATION_REGEXP_STRING .
-            '|' . self::CALCULATION_REGEXP_OPENBRACE .
-            '|' . self::CALCULATION_REGEXP_NAMEDRANGE .
-            '|' . self::CALCULATION_REGEXP_ERROR .
-            ')/sui';
+                                '|' . self::CALCULATION_REGEXP_CELLREF .
+                                '|' . self::CALCULATION_REGEXP_NUMBER .
+                                '|' . self::CALCULATION_REGEXP_STRING .
+                                '|' . self::CALCULATION_REGEXP_OPENBRACE .
+                                '|' . self::CALCULATION_REGEXP_DEFINEDNAME .
+                                '|' . self::CALCULATION_REGEXP_ERROR .
+                                ')/sui';
 
         //    Start with initialisation
         $index = 0;
@@ -3840,6 +3856,7 @@ class Calculation
             }
 
             $opCharacter = $formula[$index]; //    Get the first character of the value at the current index position
+
             if ((isset(self::$comparisonOperators[$opCharacter])) && (strlen($formula) > $index) && (isset(self::$comparisonOperators[$formula[$index + 1]]))) {
                 $opCharacter .= $formula[++$index];
             }
@@ -4131,8 +4148,8 @@ class Calculation
                     } elseif (($localeConstant = array_search(trim(strtoupper($val)), self::$localeBoolean)) !== false) {
                         $stackItemType = 'Constant';
                         $val = self::$excelConstants[$localeConstant];
-                    } elseif (preg_match('/^' . self::CALCULATION_REGEXP_NAMEDRANGE . '.*/miu', $val, $match)) {
-                        $stackItemType = 'Named Range';
+                    } elseif (preg_match('/^' . self::CALCULATION_REGEXP_DEFINEDNAME . '.*/miu', $val, $match)) {
+                        $stackItemType = 'Defined Name';
                         $stackItemReference = $val;
                     }
                     $details = $stack->getStackItem($stackItemType, $val, $stackItemReference, $currentCondition, $currentOnlyIf, $currentOnlyIfNot);
@@ -4171,18 +4188,20 @@ class Calculation
             while (($formula[$index] == "\n") || ($formula[$index] == "\r")) {
                 ++$index;
             }
+
             if ($formula[$index] == ' ') {
                 while ($formula[$index] == ' ') {
                     ++$index;
                 }
+
                 //    If we're expecting an operator, but only have a space between the previous and next operands (and both are
                 //        Cell References) then we have an INTERSECTION operator
                 if (
                     ($expectingOperator) &&
                     ((preg_match('/^' . self::CALCULATION_REGEXP_CELLREF . '.*/Ui', substr($formula, $index), $match)) &&
                         ($output[count($output) - 1]['type'] == 'Cell Reference') ||
-                        (preg_match('/^' . self::CALCULATION_REGEXP_NAMEDRANGE . '.*/miu', substr($formula, $index), $match)) &&
-                        ($output[count($output) - 1]['type'] == 'Named Range' || $output[count($output) - 1]['type'] == 'Value')
+                        (preg_match('/^' . self::CALCULATION_REGEXP_DEFINEDNAME . '.*/miu', substr($formula, $index), $match)) &&
+                            ($output[count($output) - 1]['type'] == 'Defined Name' || $output[count($output) - 1]['type'] == 'Value')
                     )
                 ) {
                     while (
@@ -4711,20 +4730,25 @@ class Calculation
                     if (isset($storeKey)) {
                         $branchStore[$storeKey] = $token;
                     }
-                    // if the token is a named range, push the named range name onto the stack
-                } elseif (preg_match('/^' . self::CALCULATION_REGEXP_NAMEDRANGE . '$/miu', $token, $matches)) {
-                    $namedRange = $matches[6];
-                    $this->debugLog->writeDebugLog('Evaluating Named Range ', $namedRange);
+                    // 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)) {
+                    $definedName = $matches[6];
+                    if ($pCell === null || $pCellWorksheet === null) {
+                        return $this->raiseFormulaError("undefined name '$token'");
+                    }
 
-                    $cellValue = $this->extractNamedRange($namedRange, ((null !== $pCell) ? $pCellWorksheet : null), false);
-                    $pCell->attach($pCellParent);
-                    $this->debugLog->writeDebugLog('Evaluation Result for named range ', $namedRange, ' is ', $this->showTypeDetails($cellValue));
-                    $stack->push('Named Range', $cellValue, $namedRange);
+                    $this->debugLog->writeDebugLog('Evaluating Defined Name ', $definedName);
+                    $namedRange = DefinedName::resolveName($definedName, $pCellWorksheet);
+                    if ($namedRange === null) {
+                        return $this->raiseFormulaError("undefined name '$definedName'");
+                    }
+
+                    $result = $this->evaluateDefinedName($pCell, $namedRange, $pCellWorksheet, $stack);
                     if (isset($storeKey)) {
-                        $branchStore[$storeKey] = $cellValue;
+                        $branchStore[$storeKey] = $result;
                     }
                 } else {
-                    return $this->raiseFormulaError("undefined variable '$token'");
+                    return $this->raiseFormulaError("undefined name '$token'");
                 }
             }
         }
@@ -5107,21 +5131,21 @@ class Calculation
             }
 
             // Named range?
-            $namedRange = NamedRange::resolveRange($pRange, $pSheet);
-            if ($namedRange !== null) {
-                $pSheet = $namedRange->getWorksheet();
-                $pRange = $namedRange->getRange();
-                $splitRange = Coordinate::splitRange($pRange);
-                //    Convert row and column references
-                if (ctype_alpha($splitRange[0][0])) {
-                    $pRange = $splitRange[0][0] . '1:' . $splitRange[0][1] . $namedRange->getWorksheet()->getHighestRow();
-                } elseif (ctype_digit($splitRange[0][0])) {
-                    $pRange = 'A' . $splitRange[0][0] . ':' . $namedRange->getWorksheet()->getHighestColumn() . $splitRange[0][1];
-                }
-            } else {
+            $namedRange = DefinedName::resolveName($pRange, $pSheet);
+            if ($namedRange === null) {
                 return Functions::REF();
             }
 
+            $pSheet = $namedRange->getWorksheet();
+            $pRange = $namedRange->getValue();
+            $splitRange = Coordinate::splitRange($pRange);
+            //    Convert row and column references
+            if (ctype_alpha($splitRange[0][0])) {
+                $pRange = $splitRange[0][0] . '1:' . $splitRange[0][1] . $namedRange->getWorksheet()->getHighestRow();
+            } elseif (ctype_digit($splitRange[0][0])) {
+                $pRange = 'A' . $splitRange[0][0] . ':' . $namedRange->getWorksheet()->getHighestColumn() . $splitRange[0][1];
+            }
+
             // Extract range
             $aReferences = Coordinate::extractAllCellReferencesInRange($pRange);
             if (!isset($aReferences[1])) {
@@ -5240,4 +5264,59 @@ class Calculation
 
         return '[ ' . implode(' | ', $tokensStr) . ' ]';
     }
+
+    /**
+     * @return mixed|string
+     */
+    private function evaluateDefinedName(Cell $pCell, DefinedName $namedRange, Worksheet $pCellWorksheet, Stack $stack)
+    {
+        $definedNameScope = $namedRange->getScope();
+        if ($definedNameScope !== null && $definedNameScope !== $pCellWorksheet) {
+            // The defined name isn't in our current scope, so #REF
+            $result = Functions::REF();
+            $stack->push('Error', $result, $namedRange->getName());
+
+            return $result;
+        }
+
+        $definedNameValue = $namedRange->getValue();
+        $definedNameType = $namedRange->isFormula() ? 'Formula' : 'Range';
+        $definedNameWorksheet = $namedRange->getWorksheet();
+
+        if ($definedNameValue[0] !== '=') {
+            $definedNameValue = '=' . $definedNameValue;
+        }
+
+        $this->debugLog->writeDebugLog("Defined Name is a {$definedNameType} with a value of {$definedNameValue}");
+
+        $recursiveCalculationCell = ($definedNameWorksheet !== null && $definedNameWorksheet !== $pCellWorksheet)
+            ? $definedNameWorksheet->getCell('A1')
+            : $pCell;
+        $recursiveCalculationCellAddress = $recursiveCalculationCell !== null
+            ? $recursiveCalculationCell->getCoordinate()
+            : null;
+
+        // Adjust relative references in ranges and formulae so that we execute the calculation for the correct rows and columns
+        $definedNameValue = self::$referenceHelper->updateFormulaReferencesAnyWorksheet(
+            $definedNameValue,
+            Coordinate::columnIndexFromString($pCell->getColumn()) - 1,
+            $pCell->getRow() - 1
+        );
+
+        $this->debugLog->writeDebugLog("Value adjusted for relative references is {$definedNameValue}");
+
+        $recursiveCalculator = new self($this->spreadsheet);
+        $recursiveCalculator->getDebugLog()->setWriteDebugLog($this->getDebugLog()->getWriteDebugLog());
+        $recursiveCalculator->getDebugLog()->setEchoDebugLog($this->getDebugLog()->getEchoDebugLog());
+        $result = $recursiveCalculator->_calculateFormulaValue($definedNameValue, $recursiveCalculationCellAddress, $recursiveCalculationCell);
+
+        if ($this->getDebugLog()->getWriteDebugLog()) {
+            $this->debugLog->mergeDebugLog(array_slice($recursiveCalculator->getDebugLog()->getLog(), 3));
+            $this->debugLog->writeDebugLog("Evaluation Result for Named {$definedNameType} {$namedRange->getName()} is {$this->showTypeDetails($result)}");
+        }
+
+        $stack->push('Defined Name', $result, $namedRange->getName());
+
+        return $result;
+    }
 }
diff --git a/src/PhpSpreadsheet/Calculation/Engine/Logger.php b/src/PhpSpreadsheet/Calculation/Engine/Logger.php
index d69ea56d..3c0f2377 100644
--- a/src/PhpSpreadsheet/Calculation/Engine/Logger.php
+++ b/src/PhpSpreadsheet/Calculation/Engine/Logger.php
@@ -106,6 +106,20 @@ class Logger
         }
     }
 
+    /**
+     * Write a series of entries to the calculation engine debug log.
+     *
+     * @param string[] $args
+     */
+    public function mergeDebugLog(array $args): void
+    {
+        if ($this->writeDebugLog) {
+            foreach ($args as $entry) {
+                $this->writeDebugLog($entry);
+            }
+        }
+    }
+
     /**
      * Clear the calculation engine debug log.
      */
diff --git a/src/PhpSpreadsheet/Calculation/Functions.php b/src/PhpSpreadsheet/Calculation/Functions.php
index 2a4e6f40..2e8a7ecf 100644
--- a/src/PhpSpreadsheet/Calculation/Functions.php
+++ b/src/PhpSpreadsheet/Calculation/Functions.php
@@ -647,7 +647,7 @@ class Functions
         preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $cellReference, $matches);
 
         $cellReference = $matches[6] . $matches[7];
-        $worksheetName = trim($matches[3], "'");
+        $worksheetName = str_replace("''", "'", trim($matches[2], "'"));
 
         $worksheet = (!empty($worksheetName))
             ? $pCell->getWorksheet()->getParent()->getSheetByName($worksheetName)
diff --git a/src/PhpSpreadsheet/Calculation/LookupRef.php b/src/PhpSpreadsheet/Calculation/LookupRef.php
index 7c00ca32..0636258b 100644
--- a/src/PhpSpreadsheet/Calculation/LookupRef.php
+++ b/src/PhpSpreadsheet/Calculation/LookupRef.php
@@ -290,7 +290,7 @@ class LookupRef
             (!preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $cellAddress1, $matches)) ||
             (($cellAddress2 !== null) && (!preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $cellAddress2, $matches)))
         ) {
-            if (!preg_match('/^' . Calculation::CALCULATION_REGEXP_NAMEDRANGE . '$/i', $cellAddress1, $matches)) {
+            if (!preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/i', $cellAddress1, $matches)) {
                 return Functions::REF();
             }
 
diff --git a/src/PhpSpreadsheet/Cell/AddressHelper.php b/src/PhpSpreadsheet/Cell/AddressHelper.php
index 77a521b0..04fa3b8c 100644
--- a/src/PhpSpreadsheet/Cell/AddressHelper.php
+++ b/src/PhpSpreadsheet/Cell/AddressHelper.php
@@ -35,7 +35,7 @@ class AddressHelper
             $columnReference = (string) $currentColumnNumber;
         }
         //    Bracketed C references are relative to the current column
-        if ($columnReference[0] === '[') {
+        if (is_string($columnReference) && $columnReference[0] === '[') {
             $columnReference = $currentColumnNumber + trim($columnReference, '[]');
         }
 
@@ -47,6 +47,52 @@ class AddressHelper
         return $A1CellReference;
     }
 
+    /**
+     * Converts a formula that uses R1C1 format cell address to an A1 format cell address.
+     */
+    public static function convertFormulaToA1(
+        string $formula,
+        int $currentRowNumber = 1,
+        int $currentColumnNumber = 1
+    ): string {
+        if (substr($formula, 0, 3) == 'of:') {
+            $formula = substr($formula, 3);
+            $temp = explode('"', $formula);
+            $key = false;
+            foreach ($temp as &$value) {
+                //    Only replace in alternate array entries (i.e. non-quoted blocks)
+                if ($key = !$key) {
+                    $value = str_replace(['[.', '.', ']'], '', $value);
+                }
+            }
+        } else {
+            //    Convert R1C1 style references to A1 style references (but only when not quoted)
+            $temp = explode('"', $formula);
+            $key = false;
+            foreach ($temp as &$value) {
+                //    Only replace in alternate array entries (i.e. non-quoted blocks)
+                if ($key = !$key) {
+                    preg_match_all('/(R(\[?-?\d*\]?))(C(\[?-?\d*\]?))/', $value, $cellReferences, PREG_SET_ORDER + PREG_OFFSET_CAPTURE);
+                    //    Reverse the matches array, otherwise all our offsets will become incorrect if we modify our way
+                    //        through the formula from left to right. Reversing means that we work right to left.through
+                    //        the formula
+                    $cellReferences = array_reverse($cellReferences);
+                    //    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);
+                        $value = substr_replace($value, $A1CellReference, $cellReference[0][1], strlen($cellReference[0][0]));
+                    }
+                }
+            }
+        }
+        unset($value);
+        //    Then rebuild the formula string
+        $formula = implode('"', $temp);
+
+        return $formula;
+    }
+
     /**
      * Converts an A1 format cell address to an R1C1 format cell address.
      * If $currentRowNumber or $currentColumnNumber are provided, then the R1C1 address will be formatted as a relative address.
diff --git a/src/PhpSpreadsheet/Cell/Cell.php b/src/PhpSpreadsheet/Cell/Cell.php
index 74ed9268..5dee411b 100644
--- a/src/PhpSpreadsheet/Cell/Cell.php
+++ b/src/PhpSpreadsheet/Cell/Cell.php
@@ -265,6 +265,8 @@ class Cell
             } catch (Exception $ex) {
                 if (($ex->getMessage() === 'Unable to access External Workbook') && ($this->calculatedValue !== null)) {
                     return $this->calculatedValue; // Fallback for calculations referencing external files.
+                } elseif (strpos($ex->getMessage(), 'undefined name') !== false) {
+                    return \PhpOffice\PhpSpreadsheet\Calculation\Functions::NAME();
                 }
 
                 throw new \PhpOffice\PhpSpreadsheet\Calculation\Exception(
diff --git a/src/PhpSpreadsheet/DefinedName.php b/src/PhpSpreadsheet/DefinedName.php
new file mode 100644
index 00000000..dbadd4ce
--- /dev/null
+++ b/src/PhpSpreadsheet/DefinedName.php
@@ -0,0 +1,263 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet;
+
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+abstract class DefinedName
+{
+    protected const REGEXP_IDENTIFY_FORMULA = '[^_\p{N}\p{L}:, \$\'!]';
+
+    /**
+     * Name.
+     *
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * Worksheet on which the defined name can be resolved.
+     *
+     * @var Worksheet
+     */
+    protected $worksheet;
+
+    /**
+     * Value of the named object.
+     *
+     * @var string
+     */
+    protected $value;
+
+    /**
+     * Is the defined named local? (i.e. can only be used on $this->worksheet).
+     *
+     * @var bool
+     */
+    protected $localOnly;
+
+    /**
+     * Scope.
+     *
+     * @var Worksheet
+     */
+    protected $scope;
+
+    /**
+     * Whether this is a named range or a named formula.
+     *
+     * @var bool
+     */
+    protected $isFormula;
+
+    /**
+     * Create a new Defined Name.
+     */
+    public function __construct(
+        string $name,
+        ?Worksheet $worksheet = null,
+        ?string $value = null,
+        bool $localOnly = false,
+        ?Worksheet $scope = null
+    ) {
+        if ($worksheet === null) {
+            $worksheet = $scope;
+        }
+
+        // Set local members
+        $this->name = $name;
+        $this->worksheet = $worksheet;
+        $this->value = (string) $value;
+        $this->localOnly = $localOnly;
+        // If local only, then the scope will be set to worksheet unless a scope is explicitly set
+        $this->scope = ($localOnly === true) ? (($scope === null) ? $worksheet : $scope) : null;
+        // If the range string contains characters that aren't associated with the range definition (A-Z,1-9
+        //      for cell references, and $, or the range operators (colon comma or space), quotes and ! for
+        //      worksheet names
+        //  then this is treated as a named formula, and not a named range
+        $this->isFormula = self::testIfFormula($this->value);
+    }
+
+    /**
+     * Create a new defined name, either a range or a formula.
+     */
+    public static function createInstance(
+        string $name,
+        ?Worksheet $worksheet = null,
+        ?string $value = null,
+        bool $localOnly = false,
+        ?Worksheet $scope = null
+    ): self {
+        $value = (string) $value;
+        $isFormula = self::testIfFormula($value);
+        if ($isFormula) {
+            return new NamedFormula($name, $worksheet, $value, $localOnly, $scope);
+        }
+
+        return new NamedRange($name, $worksheet, $value, $localOnly, $scope);
+    }
+
+    public static function testIfFormula(string $value): bool
+    {
+        if (substr($value, 0, 1) === '=') {
+            $value = substr($value, 1);
+        }
+
+        if (is_numeric($value)) {
+            return true;
+        }
+
+        $segMatcher = false;
+        foreach (explode("'", $value) as $subVal) {
+            //    Only test in alternate array entries (the non-quoted blocks)
+            if (
+                ($segMatcher = !$segMatcher) &&
+                (preg_match('/' . self::REGEXP_IDENTIFY_FORMULA . '/miu', $subVal))
+            ) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get name.
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * Set name.
+     */
+    public function setName(string $name): self
+    {
+        if (!empty($name)) {
+            // Old title
+            $oldTitle = $this->name;
+
+            // Re-attach
+            if ($this->worksheet !== null) {
+                $this->worksheet->getParent()->removeNamedRange($this->name, $this->worksheet);
+            }
+            $this->name = $name;
+
+            if ($this->worksheet !== null) {
+                $this->worksheet->getParent()->addNamedRange($this);
+            }
+
+            // New title
+            $newTitle = $this->name;
+            ReferenceHelper::getInstance()->updateNamedFormulas($this->worksheet->getParent(), $oldTitle, $newTitle);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get worksheet.
+     */
+    public function getWorksheet(): ?Worksheet
+    {
+        return $this->worksheet;
+    }
+
+    /**
+     * Set worksheet.
+     */
+    public function setWorksheet(?Worksheet $value): self
+    {
+        $this->worksheet = $value;
+
+        return $this;
+    }
+
+    /**
+     * Get range or formula value.
+     */
+    public function getValue(): string
+    {
+        return $this->value;
+    }
+
+    /**
+     * Set range or formula  value.
+     */
+    public function setValue(string $value): self
+    {
+        $this->value = $value;
+
+        return $this;
+    }
+
+    /**
+     * Get localOnly.
+     */
+    public function getLocalOnly(): bool
+    {
+        return $this->localOnly;
+    }
+
+    /**
+     * Set localOnly.
+     */
+    public function setLocalOnly(bool $value): self
+    {
+        $this->localOnly = $value;
+        $this->scope = $value ? $this->worksheet : null;
+
+        return $this;
+    }
+
+    /**
+     * Get scope.
+     */
+    public function getScope(): ?Worksheet
+    {
+        return $this->scope;
+    }
+
+    /**
+     * Set scope.
+     */
+    public function setScope(?Worksheet $value): self
+    {
+        $this->scope = $value;
+        $this->localOnly = $value !== null;
+
+        return $this;
+    }
+
+    /**
+     * Identify whether this is a named range or a named formula.
+     */
+    public function isFormula(): bool
+    {
+        return $this->isFormula;
+    }
+
+    /**
+     * Resolve a named range to a regular cell range or formula.
+     */
+    public static function resolveName(string $pDefinedName, Worksheet $pSheet): ?self
+    {
+        return $pSheet->getParent()->getDefinedName($pDefinedName, $pSheet);
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
+}
diff --git a/src/PhpSpreadsheet/NamedFormula.php b/src/PhpSpreadsheet/NamedFormula.php
new file mode 100644
index 00000000..ffb1c9b4
--- /dev/null
+++ b/src/PhpSpreadsheet/NamedFormula.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet;
+
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class NamedFormula extends DefinedName
+{
+    /**
+     * Create a new Named Formula.
+     */
+    public function __construct(
+        string $name,
+        ?Worksheet $worksheet = null,
+        ?string $formula = null,
+        bool $localOnly = false,
+        ?Worksheet $scope = null
+    ) {
+        // Validate data
+        if (empty($formula)) {
+            throw new Exception('Tou must specify a Formula value for a Named Formula');
+        }
+        parent::__construct($name, $worksheet, $formula, $localOnly, $scope);
+    }
+
+    /**
+     * Get the formula value.
+     */
+    public function getFormula(): string
+    {
+        return $this->value;
+    }
+
+    /**
+     * Set the formula value.
+     */
+    public function setFormula(string $formula): self
+    {
+        if (!empty($formula)) {
+            $this->value = $formula;
+        }
+
+        return $this;
+    }
+}
diff --git a/src/PhpSpreadsheet/NamedRange.php b/src/PhpSpreadsheet/NamedRange.php
index 94fe8190..db9c5f12 100644
--- a/src/PhpSpreadsheet/NamedRange.php
+++ b/src/PhpSpreadsheet/NamedRange.php
@@ -2,234 +2,54 @@
 
 namespace PhpOffice\PhpSpreadsheet;
 
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 
-class NamedRange
+class NamedRange extends DefinedName
 {
     /**
-     * Range name.
-     *
-     * @var string
+     * Create a new Named Range.
      */
-    private $name;
-
-    /**
-     * Worksheet on which the named range can be resolved.
-     *
-     * @var Worksheet
-     */
-    private $worksheet;
-
-    /**
-     * Range of the referenced cells.
-     *
-     * @var string
-     */
-    private $range;
-
-    /**
-     * Is the named range local? (i.e. can only be used on $this->worksheet).
-     *
-     * @var bool
-     */
-    private $localOnly;
-
-    /**
-     * Scope.
-     *
-     * @var Worksheet
-     */
-    private $scope;
-
-    /**
-     * Create a new NamedRange.
-     *
-     * @param string $pName
-     * @param string $pRange
-     * @param bool $pLocalOnly
-     * @param null|Worksheet $pScope Scope. Only applies when $pLocalOnly = true. Null for global scope.
-     */
-    public function __construct($pName, Worksheet $pWorksheet, $pRange = 'A1', $pLocalOnly = false, $pScope = null)
-    {
-        // Validate data
-        if (($pName === null) || ($pWorksheet === null) || ($pRange === null)) {
-            throw new Exception('Parameters can not be null.');
+    public function __construct(
+        string $name,
+        ?Worksheet $worksheet = null,
+        string $range = 'A1',
+        bool $localOnly = false,
+        ?Worksheet $scope = null
+    ) {
+        if ($worksheet === null && $scope === null) {
+            throw new Exception('You must specify a worksheet or a scope for a Named Range');
         }
-
-        // Set local members
-        $this->name = $pName;
-        $this->worksheet = $pWorksheet;
-        $this->range = $pRange;
-        $this->localOnly = $pLocalOnly;
-        $this->scope = ($pLocalOnly == true) ? (($pScope == null) ? $pWorksheet : $pScope) : null;
+        parent::__construct($name, $worksheet, $range, $localOnly, $scope);
     }
 
     /**
-     * Get name.
-     *
-     * @return string
+     * Get the range value.
      */
-    public function getName()
+    public function getRange(): string
     {
-        return $this->name;
+        return $this->value;
     }
 
     /**
-     * Set name.
-     *
-     * @param string $value
-     *
-     * @return $this
+     * Set the range value.
      */
-    public function setName($value)
+    public function setRange(string $range): self
     {
-        if ($value !== null) {
-            // Old title
-            $oldTitle = $this->name;
-
-            // Re-attach
-            if ($this->worksheet !== null) {
-                $this->worksheet->getParent()->removeNamedRange($this->name, $this->worksheet);
-            }
-            $this->name = $value;
-
-            if ($this->worksheet !== null) {
-                $this->worksheet->getParent()->addNamedRange($this);
-            }
-
-            // New title
-            $newTitle = $this->name;
-            ReferenceHelper::getInstance()->updateNamedFormulas($this->worksheet->getParent(), $oldTitle, $newTitle);
+        if (!empty($range)) {
+            $this->value = $range;
         }
 
         return $this;
     }
 
-    /**
-     * Get worksheet.
-     *
-     * @return Worksheet
-     */
-    public function getWorksheet()
+    public function getCellsInRange(): array
     {
-        return $this->worksheet;
-    }
-
-    /**
-     * Set worksheet.
-     *
-     * @param Worksheet $value
-     *
-     * @return $this
-     */
-    public function setWorksheet(?Worksheet $value = null)
-    {
-        if ($value !== null) {
-            $this->worksheet = $value;
+        $range = $this->value;
+        if (substr($range, 0, 1) === '=') {
+            $range = substr($range, 1);
         }
 
-        return $this;
-    }
-
-    /**
-     * Get range.
-     *
-     * @return string
-     */
-    public function getRange()
-    {
-        return $this->range;
-    }
-
-    /**
-     * Set range.
-     *
-     * @param string $value
-     *
-     * @return $this
-     */
-    public function setRange($value)
-    {
-        if ($value !== null) {
-            $this->range = $value;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get localOnly.
-     *
-     * @return bool
-     */
-    public function getLocalOnly()
-    {
-        return $this->localOnly;
-    }
-
-    /**
-     * Set localOnly.
-     *
-     * @param bool $value
-     *
-     * @return $this
-     */
-    public function setLocalOnly($value)
-    {
-        $this->localOnly = $value;
-        $this->scope = $value ? $this->worksheet : null;
-
-        return $this;
-    }
-
-    /**
-     * Get scope.
-     *
-     * @return null|Worksheet
-     */
-    public function getScope()
-    {
-        return $this->scope;
-    }
-
-    /**
-     * Set scope.
-     *
-     * @return $this
-     */
-    public function setScope(?Worksheet $value = null)
-    {
-        $this->scope = $value;
-        $this->localOnly = $value != null;
-
-        return $this;
-    }
-
-    /**
-     * Resolve a named range to a regular cell range.
-     *
-     * @param string $pNamedRange Named range
-     * @param null|Worksheet $pSheet Scope. Use null for global scope
-     *
-     * @return NamedRange
-     */
-    public static function resolveRange($pNamedRange, Worksheet $pSheet)
-    {
-        return $pSheet->getParent()->getNamedRange($pNamedRange, $pSheet);
-    }
-
-    /**
-     * Implement PHP __clone to create a deep clone, not just a shallow copy.
-     */
-    public function __clone()
-    {
-        $vars = get_object_vars($this);
-        foreach ($vars as $key => $value) {
-            if (is_object($value)) {
-                $this->$key = clone $value;
-            } else {
-                $this->$key = $value;
-            }
-        }
+        return Coordinate::extractAllCellReferencesInRange($range);
     }
 }
diff --git a/src/PhpSpreadsheet/Reader/Gnumeric.php b/src/PhpSpreadsheet/Reader/Gnumeric.php
index 77c9bdf7..f4a44895 100644
--- a/src/PhpSpreadsheet/Reader/Gnumeric.php
+++ b/src/PhpSpreadsheet/Reader/Gnumeric.php
@@ -4,7 +4,7 @@ namespace PhpOffice\PhpSpreadsheet\Reader;
 
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
-use PhpOffice\PhpSpreadsheet\NamedRange;
+use PhpOffice\PhpSpreadsheet\DefinedName;
 use PhpOffice\PhpSpreadsheet\Reader\Gnumeric\PageSetup;
 use PhpOffice\PhpSpreadsheet\Reader\Security\XmlScanner;
 use PhpOffice\PhpSpreadsheet\ReferenceHelper;
@@ -736,18 +736,19 @@ class Gnumeric extends BaseReader
     {
         //    Loop through definedNames (global named ranges)
         if (isset($gnmXML->Names)) {
-            foreach ($gnmXML->Names->Name as $namedRange) {
-                $name = (string) $namedRange->name;
-                $range = (string) $namedRange->value;
-                if (stripos($range, '#REF!') !== false) {
+            foreach ($gnmXML->Names->Name as $definedName) {
+                $name = (string) $definedName->name;
+                $value = (string) $definedName->value;
+                if (stripos($value, '#REF!') !== false) {
                     continue;
                 }
 
-                $range = Worksheet::extractSheetTitle($range, true);
-                $range[0] = trim($range[0], "'");
-                if ($worksheet = $this->spreadsheet->getSheetByName($range[0])) {
-                    $extractedRange = str_replace('$', '', $range[1]);
-                    $this->spreadsheet->addNamedRange(new NamedRange($name, $worksheet, $extractedRange));
+                [$worksheetName] = Worksheet::extractSheetTitle($value, true);
+                $worksheetName = trim($worksheetName, "'");
+                $worksheet = $this->spreadsheet->getSheetByName($worksheetName);
+                // Worksheet might still be null if we're only loading selected sheets rather than the full spreadsheet
+                if ($worksheet !== null) {
+                    $this->spreadsheet->addDefinedName(DefinedName::createInstance($name, $worksheet, $value));
                 }
             }
         }
diff --git a/src/PhpSpreadsheet/Reader/Ods.php b/src/PhpSpreadsheet/Reader/Ods.php
index 74d65db8..4ceac653 100644
--- a/src/PhpSpreadsheet/Reader/Ods.php
+++ b/src/PhpSpreadsheet/Reader/Ods.php
@@ -11,6 +11,7 @@ use DOMNode;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\DefinedName;
 use PhpOffice\PhpSpreadsheet\Reader\Exception as ReaderException;
 use PhpOffice\PhpSpreadsheet\Reader\Ods\PageSettings;
 use PhpOffice\PhpSpreadsheet\Reader\Ods\Properties as DocumentProperties;
@@ -21,6 +22,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 XMLReader;
 use ZipArchive;
 
@@ -547,30 +549,7 @@ class Ods extends BaseReader
                                 if ($hasCalculatedValue) {
                                     $type = DataType::TYPE_FORMULA;
                                     $cellDataFormula = substr($cellDataFormula, strpos($cellDataFormula, ':=') + 1);
-                                    $temp = explode('"', $cellDataFormula);
-                                    $tKey = false;
-                                    foreach ($temp as &$value) {
-                                        // Only replace in alternate array entries (i.e. non-quoted blocks)
-                                        if ($tKey = !$tKey) {
-                                            // Cell range reference in another sheet
-                                            $value = preg_replace('/\[([^\.]+)\.([^\.]+):\.([^\.]+)\]/U', '$1!$2:$3', $value);
-
-                                            // Cell reference in another sheet
-                                            $value = preg_replace('/\[([^\.]+)\.([^\.]+)\]/U', '$1!$2', $value);
-
-                                            // Cell range reference
-                                            $value = preg_replace('/\[\.([^\.]+):\.([^\.]+)\]/U', '$1:$2', $value);
-
-                                            // Simple cell reference
-                                            $value = preg_replace('/\[\.([^\.]+)\]/U', '$1', $value);
-
-                                            $value = Calculation::translateSeparator(';', ',', $value, $inBraces);
-                                        }
-                                    }
-                                    unset($value);
-
-                                    // Then rebuild the formula string
-                                    $cellDataFormula = implode('"', $temp);
+                                    $cellDataFormula = $this->convertToExcelFormulaValue($cellDataFormula);
                                 }
 
                                 if ($cellData->hasAttributeNS($tableNs, 'number-columns-repeated')) {
@@ -662,8 +641,11 @@ class Ods extends BaseReader
                 $pageSettings->setPrintSettingsForWorksheet($spreadsheet->getActiveSheet(), $worksheetStyleName);
                 ++$worksheetID;
             }
-        }
 
+            $this->readDefinedRanges($spreadsheet, $workbookData, $tableNs);
+            $this->readDefinedExpressions($spreadsheet, $workbookData, $tableNs);
+        }
+        $spreadsheet->setActiveSheetIndex(0);
         // Return
         return $spreadsheet;
     }
@@ -715,4 +697,99 @@ class Ods extends BaseReader
 
         return $value;
     }
+
+    private function convertToExcelAddressValue(string $openOfficeAddress): string
+    {
+        $excelAddress = $openOfficeAddress;
+
+        // Cell range 3-d reference
+        // As we don't support 3-d ranges, we're just going to take a quick and dirty approach
+        //  and assume that the second worksheet reference is the same as the first
+        $excelAddress = preg_replace('/\$?([^\.]+)\.([^\.]+):\$?([^\.]+)\.([^\.]+)/miu', '$1!$2:$4', $excelAddress);
+        // Cell range reference in another sheet
+        $excelAddress = preg_replace('/\$?([^\.]+)\.([^\.]+):\.([^\.]+)/miu', '$1!$2:$3', $excelAddress);
+        // Cell reference in another sheet
+        $excelAddress = preg_replace('/\$?([^\.]+)\.([^\.]+)/miu', '$1!$2', $excelAddress);
+        // Cell range reference
+        $excelAddress = preg_replace('/\.([^\.]+):\.([^\.]+)/miu', '$1:$2', $excelAddress);
+        // Simple cell reference
+        $excelAddress = preg_replace('/\.([^\.]+)/miu', '$1', $excelAddress);
+
+        return $excelAddress;
+    }
+
+    private function convertToExcelFormulaValue(string $openOfficeFormula): string
+    {
+        $temp = explode('"', $openOfficeFormula);
+        $tKey = false;
+        foreach ($temp as &$value) {
+            // Only replace in alternate array entries (i.e. non-quoted blocks)
+            if ($tKey = !$tKey) {
+                // Cell range reference in another sheet
+                $value = preg_replace('/\[\$?([^\.]+)\.([^\.]+):\.([^\.]+)\]/miu', '$1!$2:$3', $value);
+                // Cell reference in another sheet
+                $value = preg_replace('/\[\$?([^\.]+)\.([^\.]+)\]/miu', '$1!$2', $value);
+                // Cell range reference
+                $value = preg_replace('/\[\.([^\.]+):\.([^\.]+)\]/miu', '$1:$2', $value);
+                // Simple cell reference
+                $value = preg_replace('/\[\.([^\.]+)\]/miu', '$1', $value);
+
+                $value = Calculation::translateSeparator(';', ',', $value, $inBraces);
+            }
+        }
+
+        // Then rebuild the formula string
+        $excelFormula = implode('"', $temp);
+
+        return $excelFormula;
+    }
+
+    /**
+     * Read any Named Ranges that are defined in this spreadsheet.
+     */
+    private function readDefinedRanges(Spreadsheet $spreadsheet, DOMElement $workbookData, string $tableNs): void
+    {
+        $namedRanges = $workbookData->getElementsByTagNameNS($tableNs, 'named-range');
+        foreach ($namedRanges as $definedNameElement) {
+            $definedName = $definedNameElement->getAttributeNS($tableNs, 'name');
+            $baseAddress = $definedNameElement->getAttributeNS($tableNs, 'base-cell-address');
+            $range = $definedNameElement->getAttributeNS($tableNs, 'cell-range-address');
+
+            $baseAddress = $this->convertToExcelAddressValue($baseAddress);
+            $range = $this->convertToExcelAddressValue($range);
+
+            $this->addDefinedName($spreadsheet, $baseAddress, $definedName, $range);
+        }
+    }
+
+    /**
+     * Read any Named Formulae that are defined in this spreadsheet.
+     */
+    private function readDefinedExpressions(Spreadsheet $spreadsheet, DOMElement $workbookData, string $tableNs): void
+    {
+        $namedExpressions = $workbookData->getElementsByTagNameNS($tableNs, 'named-expression');
+        foreach ($namedExpressions as $definedNameElement) {
+            $definedName = $definedNameElement->getAttributeNS($tableNs, 'name');
+            $baseAddress = $definedNameElement->getAttributeNS($tableNs, 'base-cell-address');
+            $expression = $definedNameElement->getAttributeNS($tableNs, 'expression');
+
+            $baseAddress = $this->convertToExcelAddressValue($baseAddress);
+            $expression = $this->convertToExcelFormulaValue($expression);
+
+            $this->addDefinedName($spreadsheet, $baseAddress, $definedName, $expression);
+        }
+    }
+
+    /**
+     * Assess scope and store the Defined Name.
+     */
+    private function addDefinedName(Spreadsheet $spreadsheet, string $baseAddress, string $definedName, string $value): void
+    {
+        [$sheetReference] = Worksheet::extractSheetTitle($baseAddress, true);
+        $worksheet = $spreadsheet->getSheetByName($sheetReference);
+        // Worksheet might still be null if we're only loading selected sheets rather than the full spreadsheet
+        if ($worksheet !== null) {
+            $spreadsheet->addDefinedName(DefinedName::createInstance((string) $definedName, $worksheet, $value));
+        }
+    }
 }
diff --git a/src/PhpSpreadsheet/Reader/Xlsx.php b/src/PhpSpreadsheet/Reader/Xlsx.php
index 381f107e..73f91852 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx.php
@@ -4,7 +4,7 @@ namespace PhpOffice\PhpSpreadsheet\Reader;
 
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Cell\Hyperlink;
-use PhpOffice\PhpSpreadsheet\NamedRange;
+use PhpOffice\PhpSpreadsheet\DefinedName;
 use PhpOffice\PhpSpreadsheet\Reader\Security\XmlScanner;
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx\AutoFilter;
 use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Chart;
@@ -1345,11 +1345,6 @@ class Xlsx extends BaseReader
                             foreach ($xmlWorkbook->definedNames->definedName as $definedName) {
                                 // Extract range
                                 $extractedRange = (string) $definedName;
-                                if (($spos = strpos($extractedRange, '!')) !== false) {
-                                    $extractedRange = substr($extractedRange, 0, $spos) . str_replace('$', '', substr($extractedRange, $spos));
-                                } else {
-                                    $extractedRange = str_replace('$', '', $extractedRange);
-                                }
 
                                 // Valid range?
                                 if (stripos((string) $definedName, '#REF!') !== false || $extractedRange == '') {
@@ -1367,39 +1362,40 @@ class Xlsx extends BaseReader
                                             break;
                                         default:
                                             if ($mapSheetId[(int) $definedName['localSheetId']] !== null) {
+                                                $range = Worksheet::extractSheetTitle((string) $definedName, true);
+                                                $scope = $excel->getSheet($mapSheetId[(int) $definedName['localSheetId']]);
                                                 if (strpos((string) $definedName, '!') !== false) {
-                                                    $range = Worksheet::extractSheetTitle((string) $definedName, true);
                                                     $range[0] = str_replace("''", "'", $range[0]);
                                                     $range[0] = str_replace("'", '', $range[0]);
-                                                    if ($worksheet = $docSheet->getParent()->getSheetByName($range[0])) {
-                                                        $extractedRange = str_replace('$', '', $range[1]);
-                                                        $scope = $docSheet->getParent()->getSheet($mapSheetId[(int) $definedName['localSheetId']]);
-                                                        $excel->addNamedRange(new NamedRange((string) $definedName['name'], $worksheet, $extractedRange, true, $scope));
+                                                    if ($worksheet = $excel->getSheetByName($range[0])) {
+                                                        $excel->addDefinedName(DefinedName::createInstance((string) $definedName['name'], $worksheet, $extractedRange, true, $scope));
+                                                    } else {
+                                                        $excel->addDefinedName(DefinedName::createInstance((string) $definedName['name'], $scope, $extractedRange, true, $scope));
                                                     }
+                                                } else {
+                                                    $excel->addDefinedName(DefinedName::createInstance((string) $definedName['name'], $scope, $extractedRange, true));
                                                 }
                                             }
 
                                             break;
                                     }
                                 } elseif (!isset($definedName['localSheetId'])) {
+                                    $definedRange = (string) $definedName;
                                     // "Global" definedNames
                                     $locatedSheet = null;
-                                    $extractedSheetName = '';
                                     if (strpos((string) $definedName, '!') !== false) {
+                                        // Modify range, and extract the first worksheet reference
+                                        // 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) $definedName, true);
-                                        $extractedSheetName = trim($extractedSheetName[0], "'");
+                                        [$extractedSheetName] = Worksheet::extractSheetTitle((string) $definedNameValueParts[0], true);
+                                        $extractedSheetName = trim($extractedSheetName, "'");
 
                                         // Locate sheet
                                         $locatedSheet = $excel->getSheetByName($extractedSheetName);
-
-                                        // Modify range
-                                        [$worksheetName, $extractedRange] = Worksheet::extractSheetTitle($extractedRange, true);
                                     }
 
-                                    if ($locatedSheet !== null) {
-                                        $excel->addNamedRange(new NamedRange((string) $definedName['name'], $locatedSheet, $extractedRange, false));
-                                    }
+                                    $excel->addDefinedName(DefinedName::createInstance((string) $definedName['name'], $locatedSheet, $definedRange, false));
                                 }
                             }
                         }
diff --git a/src/PhpSpreadsheet/Reader/Xml.php b/src/PhpSpreadsheet/Reader/Xml.php
index 5bf18465..6a526d02 100644
--- a/src/PhpSpreadsheet/Reader/Xml.php
+++ b/src/PhpSpreadsheet/Reader/Xml.php
@@ -2,8 +2,10 @@
 
 namespace PhpOffice\PhpSpreadsheet\Reader;
 
+use PhpOffice\PhpSpreadsheet\Cell\AddressHelper;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
+use PhpOffice\PhpSpreadsheet\DefinedName;
 use PhpOffice\PhpSpreadsheet\Document\Properties;
 use PhpOffice\PhpSpreadsheet\Reader\Security\XmlScanner;
 use PhpOffice\PhpSpreadsheet\Reader\Xml\PageSettings;
@@ -418,6 +420,20 @@ class Xml extends BaseReader
                 $spreadsheet->getActiveSheet()->setTitle($worksheetName, false, false);
             }
 
+            // locally scoped defined names
+            if (isset($worksheet->Names[0])) {
+                foreach ($worksheet->Names[0] as $definedName) {
+                    $definedName_ss = $definedName->attributes($namespaces['ss']);
+                    $name = (string) $definedName_ss['Name'];
+                    $definedValue = (string) $definedName_ss['RefersTo'];
+                    $convertedValue = AddressHelper::convertFormulaToA1($definedValue);
+                    if ($convertedValue[0] === '=') {
+                        $convertedValue = substr($convertedValue, 1);
+                    }
+                    $spreadsheet->addDefinedName(DefinedName::createInstance($name, $spreadsheet->getActiveSheet(), $convertedValue, true));
+                }
+            }
+
             $columnID = 'A';
             if (isset($worksheet->Table->Column)) {
                 foreach ($worksheet->Table->Column as $columnData) {
@@ -532,58 +548,7 @@ class Xml extends BaseReader
                             if ($hasCalculatedValue) {
                                 $type = DataType::TYPE_FORMULA;
                                 $columnNumber = Coordinate::columnIndexFromString($columnID);
-                                if (substr($cellDataFormula, 0, 3) == 'of:') {
-                                    $cellDataFormula = substr($cellDataFormula, 3);
-                                    $temp = explode('"', $cellDataFormula);
-                                    $key = false;
-                                    foreach ($temp as &$value) {
-                                        //    Only replace in alternate array entries (i.e. non-quoted blocks)
-                                        if ($key = !$key) {
-                                            $value = str_replace(['[.', '.', ']'], '', $value);
-                                        }
-                                    }
-                                } else {
-                                    //    Convert R1C1 style references to A1 style references (but only when not quoted)
-                                    $temp = explode('"', $cellDataFormula);
-                                    $key = false;
-                                    foreach ($temp as &$value) {
-                                        //    Only replace in alternate array entries (i.e. non-quoted blocks)
-                                        if ($key = !$key) {
-                                            preg_match_all('/(R(\[?-?\d*\]?))(C(\[?-?\d*\]?))/', $value, $cellReferences, PREG_SET_ORDER + PREG_OFFSET_CAPTURE);
-                                            //    Reverse the matches array, otherwise all our offsets will become incorrect if we modify our way
-                                            //        through the formula from left to right. Reversing means that we work right to left.through
-                                            //        the formula
-                                            $cellReferences = array_reverse($cellReferences);
-                                            //    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) {
-                                                $rowReference = $cellReference[2][0];
-                                                //    Empty R reference is the current row
-                                                if ($rowReference == '') {
-                                                    $rowReference = $rowID;
-                                                }
-                                                //    Bracketed R references are relative to the current row
-                                                if ($rowReference[0] == '[') {
-                                                    $rowReference = $rowID + trim($rowReference, '[]');
-                                                }
-                                                $columnReference = $cellReference[4][0];
-                                                //    Empty C reference is the current column
-                                                if ($columnReference == '') {
-                                                    $columnReference = $columnNumber;
-                                                }
-                                                //    Bracketed C references are relative to the current column
-                                                if (is_string($columnReference) && $columnReference[0] == '[') {
-                                                    $columnReference = $columnNumber + trim($columnReference, '[]');
-                                                }
-                                                $A1CellReference = Coordinate::stringFromColumnIndex($columnReference) . $rowReference;
-                                                $value = substr_replace($value, $A1CellReference, $cellReference[0][1], strlen($cellReference[0][0]));
-                                            }
-                                        }
-                                    }
-                                }
-                                unset($value);
-                                //    Then rebuild the formula string
-                                $cellDataFormula = implode('"', $temp);
+                                $cellDataFormula = AddressHelper::convertFormulaToA1($cellDataFormula, $rowID, $columnNumber);
                             }
 
                             $spreadsheet->getActiveSheet()->getCell($columnID . $rowID)->setValueExplicit((($hasCalculatedValue) ? $cellDataFormula : $cellValue), $type);
@@ -638,6 +603,21 @@ class Xml extends BaseReader
             ++$worksheetID;
         }
 
+        // Globally scoped defined names
+        $activeWorksheet = $spreadsheet->setActiveSheetIndex(0);
+        if (isset($xml->Names[0])) {
+            foreach ($xml->Names[0] as $definedName) {
+                $definedName_ss = $definedName->attributes($namespaces['ss']);
+                $name = (string) $definedName_ss['Name'];
+                $definedValue = (string) $definedName_ss['RefersTo'];
+                $convertedValue = AddressHelper::convertFormulaToA1($definedValue);
+                if ($convertedValue[0] === '=') {
+                    $convertedValue = substr($convertedValue, 1);
+                }
+                $spreadsheet->addDefinedName(DefinedName::createInstance($name, $activeWorksheet, $convertedValue));
+            }
+        }
+
         // Return
         return $spreadsheet;
     }
diff --git a/src/PhpSpreadsheet/ReferenceHelper.php b/src/PhpSpreadsheet/ReferenceHelper.php
index 5809e3d4..9205b76e 100644
--- a/src/PhpSpreadsheet/ReferenceHelper.php
+++ b/src/PhpSpreadsheet/ReferenceHelper.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
@@ -604,11 +605,11 @@ class ReferenceHelper
             }
         }
 
-        // Update workbook: named ranges
-        if (count($pSheet->getParent()->getNamedRanges()) > 0) {
-            foreach ($pSheet->getParent()->getNamedRanges() as $namedRange) {
-                if ($namedRange->getWorksheet()->getHashCode() == $pSheet->getHashCode()) {
-                    $namedRange->setRange($this->updateCellReference($namedRange->getRange(), $pBefore, $pNumCols, $pNumRows));
+        // Update workbook: define names
+        if (count($pSheet->getParent()->getDefinedNames()) > 0) {
+            foreach ($pSheet->getParent()->getDefinedNames() as $definedName) {
+                if ($definedName->getWorksheet()->getHashCode() === $pSheet->getHashCode()) {
+                    $definedName->setValue($this->updateCellReference($definedName->getValue(), $pBefore, $pNumCols, $pNumRows));
                 }
             }
         }
@@ -758,6 +759,141 @@ class ReferenceHelper
         return implode('"', $formulaBlocks);
     }
 
+    /**
+     * Update all cell references within a formula, irrespective of worksheet.
+     */
+    public function updateFormulaReferencesAnyWorksheet(string $formula = '', int $insertColumns = 0, int $insertRows = 0): string
+    {
+        $formula = $this->updateCellReferencesAllWorksheets($formula, $insertColumns, $insertRows);
+
+        if ($insertColumns !== 0) {
+            $formula = $this->updateColumnRangesAllWorksheets($formula, $insertColumns);
+        }
+
+        if ($insertRows !== 0) {
+            $formula = $this->updateRowRangesAllWorksheets($formula, $insertRows);
+        }
+
+        return $formula;
+    }
+
+    private function updateCellReferencesAllWorksheets(string $formula, int $insertColumns, int $insertRows): string
+    {
+        $splitCount = preg_match_all(
+            '/' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '/mui',
+            $formula,
+            $splitRanges,
+            PREG_OFFSET_CAPTURE
+        );
+
+        $columnLengths = array_map('strlen', array_column($splitRanges[6], 0));
+        $rowLengths = array_map('strlen', array_column($splitRanges[7], 0));
+        $columnOffsets = array_column($splitRanges[6], 1);
+        $rowOffsets = array_column($splitRanges[7], 1);
+
+        $columns = $splitRanges[6];
+        $rows = $splitRanges[7];
+
+        while ($splitCount > 0) {
+            --$splitCount;
+            $columnLength = $columnLengths[$splitCount];
+            $rowLength = $rowLengths[$splitCount];
+            $columnOffset = $columnOffsets[$splitCount];
+            $rowOffset = $rowOffsets[$splitCount];
+            $column = $columns[$splitCount][0];
+            $row = $rows[$splitCount][0];
+
+            if (!empty($column) && $column[0] !== '$') {
+                $column = Coordinate::stringFromColumnIndex(Coordinate::columnIndexFromString($column) + $insertColumns);
+                $formula = substr($formula, 0, $columnOffset) . $column . substr($formula, $columnOffset + $columnLength);
+            }
+            if (!empty($row) && $row[0] !== '$') {
+                $row += $insertRows;
+                $formula = substr($formula, 0, $rowOffset) . $row . substr($formula, $rowOffset + $rowLength);
+            }
+        }
+
+        return $formula;
+    }
+
+    private function updateColumnRangesAllWorksheets(string $formula, int $insertColumns): string
+    {
+        $splitCount = preg_match_all(
+            '/' . Calculation::CALCULATION_REGEXP_COLUMNRANGE_RELATIVE . '/mui',
+            $formula,
+            $splitRanges,
+            PREG_OFFSET_CAPTURE
+        );
+
+        $fromColumnLengths = array_map('strlen', array_column($splitRanges[1], 0));
+        $fromColumnOffsets = array_column($splitRanges[1], 1);
+        $toColumnLengths = array_map('strlen', array_column($splitRanges[2], 0));
+        $toColumnOffsets = array_column($splitRanges[2], 1);
+
+        $fromColumns = $splitRanges[1];
+        $toColumns = $splitRanges[2];
+
+        while ($splitCount > 0) {
+            --$splitCount;
+            $fromColumnLength = $fromColumnLengths[$splitCount];
+            $toColumnLength = $toColumnLengths[$splitCount];
+            $fromColumnOffset = $fromColumnOffsets[$splitCount];
+            $toColumnOffset = $toColumnOffsets[$splitCount];
+            $fromColumn = $fromColumns[$splitCount][0];
+            $toColumn = $toColumns[$splitCount][0];
+
+            if (!empty($fromColumn) && $fromColumn[0] !== '$') {
+                $fromColumn = Coordinate::stringFromColumnIndex(Coordinate::columnIndexFromString($fromColumn) + $insertColumns);
+                $formula = substr($formula, 0, $fromColumnOffset) . $fromColumn . substr($formula, $fromColumnOffset + $fromColumnLength);
+            }
+            if (!empty($toColumn) && $toColumn[0] !== '$') {
+                $toColumn = Coordinate::stringFromColumnIndex(Coordinate::columnIndexFromString($toColumn) + $insertColumns);
+                $formula = substr($formula, 0, $toColumnOffset) . $toColumn . substr($formula, $toColumnOffset + $toColumnLength);
+            }
+        }
+
+        return $formula;
+    }
+
+    private function updateRowRangesAllWorksheets(string $formula, int $insertRows): string
+    {
+        $splitCount = preg_match_all(
+            '/' . Calculation::CALCULATION_REGEXP_ROWRANGE_RELATIVE . '/mui',
+            $formula,
+            $splitRanges,
+            PREG_OFFSET_CAPTURE
+        );
+
+        $fromRowLengths = array_map('strlen', array_column($splitRanges[1], 0));
+        $fromRowOffsets = array_column($splitRanges[1], 1);
+        $toRowLengths = array_map('strlen', array_column($splitRanges[2], 0));
+        $toRowOffsets = array_column($splitRanges[2], 1);
+
+        $fromRows = $splitRanges[1];
+        $toRows = $splitRanges[2];
+
+        while ($splitCount > 0) {
+            --$splitCount;
+            $fromRowLength = $fromRowLengths[$splitCount];
+            $toRowLength = $toRowLengths[$splitCount];
+            $fromRowOffset = $fromRowOffsets[$splitCount];
+            $toRowOffset = $toRowOffsets[$splitCount];
+            $fromRow = $fromRows[$splitCount][0];
+            $toRow = $toRows[$splitCount][0];
+
+            if (!empty($fromRow) && $fromRow[0] !== '$') {
+                $fromRow += $insertRows;
+                $formula = substr($formula, 0, $fromRowOffset) . $fromRow . substr($formula, $fromRowOffset + $fromRowLength);
+            }
+            if (!empty($toRow) && $toRow[0] !== '$') {
+                $toRow += $insertRows;
+                $formula = substr($formula, 0, $toRowOffset) . $toRow . substr($formula, $toRowOffset + $toRowLength);
+            }
+        }
+
+        return $formula;
+    }
+
     /**
      * Update cell reference.
      *
diff --git a/src/PhpSpreadsheet/Spreadsheet.php b/src/PhpSpreadsheet/Spreadsheet.php
index 46e97852..19c11526 100644
--- a/src/PhpSpreadsheet/Spreadsheet.php
+++ b/src/PhpSpreadsheet/Spreadsheet.php
@@ -3,6 +3,7 @@
 namespace PhpOffice\PhpSpreadsheet;
 
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Style\Style;
 use PhpOffice\PhpSpreadsheet\Worksheet\Iterator;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
@@ -14,6 +15,9 @@ class Spreadsheet
     const VISIBILITY_HIDDEN = 'hidden';
     const VISIBILITY_VERY_HIDDEN = 'veryHidden';
 
+    private const DEFINED_NAME_IS_RANGE = false;
+    private const DEFINED_NAME_IS_FORMULA = true;
+
     private static $workbookViewVisibilityValues = [
         self::VISIBILITY_VISIBLE,
         self::VISIBILITY_HIDDEN,
@@ -67,7 +71,7 @@ class Spreadsheet
      *
      * @var NamedRange[]
      */
-    private $namedRanges = [];
+    private $definedNames = [];
 
     /**
      * CellXf supervisor.
@@ -482,8 +486,8 @@ class Spreadsheet
         // Create document security
         $this->security = new Document\Security();
 
-        // Set named ranges
-        $this->namedRanges = [];
+        // Set defined names
+        $this->definedNames = [];
 
         // Create the cellXf supervisor
         $this->cellXfSupervisor = new Style(true);
@@ -724,7 +728,7 @@ class Spreadsheet
     public function getIndex(Worksheet $pSheet)
     {
         foreach ($this->workSheetCollection as $key => $value) {
-            if ($value->getHashCode() == $pSheet->getHashCode()) {
+            if ($value->getHashCode() === $pSheet->getHashCode()) {
                 return $key;
             }
         }
@@ -868,54 +872,159 @@ class Spreadsheet
     }
 
     /**
-     * Get named ranges.
+     * Get an array of all Named Ranges.
      *
      * @return NamedRange[]
      */
-    public function getNamedRanges()
+    public function getNamedRanges(): array
     {
-        return $this->namedRanges;
+        return array_filter(
+            $this->definedNames,
+            function (DefinedName $definedName) {
+                return $definedName->isFormula() === self::DEFINED_NAME_IS_RANGE;
+            }
+        );
     }
 
     /**
-     * Add named range.
+     * Get an array of all Named Formulae.
      *
-     * @return bool
+     * @return NamedFormula[]
      */
-    public function addNamedRange(NamedRange $namedRange)
+    public function getNamedFormulae(): array
     {
-        if ($namedRange->getScope() == null) {
+        return array_filter(
+            $this->definedNames,
+            function (DefinedName $definedName) {
+                return $definedName->isFormula() === self::DEFINED_NAME_IS_FORMULA;
+            }
+        );
+    }
+
+    /**
+     * Get an array of all Defined Names (both named ranges and named formulae).
+     *
+     * @return DefinedName[]
+     */
+    public function getDefinedNames(): array
+    {
+        return $this->definedNames;
+    }
+
+    /**
+     * Add a named range.
+     * If a named range with this name already exists, then this will replace the existing value.
+     */
+    public function addNamedRange(NamedRange $namedRange): void
+    {
+        $this->addDefinedName($namedRange);
+    }
+
+    /**
+     * Add a named formula.
+     * If a named formula with this name already exists, then this will replace the existing value.
+     */
+    public function addNamedFormula(NamedFormula $namedFormula): void
+    {
+        $this->addDefinedName($namedFormula);
+    }
+
+    /**
+     * Add a defined name (either a named range or a named formula).
+     * If a defined named with this name already exists, then this will replace the existing value.
+     */
+    public function addDefinedName(DefinedName $definedName): void
+    {
+        $upperCaseName = StringHelper::strToUpper($definedName->getName());
+        if ($definedName->getScope() == null) {
             // global scope
-            $this->namedRanges[$namedRange->getName()] = $namedRange;
+            $this->definedNames[$upperCaseName] = $definedName;
         } else {
             // local scope
-            $this->namedRanges[$namedRange->getScope()->getTitle() . '!' . $namedRange->getName()] = $namedRange;
+            $this->definedNames[$definedName->getScope()->getTitle() . '!' . $upperCaseName] = $definedName;
         }
-
-        return true;
     }
 
     /**
      * Get named range.
      *
-     * @param string $namedRange
      * @param null|Worksheet $pSheet Scope. Use null for global scope
-     *
-     * @return null|NamedRange
      */
-    public function getNamedRange($namedRange, ?Worksheet $pSheet = null)
+    public function getNamedRange(string $namedRange, ?Worksheet $pSheet = null): ?NamedRange
     {
         $returnValue = null;
 
-        if ($namedRange != '' && ($namedRange !== null)) {
+        if ($namedRange !== '') {
+            $namedRange = StringHelper::strToUpper($namedRange);
+            // first look for global named range
+            $returnValue = $this->getGlobalDefinedNameByType($namedRange, self::DEFINED_NAME_IS_RANGE);
+            // then look for local named range (has priority over global named range if both names exist)
+            $returnValue = $this->getLocalDefinedNameByType($namedRange, self::DEFINED_NAME_IS_RANGE, $pSheet) ?: $returnValue;
+        }
+
+        return $returnValue instanceof NamedRange ? $returnValue : null;
+    }
+
+    /**
+     * Get named formula.
+     *
+     * @param null|Worksheet $pSheet Scope. Use null for global scope
+     */
+    public function getNamedFormula(string $namedFormula, ?Worksheet $pSheet = null): ?NamedFormula
+    {
+        $returnValue = null;
+
+        if ($namedFormula !== '') {
+            $namedFormula = StringHelper::strToUpper($namedFormula);
+            // first look for global named formula
+            $returnValue = $this->getGlobalDefinedNameByType($namedFormula, self::DEFINED_NAME_IS_FORMULA);
+            // then look for local named formula (has priority over global named formula if both names exist)
+            $returnValue = $this->getLocalDefinedNameByType($namedFormula, self::DEFINED_NAME_IS_FORMULA, $pSheet) ?: $returnValue;
+        }
+
+        return $returnValue instanceof NamedFormula ? $returnValue : null;
+    }
+
+    private function getGlobalDefinedNameByType(string $name, bool $type): ?DefinedName
+    {
+        if (isset($this->definedNames[$name]) && $this->definedNames[$name]->isFormula() === $type) {
+            return $this->definedNames[$name];
+        }
+
+        return null;
+    }
+
+    private function getLocalDefinedNameByType(string $name, bool $type, ?Worksheet $pSheet = null): ?DefinedName
+    {
+        if (
+            ($pSheet !== null) && isset($this->definedNames[$pSheet->getTitle() . '!' . $name])
+            && $this->definedNames[$pSheet->getTitle() . '!' . $name]->isFormula() === $type
+        ) {
+            return $this->definedNames[$pSheet->getTitle() . '!' . $name];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get named range.
+     *
+     * @param null|Worksheet $pSheet Scope. Use null for global scope
+     */
+    public function getDefinedName(string $definedName, ?Worksheet $pSheet = null): ?DefinedName
+    {
+        $returnValue = null;
+
+        if ($definedName !== '') {
+            $definedName = StringHelper::strToUpper($definedName);
             // first look for global defined name
-            if (isset($this->namedRanges[$namedRange])) {
-                $returnValue = $this->namedRanges[$namedRange];
+            if (isset($this->definedNames[$definedName])) {
+                $returnValue = $this->definedNames[$definedName];
             }
 
             // then look for local defined name (has priority over global defined name if both names exist)
-            if (($pSheet !== null) && isset($this->namedRanges[$pSheet->getTitle() . '!' . $namedRange])) {
-                $returnValue = $this->namedRanges[$pSheet->getTitle() . '!' . $namedRange];
+            if (($pSheet !== null) && isset($this->definedNames[$pSheet->getTitle() . '!' . $definedName])) {
+                $returnValue = $this->definedNames[$pSheet->getTitle() . '!' . $definedName];
             }
         }
 
@@ -925,20 +1034,55 @@ class Spreadsheet
     /**
      * Remove named range.
      *
-     * @param string $namedRange
      * @param null|Worksheet $pSheet scope: use null for global scope
      *
      * @return $this
      */
-    public function removeNamedRange($namedRange, ?Worksheet $pSheet = null)
+    public function removeNamedRange(string $namedRange, ?Worksheet $pSheet = null): self
     {
+        if ($this->getNamedRange($namedRange, $pSheet) === null) {
+            return $this;
+        }
+
+        return $this->removeDefinedName($namedRange, $pSheet);
+    }
+
+    /**
+     * Remove named formula.
+     *
+     * @param null|Worksheet $pSheet scope: use null for global scope
+     *
+     * @return $this
+     */
+    public function removeNamedFormula(string $namedFormula, ?Worksheet $pSheet = null): self
+    {
+        if ($this->getNamedFormula($namedFormula, $pSheet) === null) {
+            return $this;
+        }
+
+        return $this->removeDefinedName($namedFormula, $pSheet);
+    }
+
+    /**
+     * Remove defined name.
+     *
+     * @param null|Worksheet $pSheet scope: use null for global scope
+     *
+     * @return $this
+     */
+    public function removeDefinedName(string $definedName, ?Worksheet $pSheet = null): self
+    {
+        $definedName = StringHelper::strToUpper($definedName);
+
         if ($pSheet === null) {
-            if (isset($this->namedRanges[$namedRange])) {
-                unset($this->namedRanges[$namedRange]);
+            if (isset($this->definedNames[$definedName])) {
+                unset($this->definedNames[$definedName]);
             }
         } else {
-            if (isset($this->namedRanges[$pSheet->getTitle() . '!' . $namedRange])) {
-                unset($this->namedRanges[$pSheet->getTitle() . '!' . $namedRange]);
+            if (isset($this->definedNames[$pSheet->getTitle() . '!' . $definedName])) {
+                unset($this->definedNames[$pSheet->getTitle() . '!' . $definedName]);
+            } elseif (isset($this->definedNames[$definedName])) {
+                unset($this->definedNames[$definedName]);
             }
         }
 
@@ -1017,7 +1161,7 @@ class Spreadsheet
     public function getCellXfByHashCode($pValue)
     {
         foreach ($this->cellXfCollection as $cellXf) {
-            if ($cellXf->getHashCode() == $pValue) {
+            if ($cellXf->getHashCode() === $pValue) {
                 return $cellXf;
             }
         }
@@ -1132,7 +1276,7 @@ class Spreadsheet
     public function getCellStyleXfByHashCode($pValue)
     {
         foreach ($this->cellStyleXfCollection as $cellStyleXf) {
-            if ($cellStyleXf->getHashCode() == $pValue) {
+            if ($cellStyleXf->getHashCode() === $pValue) {
                 return $cellStyleXf;
             }
         }
diff --git a/src/PhpSpreadsheet/Worksheet/BaseDrawing.php b/src/PhpSpreadsheet/Worksheet/BaseDrawing.php
index 1b145a81..be2f23df 100644
--- a/src/PhpSpreadsheet/Worksheet/BaseDrawing.php
+++ b/src/PhpSpreadsheet/Worksheet/BaseDrawing.php
@@ -218,7 +218,7 @@ class BaseDrawing implements IComparable
                 $iterator = $this->worksheet->getDrawingCollection()->getIterator();
 
                 while ($iterator->valid()) {
-                    if ($iterator->current()->getHashCode() == $this->getHashCode()) {
+                    if ($iterator->current()->getHashCode() === $this->getHashCode()) {
                         $this->worksheet->getDrawingCollection()->offsetUnset($iterator->key());
                         $this->worksheet = null;
 
diff --git a/src/PhpSpreadsheet/Worksheet/Worksheet.php b/src/PhpSpreadsheet/Worksheet/Worksheet.php
index 3acab637..19833b71 100644
--- a/src/PhpSpreadsheet/Worksheet/Worksheet.php
+++ b/src/PhpSpreadsheet/Worksheet/Worksheet.php
@@ -13,9 +13,9 @@ use PhpOffice\PhpSpreadsheet\Chart\Chart;
 use PhpOffice\PhpSpreadsheet\Collection\Cells;
 use PhpOffice\PhpSpreadsheet\Collection\CellsFactory;
 use PhpOffice\PhpSpreadsheet\Comment;
+use PhpOffice\PhpSpreadsheet\DefinedName;
 use PhpOffice\PhpSpreadsheet\Exception;
 use PhpOffice\PhpSpreadsheet\IComparable;
-use PhpOffice\PhpSpreadsheet\NamedRange;
 use PhpOffice\PhpSpreadsheet\ReferenceHelper;
 use PhpOffice\PhpSpreadsheet\RichText\RichText;
 use PhpOffice\PhpSpreadsheet\Shared;
@@ -797,9 +797,9 @@ class Worksheet implements IComparable
     public function rebindParent(Spreadsheet $parent)
     {
         if ($this->parent !== null) {
-            $namedRanges = $this->parent->getNamedRanges();
-            foreach ($namedRanges as $namedRange) {
-                $parent->addNamedRange($namedRange);
+            $definedNames = $this->parent->getDefinedNames();
+            foreach ($definedNames as $definedName) {
+                $parent->addDefinedName($definedName);
             }
 
             $this->parent->removeSheetByIndex(
@@ -1192,11 +1192,11 @@ class Worksheet implements IComparable
         // Named range?
         if (
             (!preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $pCoordinate, $matches)) &&
-            (preg_match('/^' . Calculation::CALCULATION_REGEXP_NAMEDRANGE . '$/i', $pCoordinate, $matches))
+            (preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/i', $pCoordinate, $matches))
         ) {
-            $namedRange = NamedRange::resolveRange($pCoordinate, $this);
+            $namedRange = DefinedName::resolveName($pCoordinate, $this);
             if ($namedRange !== null) {
-                $pCoordinate = $namedRange->getRange();
+                $pCoordinate = $namedRange->getValue();
 
                 return $namedRange->getWorksheet()->getCell($pCoordinate, $createIfNotExists);
             }
@@ -1292,11 +1292,11 @@ class Worksheet implements IComparable
         // Named range?
         if (
             (!preg_match('/^' . Calculation::CALCULATION_REGEXP_CELLREF . '$/i', $pCoordinate, $matches)) &&
-            (preg_match('/^' . Calculation::CALCULATION_REGEXP_NAMEDRANGE . '$/i', $pCoordinate, $matches))
+            (preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/i', $pCoordinate, $matches))
         ) {
-            $namedRange = NamedRange::resolveRange($pCoordinate, $this);
+            $namedRange = DefinedName::resolveName($pCoordinate, $this);
             if ($namedRange !== null) {
-                $pCoordinate = $namedRange->getRange();
+                $pCoordinate = $namedRange->getValue();
                 if ($this->getHashCode() != $namedRange->getWorksheet()->getHashCode()) {
                     if (!$namedRange->getLocalOnly()) {
                         return $namedRange->getWorksheet()->cellExists($pCoordinate);
@@ -2564,10 +2564,10 @@ class Worksheet implements IComparable
      */
     public function namedRangeToArray($pNamedRange, $nullValue = null, $calculateFormulas = true, $formatData = true, $returnCellRef = false)
     {
-        $namedRange = NamedRange::resolveRange($pNamedRange, $this);
+        $namedRange = DefinedName::resolveName($pNamedRange, $this);
         if ($namedRange !== null) {
             $pWorkSheet = $namedRange->getWorksheet();
-            $pCellRange = $namedRange->getRange();
+            $pCellRange = $namedRange->getValue();
 
             return $pWorkSheet->rangeToArray($pCellRange, $nullValue, $calculateFormulas, $formatData, $returnCellRef);
         }
diff --git a/src/PhpSpreadsheet/Writer/Ods/Content.php b/src/PhpSpreadsheet/Writer/Ods/Content.php
index 6588473a..96e66850 100644
--- a/src/PhpSpreadsheet/Writer/Ods/Content.php
+++ b/src/PhpSpreadsheet/Writer/Ods/Content.php
@@ -12,6 +12,7 @@ use PhpOffice\PhpSpreadsheet\Style\Font;
 use PhpOffice\PhpSpreadsheet\Worksheet\Row;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use PhpOffice\PhpSpreadsheet\Writer\Exception;
+use PhpOffice\PhpSpreadsheet\Writer\Ods;
 use PhpOffice\PhpSpreadsheet\Writer\Ods\Cell\Comment;
 
 /**
@@ -23,6 +24,18 @@ class Content extends WriterPart
     const NUMBER_ROWS_REPEATED_MAX = 1048576;
     const CELL_STYLE_PREFIX = 'ce';
 
+    private $formulaConvertor;
+
+    /**
+     * Set parent Ods writer.
+     */
+    public function __construct(Ods $writer)
+    {
+        parent::__construct($writer);
+
+        $this->formulaConvertor = new Formula($this->getParentWriter()->getSpreadsheet()->getDefinedNames());
+    }
+
     /**
      * Write content.xml to XML format.
      *
@@ -90,7 +103,9 @@ class Content extends WriterPart
 
         $this->writeSheets($objWriter);
 
-        $objWriter->writeElement('table:named-expressions');
+        // Defined names (ranges and formulae)
+        (new NamedExpressions($objWriter, $this->getParentWriter()->getSpreadsheet(), $this->formulaConvertor))->write();
+
         $objWriter->endElement();
         $objWriter->endElement();
         $objWriter->endElement();
@@ -193,7 +208,7 @@ class Content extends WriterPart
                             // don't do anything
                         }
                     }
-                    $objWriter->writeAttribute('table:formula', 'of:' . $cell->getValue());
+                    $objWriter->writeAttribute('table:formula', $this->formulaConvertor->convertFormula($cell->getValue()));
                     if (is_numeric($formulaValue)) {
                         $objWriter->writeAttribute('office:value-type', 'float');
                     } else {
diff --git a/src/PhpSpreadsheet/Writer/Ods/Formula.php b/src/PhpSpreadsheet/Writer/Ods/Formula.php
new file mode 100644
index 00000000..db766fb4
--- /dev/null
+++ b/src/PhpSpreadsheet/Writer/Ods/Formula.php
@@ -0,0 +1,119 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Ods;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\DefinedName;
+
+class Formula
+{
+    private $definedNames = [];
+
+    /**
+     * @param DefinedName[] $definedNames
+     */
+    public function __construct(array $definedNames)
+    {
+        foreach ($definedNames as $definedName) {
+            $this->definedNames[] = $definedName->getName();
+        }
+    }
+
+    public function convertFormula(string $formula, string $worksheetName = ''): string
+    {
+        $formula = $this->convertCellReferences($formula, $worksheetName);
+        $formula = $this->convertDefinedNames($formula);
+
+        if (substr($formula, 0, 1) !== '=') {
+            $formula = '=' . $formula;
+        }
+
+        return 'of:' . $formula;
+    }
+
+    private function convertDefinedNames(string $formula): string
+    {
+        $splitCount = preg_match_all(
+            '/' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '/mui',
+            $formula,
+            $splitRanges,
+            PREG_OFFSET_CAPTURE
+        );
+
+        $lengths = array_map('strlen', array_column($splitRanges[0], 0));
+        $offsets = array_column($splitRanges[0], 1);
+        $values = array_column($splitRanges[0], 0);
+
+        while ($splitCount > 0) {
+            --$splitCount;
+            $length = $lengths[$splitCount];
+            $offset = $offsets[$splitCount];
+            $value = $values[$splitCount];
+
+            if (in_array($value, $this->definedNames, true)) {
+                $formula = substr($formula, 0, $offset) . '$$' . $value . substr($formula, $offset + $length);
+            }
+        }
+
+        return $formula;
+    }
+
+    private function convertCellReferences(string $formula, string $worksheetName): string
+    {
+        $splitCount = preg_match_all(
+            '/' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '/mui',
+            $formula,
+            $splitRanges,
+            PREG_OFFSET_CAPTURE
+        );
+
+        $lengths = array_map('strlen', array_column($splitRanges[0], 0));
+        $offsets = array_column($splitRanges[0], 1);
+
+        $worksheets = $splitRanges[2];
+        $columns = $splitRanges[6];
+        $rows = $splitRanges[7];
+
+        // Replace any commas in the formula with semi-colons for Ods
+        // If by chance there are commas in worksheet names, then they will be "fixed" again in the loop
+        //    because we've already extracted worksheet names with our preg_match_all()
+        $formula = str_replace(',', ';', $formula);
+        while ($splitCount > 0) {
+            --$splitCount;
+            $length = $lengths[$splitCount];
+            $offset = $offsets[$splitCount];
+            $worksheet = $worksheets[$splitCount][0];
+            $column = $columns[$splitCount][0];
+            $row = $rows[$splitCount][0];
+
+            $newRange = '';
+            if (empty($worksheet)) {
+                if (($offset === 0) || ($formula[$offset - 1] !== ':')) {
+                    // We need a worksheet
+                    $worksheet = $worksheetName;
+                }
+            } else {
+                $worksheet = str_replace("''", "'", trim($worksheet, "'"));
+            }
+            if (!empty($worksheet)) {
+                $newRange = "['" . str_replace("'", "''", $worksheet) . "'";
+            } elseif (substr($formula, $offset - 1, 1) !== ':') {
+                $newRange = '[';
+            }
+            $newRange .= '.';
+
+            if (!empty($column)) {
+                $newRange .= $column;
+            }
+            if (!empty($row)) {
+                $newRange .= $row;
+            }
+            // close the wrapping [] unless this is the first part of a range
+            $newRange .= substr($formula, $offset + $length, 1) !== ':' ? ']' : '';
+
+            $formula = substr($formula, 0, $offset) . $newRange . substr($formula, $offset + $length);
+        }
+
+        return $formula;
+    }
+}
diff --git a/src/PhpSpreadsheet/Writer/Ods/NamedExpressions.php b/src/PhpSpreadsheet/Writer/Ods/NamedExpressions.php
new file mode 100644
index 00000000..9edc5c64
--- /dev/null
+++ b/src/PhpSpreadsheet/Writer/Ods/NamedExpressions.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Ods;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\DefinedName;
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class NamedExpressions
+{
+    private $objWriter;
+
+    private $spreadsheet;
+
+    private $formulaConvertor;
+
+    public function __construct(XMLWriter $objWriter, Spreadsheet $spreadsheet, $formulaConvertor)
+    {
+        $this->objWriter = $objWriter;
+        $this->spreadsheet = $spreadsheet;
+        $this->formulaConvertor = $formulaConvertor;
+    }
+
+    public function write(): void
+    {
+        $this->objWriter->startElement('table:named-expressions');
+        $this->writeExpressions();
+        $this->objWriter->endElement();
+    }
+
+    private function writeExpressions(): void
+    {
+        $definedNames = $this->spreadsheet->getDefinedNames();
+
+        foreach ($definedNames as $definedName) {
+            if ($definedName->isFormula()) {
+                $this->objWriter->startElement('table:named-expression');
+                $this->writeNamedFormula($definedName, $this->spreadsheet->getActiveSheet());
+            } else {
+                $this->objWriter->startElement('table:named-range');
+                $this->writeNamedRange($definedName);
+            }
+
+            $this->objWriter->endElement();
+        }
+    }
+
+    private function writeNamedFormula(DefinedName $definedName, Worksheet $defaultWorksheet): void
+    {
+        $this->objWriter->writeAttribute('table:name', $definedName->getName());
+        $this->objWriter->writeAttribute(
+            'table:expression',
+            $this->formulaConvertor->convertFormula($definedName->getValue(), $definedName->getWorksheet()->getTitle())
+        );
+        $this->objWriter->writeAttribute('table:base-cell-address', $this->convertAddress(
+            $definedName,
+            "'" . (($definedName->getWorksheet() !== null) ? $definedName->getWorksheet()->getTitle() : $defaultWorksheet->getTitle()) . "'!\$A\$1"
+        ));
+    }
+
+    private function writeNamedRange(DefinedName $definedName): void
+    {
+        $this->objWriter->writeAttribute('table:name', $definedName->getName());
+        $this->objWriter->writeAttribute('table:base-cell-address', $this->convertAddress(
+            $definedName,
+            "'" . $definedName->getWorksheet()->getTitle() . "'!\$A\$1"
+        ));
+        $this->objWriter->writeAttribute('table:cell-range-address', $this->convertAddress($definedName, $definedName->getValue()));
+    }
+
+    private function convertAddress(DefinedName $definedName, string $address): string
+    {
+        $splitCount = preg_match_all(
+            '/' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '/mui',
+            $address,
+            $splitRanges,
+            PREG_OFFSET_CAPTURE
+        );
+
+        $lengths = array_map('strlen', array_column($splitRanges[0], 0));
+        $offsets = array_column($splitRanges[0], 1);
+
+        $worksheets = $splitRanges[2];
+        $columns = $splitRanges[6];
+        $rows = $splitRanges[7];
+
+        while ($splitCount > 0) {
+            --$splitCount;
+            $length = $lengths[$splitCount];
+            $offset = $offsets[$splitCount];
+            $worksheet = $worksheets[$splitCount][0];
+            $column = $columns[$splitCount][0];
+            $row = $rows[$splitCount][0];
+
+            $newRange = '';
+            if (empty($worksheet)) {
+                if (($offset === 0) || ($address[$offset - 1] !== ':')) {
+                    // We need a worksheet
+                    $worksheet = $definedName->getWorksheet()->getTitle();
+                }
+            } else {
+                $worksheet = str_replace("''", "'", trim($worksheet, "'"));
+            }
+            if (!empty($worksheet)) {
+                $newRange = "'" . str_replace("'", "''", $worksheet) . "'.";
+            }
+
+            if (!empty($column)) {
+                $newRange .= $column;
+            }
+            if (!empty($row)) {
+                $newRange .= $row;
+            }
+
+            $address = substr($address, 0, $offset) . $newRange . substr($address, $offset + $length);
+        }
+
+        if (substr($address, 0, 1) === '=') {
+            $address = substr($address, 1);
+        }
+
+        return $address;
+    }
+}
diff --git a/src/PhpSpreadsheet/Writer/Xls.php b/src/PhpSpreadsheet/Writer/Xls.php
index 4f4b256a..c7c2e7d6 100644
--- a/src/PhpSpreadsheet/Writer/Xls.php
+++ b/src/PhpSpreadsheet/Writer/Xls.php
@@ -108,7 +108,7 @@ class Xls extends BaseWriter
     {
         $this->spreadsheet = $spreadsheet;
 
-        $this->parser = new Xls\Parser();
+        $this->parser = new Xls\Parser($spreadsheet);
     }
 
     /**
diff --git a/src/PhpSpreadsheet/Writer/Xls/Parser.php b/src/PhpSpreadsheet/Writer/Xls/Parser.php
index e3b01260..f89957a4 100644
--- a/src/PhpSpreadsheet/Writer/Xls/Parser.php
+++ b/src/PhpSpreadsheet/Writer/Xls/Parser.php
@@ -2,7 +2,9 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Xls;
 
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet as PhpspreadsheetWorksheet;
 use PhpOffice\PhpSpreadsheet\Writer\Exception as WriterException;
 
@@ -78,7 +80,7 @@ class Parser
      *
      * @var string
      */
-    private $parseTree;
+    public $parseTree;
 
     /**
      * Array of external sheets.
@@ -467,11 +469,15 @@ class Parser
         'BAHTTEXT' => [368, 1, 0, 0],
     ];
 
+    private $spreadsheet;
+
     /**
      * The class constructor.
      */
-    public function __construct()
+    public function __construct(Spreadsheet $spreadsheet)
     {
+        $this->spreadsheet = $spreadsheet;
+
         $this->currentCharacter = 0;
         $this->currentToken = ''; // The token we are working on.
         $this->formula = ''; // The formula to parse.
@@ -518,6 +524,8 @@ class Parser
         // match error codes
         } elseif (preg_match('/^#[A-Z0\\/]{3,5}[!?]{1}$/', $token) || $token == '#N/A') {
             return $this->convertError($token);
+        } elseif (preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/mui', $token) && $this->spreadsheet->getDefinedName($token) !== null) {
+            return $this->convertDefinedName($token);
         // commented so argument number can be processed correctly. See toReversePolish().
         /*elseif (preg_match("/[A-Z0-9\xc0-\xdc\.]+/", $token))
         {
@@ -739,6 +747,26 @@ class Parser
         return pack('C', 0xFF);
     }
 
+    private function convertDefinedName(string $name): void
+    {
+        if (strlen($name) > 255) {
+            throw new WriterException('Defined Name is too long');
+        }
+
+        $nameReference = 1;
+        foreach ($this->spreadsheet->getDefinedNames() as $definedName) {
+            if ($name === $definedName->getName()) {
+                break;
+            }
+            ++$nameReference;
+        }
+
+        $ptgRef = pack('Cvxx', $this->ptg['ptgName'], $nameReference);
+
+        throw new WriterException('Cannot yet write formulae with defined names to Xls');
+//        return $ptgRef;
+    }
+
     /**
      * Look up the REF index that corresponds to an external sheet name
      * (or range). If it doesn't exist yet add it to the workbook's references
@@ -1056,6 +1084,8 @@ class Parser
                 } elseif (preg_match("/^[A-Z0-9\xc0-\xdc\\.]+$/i", $token) && ($this->lookAhead === '(')) {
                     // if it's a function call
                     return $token;
+                } elseif (preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/miu', $token) && $this->spreadsheet->getDefinedName($token) !== null) {
+                    return $token;
                 } elseif (substr($token, -1) === ')') {
                     //    It's an argument of some description (e.g. a named range),
                     //        precise nature yet to be determined
@@ -1174,8 +1204,8 @@ class Parser
         $result = $this->term();
         while (
             ($this->currentToken == '+') ||
-               ($this->currentToken == '-') ||
-               ($this->currentToken == '^')
+            ($this->currentToken == '-') ||
+            ($this->currentToken == '^')
         ) {
             if ($this->currentToken == '+') {
                 $this->advance();
@@ -1219,7 +1249,7 @@ class Parser
         $result = $this->fact();
         while (
             ($this->currentToken == '*') ||
-               ($this->currentToken == '/')
+            ($this->currentToken == '/')
         ) {
             if ($this->currentToken == '*') {
                 $this->advance();
@@ -1277,7 +1307,7 @@ class Parser
             return $result;
         } elseif (
             preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+:(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+$/', $this->currentToken) ||
-                preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+\.\.(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+$/', $this->currentToken)
+            preg_match('/^(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+\.\.(\$)?[A-Ia-i]?[A-Za-z](\$)?\d+$/', $this->currentToken)
         ) {
             // if it's a range A1:B2 or $A$1:$B$2
             // must be an error?
@@ -1310,9 +1340,14 @@ class Parser
             $this->advance();
 
             return $result;
-        } elseif (preg_match("/^[A-Z0-9\xc0-\xdc\\.]+$/i", $this->currentToken)) {
+        } elseif (preg_match("/^[A-Z0-9\xc0-\xdc\\.]+$/i", $this->currentToken) && ($this->lookAhead === '(')) {
             // if it's a function call
             return $this->func();
+        } elseif (preg_match('/^' . Calculation::CALCULATION_REGEXP_DEFINEDNAME . '$/miu', $this->currentToken) && $this->spreadsheet->getDefinedName($this->currentToken) !== null) {
+            $result = $this->createTree('ptgName', $this->currentToken, '');
+            $this->advance();
+
+            return $result;
         }
 
         throw new WriterException('Syntax error: ' . $this->currentToken . ', lookahead: ' . $this->lookAhead . ', current char: ' . $this->currentCharacter);
diff --git a/src/PhpSpreadsheet/Writer/Xls/Workbook.php b/src/PhpSpreadsheet/Writer/Xls/Workbook.php
index d5f61bf2..27d3395f 100644
--- a/src/PhpSpreadsheet/Writer/Xls/Workbook.php
+++ b/src/PhpSpreadsheet/Writer/Xls/Workbook.php
@@ -2,7 +2,10 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Xls;
 
+use PHP_CodeSniffer\Tokenizers\PHP;
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\DefinedName;
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
@@ -521,6 +524,57 @@ class Workbook extends BIFFwriter
         $this->writeStyle();
     }
 
+    private function parseDefinedNameValue(DefinedName $pDefinedName): string
+    {
+        $definedRange = $pDefinedName->getValue();
+        $splitCount = preg_match_all(
+            '/' . Calculation::CALCULATION_REGEXP_CELLREF . '/mui',
+            $definedRange,
+            $splitRanges,
+            PREG_OFFSET_CAPTURE
+        );
+
+        $lengths = array_map('strlen', array_column($splitRanges[0], 0));
+        $offsets = array_column($splitRanges[0], 1);
+
+        $worksheets = $splitRanges[2];
+        $columns = $splitRanges[6];
+        $rows = $splitRanges[7];
+
+        while ($splitCount > 0) {
+            --$splitCount;
+            $length = $lengths[$splitCount];
+            $offset = $offsets[$splitCount];
+            $worksheet = $worksheets[$splitCount][0];
+            $column = $columns[$splitCount][0];
+            $row = $rows[$splitCount][0];
+
+            $newRange = '';
+            if (empty($worksheet)) {
+                if (($offset === 0) || ($definedRange[$offset - 1] !== ':')) {
+                    // We need a worksheet
+                    $worksheet = $pDefinedName->getWorksheet()->getTitle();
+                }
+            } else {
+                $worksheet = str_replace("''", "'", trim($worksheet, "'"));
+            }
+            if (!empty($worksheet)) {
+                $newRange = "'" . str_replace("'", "''", $worksheet) . "'!";
+            }
+
+            if (!empty($column)) {
+                $newRange .= "\${$column}";
+            }
+            if (!empty($row)) {
+                $newRange .= "\${$row}";
+            }
+
+            $definedRange = substr($definedRange, 0, $offset) . $newRange . substr($definedRange, $offset + $length);
+        }
+
+        return $definedRange;
+    }
+
     /**
      * Writes all the DEFINEDNAME records (BIFF8).
      * So far this is only used for repeating rows/columns (print titles) and print areas.
@@ -530,20 +584,11 @@ class Workbook extends BIFFwriter
         $chunk = '';
 
         // Named ranges
-        if (count($this->spreadsheet->getNamedRanges()) > 0) {
+        $definedNames = $this->spreadsheet->getDefinedNames();
+        if (count($definedNames) > 0) {
             // Loop named ranges
-            $namedRanges = $this->spreadsheet->getNamedRanges();
-            foreach ($namedRanges as $namedRange) {
-                // Create absolute coordinate
-                $range = Coordinate::splitRange($namedRange->getRange());
-                $iMax = count($range);
-                for ($i = 0; $i < $iMax; ++$i) {
-                    $range[$i][0] = '\'' . str_replace("'", "''", $namedRange->getWorksheet()->getTitle()) . '\'!' . Coordinate::absoluteCoordinate($range[$i][0]);
-                    if (isset($range[$i][1])) {
-                        $range[$i][1] = Coordinate::absoluteCoordinate($range[$i][1]);
-                    }
-                }
-                $range = Coordinate::buildRange($range); // e.g. Sheet1!$A$1:$B$2
+            foreach ($definedNames as $definedName) {
+                $range = $this->parseDefinedNameValue($definedName);
 
                 // parse formula
                 try {
@@ -555,14 +600,14 @@ class Workbook extends BIFFwriter
                         $formulaData = "\x3A" . substr($formulaData, 1);
                     }
 
-                    if ($namedRange->getLocalOnly()) {
+                    if ($definedName->getLocalOnly()) {
                         // local scope
-                        $scope = $this->spreadsheet->getIndex($namedRange->getScope()) + 1;
+                        $scope = $this->spreadsheet->getIndex($definedName->getScope()) + 1;
                     } else {
                         // global scope
                         $scope = 0;
                     }
-                    $chunk .= $this->writeData($this->writeDefinedNameBiff8($namedRange->getName(), $formulaData, $scope, false));
+                    $chunk .= $this->writeData($this->writeDefinedNameBiff8($definedName->getName(), $formulaData, $scope, false));
                 } catch (PhpSpreadsheetException $e) {
                     // do nothing
                 }
diff --git a/src/PhpSpreadsheet/Writer/Xls/Worksheet.php b/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
index a1c485c2..a1c258c0 100644
--- a/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
+++ b/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
@@ -825,7 +825,6 @@ class Worksheet extends BIFFwriter
     private function writeFormula($row, $col, $formula, $xfIndex, $calculatedValue)
     {
         $record = 0x0006; // Record identifier
-
         // Initialize possible additional value for STRING record that should be written after the FORMULA record?
         $stringValue = null;
 
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php b/src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php
new file mode 100644
index 00000000..8c3da827
--- /dev/null
+++ b/src/PhpSpreadsheet/Writer/Xlsx/DefinedNames.php
@@ -0,0 +1,223 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
+use PhpOffice\PhpSpreadsheet\DefinedName;
+use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class DefinedNames
+{
+    private $objWriter;
+
+    private $spreadsheet;
+
+    public function __construct(XMLWriter $objWriter, Spreadsheet $spreadsheet)
+    {
+        $this->objWriter = $objWriter;
+        $this->spreadsheet = $spreadsheet;
+    }
+
+    public function write(): void
+    {
+        // Write defined names
+        $this->objWriter->startElement('definedNames');
+
+        // Named ranges
+        if (count($this->spreadsheet->getDefinedNames()) > 0) {
+            // Named ranges
+            $this->writeNamedRangesAndFormulae();
+        }
+
+        // Other defined names
+        $sheetCount = $this->spreadsheet->getSheetCount();
+        for ($i = 0; $i < $sheetCount; ++$i) {
+            // NamedRange for autoFilter
+            $this->writeNamedRangeForAutofilter($this->spreadsheet->getSheet($i), $i);
+
+            // NamedRange for Print_Titles
+            $this->writeNamedRangeForPrintTitles($this->spreadsheet->getSheet($i), $i);
+
+            // NamedRange for Print_Area
+            $this->writeNamedRangeForPrintArea($this->spreadsheet->getSheet($i), $i);
+        }
+
+        $this->objWriter->endElement();
+    }
+
+    /**
+     * Write defined names.
+     */
+    private function writeNamedRangesAndFormulae(): void
+    {
+        // Loop named ranges
+        $definedNames = $this->spreadsheet->getDefinedNames();
+        foreach ($definedNames as $definedName) {
+            $this->writeDefinedName($definedName);
+        }
+    }
+
+    /**
+     * Write Defined Name for named range.
+     */
+    private function writeDefinedName(DefinedName $pDefinedName): void
+    {
+        // definedName for named range
+        $this->objWriter->startElement('definedName');
+        $this->objWriter->writeAttribute('name', $pDefinedName->getName());
+        if ($pDefinedName->getLocalOnly() && $pDefinedName->getScope() !== null) {
+            $this->objWriter->writeAttribute('localSheetId', $pDefinedName->getScope()->getParent()->getIndex($pDefinedName->getScope()));
+        }
+
+        $definedRange = $pDefinedName->getValue();
+        $splitCount = preg_match_all(
+            '/' . Calculation::CALCULATION_REGEXP_CELLREF_RELATIVE . '/mui',
+            $definedRange,
+            $splitRanges,
+            PREG_OFFSET_CAPTURE
+        );
+
+        $lengths = array_map('strlen', array_column($splitRanges[0], 0));
+        $offsets = array_column($splitRanges[0], 1);
+
+        $worksheets = $splitRanges[2];
+        $columns = $splitRanges[6];
+        $rows = $splitRanges[7];
+
+        while ($splitCount > 0) {
+            --$splitCount;
+            $length = $lengths[$splitCount];
+            $offset = $offsets[$splitCount];
+            $worksheet = $worksheets[$splitCount][0];
+            $column = $columns[$splitCount][0];
+            $row = $rows[$splitCount][0];
+
+            $newRange = '';
+            if (empty($worksheet)) {
+                if (($offset === 0) || ($definedRange[$offset - 1] !== ':')) {
+                    // We should have a worksheet
+                    $worksheet = $pDefinedName->getWorksheet()->getTitle();
+                }
+            } else {
+                $worksheet = str_replace("''", "'", trim($worksheet, "'"));
+            }
+            if (!empty($worksheet)) {
+                $newRange = "'" . str_replace("'", "''", $worksheet) . "'!";
+            }
+
+            if (!empty($column)) {
+                $newRange .= $column;
+            }
+            if (!empty($row)) {
+                $newRange .= $row;
+            }
+
+            $definedRange = substr($definedRange, 0, $offset) . $newRange . substr($definedRange, $offset + $length);
+        }
+
+        if (substr($definedRange, 0, 1) === '=') {
+            $definedRange = substr($definedRange, 1);
+        }
+
+        $this->objWriter->writeRawData($definedRange);
+
+        $this->objWriter->endElement();
+    }
+
+    /**
+     * Write Defined Name for autoFilter.
+     */
+    private function writeNamedRangeForAutofilter(Worksheet $pSheet, int $pSheetId = 0): void
+    {
+        // NamedRange for autoFilter
+        $autoFilterRange = $pSheet->getAutoFilter()->getRange();
+        if (!empty($autoFilterRange)) {
+            $this->objWriter->startElement('definedName');
+            $this->objWriter->writeAttribute('name', '_xlnm._FilterDatabase');
+            $this->objWriter->writeAttribute('localSheetId', $pSheetId);
+            $this->objWriter->writeAttribute('hidden', '1');
+
+            // Create absolute coordinate and write as raw text
+            $range = Coordinate::splitRange($autoFilterRange);
+            $range = $range[0];
+            //    Strip any worksheet ref so we can make the cell ref absolute
+            [$ws, $range[0]] = Worksheet::extractSheetTitle($range[0], true);
+
+            $range[0] = Coordinate::absoluteCoordinate($range[0]);
+            $range[1] = Coordinate::absoluteCoordinate($range[1]);
+            $range = implode(':', $range);
+
+            $this->objWriter->writeRawData('\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!' . $range);
+
+            $this->objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write Defined Name for PrintTitles.
+     */
+    private function writeNamedRangeForPrintTitles(Worksheet $pSheet, int $pSheetId = 0): void
+    {
+        // NamedRange for PrintTitles
+        if ($pSheet->getPageSetup()->isColumnsToRepeatAtLeftSet() || $pSheet->getPageSetup()->isRowsToRepeatAtTopSet()) {
+            $this->objWriter->startElement('definedName');
+            $this->objWriter->writeAttribute('name', '_xlnm.Print_Titles');
+            $this->objWriter->writeAttribute('localSheetId', $pSheetId);
+
+            // Setting string
+            $settingString = '';
+
+            // Columns to repeat
+            if ($pSheet->getPageSetup()->isColumnsToRepeatAtLeftSet()) {
+                $repeat = $pSheet->getPageSetup()->getColumnsToRepeatAtLeft();
+
+                $settingString .= '\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!$' . $repeat[0] . ':$' . $repeat[1];
+            }
+
+            // Rows to repeat
+            if ($pSheet->getPageSetup()->isRowsToRepeatAtTopSet()) {
+                if ($pSheet->getPageSetup()->isColumnsToRepeatAtLeftSet()) {
+                    $settingString .= ',';
+                }
+
+                $repeat = $pSheet->getPageSetup()->getRowsToRepeatAtTop();
+
+                $settingString .= '\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!$' . $repeat[0] . ':$' . $repeat[1];
+            }
+
+            $this->objWriter->writeRawData($settingString);
+
+            $this->objWriter->endElement();
+        }
+    }
+
+    /**
+     * Write Defined Name for PrintTitles.
+     */
+    private function writeNamedRangeForPrintArea(Worksheet $pSheet, int $pSheetId = 0): void
+    {
+        // NamedRange for PrintArea
+        if ($pSheet->getPageSetup()->isPrintAreaSet()) {
+            $this->objWriter->startElement('definedName');
+            $this->objWriter->writeAttribute('name', '_xlnm.Print_Area');
+            $this->objWriter->writeAttribute('localSheetId', $pSheetId);
+
+            // Print area
+            $printArea = Coordinate::splitRange($pSheet->getPageSetup()->getPrintArea());
+
+            $chunks = [];
+            foreach ($printArea as $printAreaRect) {
+                $printAreaRect[0] = Coordinate::absoluteReference($printAreaRect[0]);
+                $printAreaRect[1] = Coordinate::absoluteReference($printAreaRect[1]);
+                $chunks[] = '\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!' . implode(':', $printAreaRect);
+            }
+
+            $this->objWriter->writeRawData(implode(',', $chunks));
+
+            $this->objWriter->endElement();
+        }
+    }
+}
diff --git a/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php b/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php
index 88befd02..0a20ea9d 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx/Workbook.php
@@ -2,13 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 
-use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
-use PhpOffice\PhpSpreadsheet\NamedRange;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
-use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use PhpOffice\PhpSpreadsheet\Writer\Exception as WriterException;
+use PhpOffice\PhpSpreadsheet\Writer\Xlsx\DefinedNames as DefinedNamesWriter;
 
 class Workbook extends WriterPart
 {
@@ -55,7 +53,7 @@ class Workbook extends WriterPart
         $this->writeSheets($objWriter, $spreadsheet);
 
         // definedNames
-        $this->writeDefinedNames($objWriter, $spreadsheet);
+        (new DefinedNamesWriter($objWriter, $spreadsheet))->write();
 
         // calcPr
         $this->writeCalcPr($objWriter, $recalcRequired);
@@ -224,183 +222,4 @@ class Workbook extends WriterPart
             throw new WriterException('Invalid parameters passed.');
         }
     }
-
-    /**
-     * Write Defined Names.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     */
-    private function writeDefinedNames(XMLWriter $objWriter, Spreadsheet $spreadsheet): void
-    {
-        // Write defined names
-        $objWriter->startElement('definedNames');
-
-        // Named ranges
-        if (count($spreadsheet->getNamedRanges()) > 0) {
-            // Named ranges
-            $this->writeNamedRanges($objWriter, $spreadsheet);
-        }
-
-        // Other defined names
-        $sheetCount = $spreadsheet->getSheetCount();
-        for ($i = 0; $i < $sheetCount; ++$i) {
-            // definedName for autoFilter
-            $this->writeDefinedNameForAutofilter($objWriter, $spreadsheet->getSheet($i), $i);
-
-            // definedName for Print_Titles
-            $this->writeDefinedNameForPrintTitles($objWriter, $spreadsheet->getSheet($i), $i);
-
-            // definedName for Print_Area
-            $this->writeDefinedNameForPrintArea($objWriter, $spreadsheet->getSheet($i), $i);
-        }
-
-        $objWriter->endElement();
-    }
-
-    /**
-     * Write named ranges.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     */
-    private function writeNamedRanges(XMLWriter $objWriter, Spreadsheet $spreadsheet): void
-    {
-        // Loop named ranges
-        $namedRanges = $spreadsheet->getNamedRanges();
-        foreach ($namedRanges as $namedRange) {
-            $this->writeDefinedNameForNamedRange($objWriter, $namedRange);
-        }
-    }
-
-    /**
-     * Write Defined Name for named range.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     */
-    private function writeDefinedNameForNamedRange(XMLWriter $objWriter, NamedRange $pNamedRange): void
-    {
-        // definedName for named range
-        $objWriter->startElement('definedName');
-        $objWriter->writeAttribute('name', $pNamedRange->getName());
-        if ($pNamedRange->getLocalOnly()) {
-            $objWriter->writeAttribute('localSheetId', $pNamedRange->getScope()->getParent()->getIndex($pNamedRange->getScope()));
-        }
-
-        // Create absolute coordinate and write as raw text
-        $range = Coordinate::splitRange($pNamedRange->getRange());
-        $iMax = count($range);
-        for ($i = 0; $i < $iMax; ++$i) {
-            $range[$i][0] = '\'' . str_replace("'", "''", $pNamedRange->getWorksheet()->getTitle()) . '\'!' . Coordinate::absoluteReference($range[$i][0]);
-            if (isset($range[$i][1])) {
-                $range[$i][1] = Coordinate::absoluteReference($range[$i][1]);
-            }
-        }
-        $range = Coordinate::buildRange($range);
-
-        $objWriter->writeRawData($range);
-
-        $objWriter->endElement();
-    }
-
-    /**
-     * Write Defined Name for autoFilter.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param int $pSheetId
-     */
-    private function writeDefinedNameForAutofilter(XMLWriter $objWriter, Worksheet $pSheet, $pSheetId = 0): void
-    {
-        // definedName for autoFilter
-        $autoFilterRange = $pSheet->getAutoFilter()->getRange();
-        if (!empty($autoFilterRange)) {
-            $objWriter->startElement('definedName');
-            $objWriter->writeAttribute('name', '_xlnm._FilterDatabase');
-            $objWriter->writeAttribute('localSheetId', $pSheetId);
-            $objWriter->writeAttribute('hidden', '1');
-
-            // Create absolute coordinate and write as raw text
-            $range = Coordinate::splitRange($autoFilterRange);
-            $range = $range[0];
-            //    Strip any worksheet ref so we can make the cell ref absolute
-            [$ws, $range[0]] = Worksheet::extractSheetTitle($range[0], true);
-
-            $range[0] = Coordinate::absoluteCoordinate($range[0]);
-            $range[1] = Coordinate::absoluteCoordinate($range[1]);
-            $range = implode(':', $range);
-
-            $objWriter->writeRawData('\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!' . $range);
-
-            $objWriter->endElement();
-        }
-    }
-
-    /**
-     * Write Defined Name for PrintTitles.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param int $pSheetId
-     */
-    private function writeDefinedNameForPrintTitles(XMLWriter $objWriter, Worksheet $pSheet, $pSheetId = 0): void
-    {
-        // definedName for PrintTitles
-        if ($pSheet->getPageSetup()->isColumnsToRepeatAtLeftSet() || $pSheet->getPageSetup()->isRowsToRepeatAtTopSet()) {
-            $objWriter->startElement('definedName');
-            $objWriter->writeAttribute('name', '_xlnm.Print_Titles');
-            $objWriter->writeAttribute('localSheetId', $pSheetId);
-
-            // Setting string
-            $settingString = '';
-
-            // Columns to repeat
-            if ($pSheet->getPageSetup()->isColumnsToRepeatAtLeftSet()) {
-                $repeat = $pSheet->getPageSetup()->getColumnsToRepeatAtLeft();
-
-                $settingString .= '\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!$' . $repeat[0] . ':$' . $repeat[1];
-            }
-
-            // Rows to repeat
-            if ($pSheet->getPageSetup()->isRowsToRepeatAtTopSet()) {
-                if ($pSheet->getPageSetup()->isColumnsToRepeatAtLeftSet()) {
-                    $settingString .= ',';
-                }
-
-                $repeat = $pSheet->getPageSetup()->getRowsToRepeatAtTop();
-
-                $settingString .= '\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!$' . $repeat[0] . ':$' . $repeat[1];
-            }
-
-            $objWriter->writeRawData($settingString);
-
-            $objWriter->endElement();
-        }
-    }
-
-    /**
-     * Write Defined Name for PrintTitles.
-     *
-     * @param XMLWriter $objWriter XML Writer
-     * @param int $pSheetId
-     */
-    private function writeDefinedNameForPrintArea(XMLWriter $objWriter, Worksheet $pSheet, $pSheetId = 0): void
-    {
-        // definedName for PrintArea
-        if ($pSheet->getPageSetup()->isPrintAreaSet()) {
-            $objWriter->startElement('definedName');
-            $objWriter->writeAttribute('name', '_xlnm.Print_Area');
-            $objWriter->writeAttribute('localSheetId', $pSheetId);
-
-            // Print area
-            $printArea = Coordinate::splitRange($pSheet->getPageSetup()->getPrintArea());
-
-            $chunks = [];
-            foreach ($printArea as $printAreaRect) {
-                $printAreaRect[0] = Coordinate::absoluteReference($printAreaRect[0]);
-                $printAreaRect[1] = Coordinate::absoluteReference($printAreaRect[1]);
-                $chunks[] = '\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!' . implode(':', $printAreaRect);
-            }
-
-            $objWriter->writeRawData(implode(',', $chunks));
-
-            $objWriter->endElement();
-        }
-    }
 }
diff --git a/tests/PhpSpreadsheetTests/Calculation/DefinedNamesCalculationTest.php b/tests/PhpSpreadsheetTests/Calculation/DefinedNamesCalculationTest.php
new file mode 100644
index 00000000..d0a5aacb
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/DefinedNamesCalculationTest.php
@@ -0,0 +1,98 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation;
+
+use PhpOffice\PhpSpreadsheet\IOFactory;
+use PHPUnit\Framework\TestCase;
+
+class DefinedNamesCalculationTest extends TestCase
+{
+    /**
+     * @dataProvider namedRangeCalculationTest1
+     */
+    public function testNamedRangeCalculations1(string $cellAddress, float $expectedValue): void
+    {
+        $inputFileType = 'Xlsx';
+        $inputFileName = __DIR__ . '/../../data/Calculation/DefinedNames/NamedRanges.xlsx';
+
+        $reader = IOFactory::createReader($inputFileType);
+        $spreadsheet = $reader->load($inputFileName);
+
+        $calculatedCellValue = $spreadsheet->getActiveSheet()->getCell($cellAddress)->getCalculatedValue();
+        self::assertSame($expectedValue, $calculatedCellValue, "Failed calculation for cell {$cellAddress}");
+    }
+
+    /**
+     * @dataProvider namedRangeCalculationTest2
+     */
+    public function testNamedRangeCalculationsWithAdjustedRateValue(string $cellAddress, float $expectedValue): void
+    {
+        $inputFileType = 'Xlsx';
+        $inputFileName = __DIR__ . '/../../data/Calculation/DefinedNames/NamedRanges.xlsx';
+
+        $reader = IOFactory::createReader($inputFileType);
+        $spreadsheet = $reader->load($inputFileName);
+
+        $spreadsheet->getActiveSheet()->getCell('B1')->setValue(12.5);
+
+        $calculatedCellValue = $spreadsheet->getActiveSheet()->getCell($cellAddress)->getCalculatedValue();
+        self::assertSame($expectedValue, $calculatedCellValue, "Failed calculation for cell {$cellAddress}");
+    }
+
+    /**
+     * @dataProvider namedRangeCalculationTest1
+     */
+    public function testNamedFormulaCalculations1(string $cellAddress, float $expectedValue): void
+    {
+        $inputFileType = 'Xlsx';
+        $inputFileName = __DIR__ . '/../../data/Calculation/DefinedNames/NamedFormulae.xlsx';
+
+        $reader = IOFactory::createReader($inputFileType);
+        $spreadsheet = $reader->load($inputFileName);
+
+        $calculatedCellValue = $spreadsheet->getActiveSheet()->getCell($cellAddress)->getCalculatedValue();
+        self::assertSame($expectedValue, $calculatedCellValue, "Failed calculation for cell {$cellAddress}");
+    }
+
+    /**
+     * @dataProvider namedRangeCalculationTest2
+     */
+    public function testNamedFormulaeCalculationsWithAdjustedRateValue(string $cellAddress, float $expectedValue): void
+    {
+        $inputFileType = 'Xlsx';
+        $inputFileName = __DIR__ . '/../../data/Calculation/DefinedNames/NamedFormulae.xlsx';
+
+        $reader = IOFactory::createReader($inputFileType);
+        $spreadsheet = $reader->load($inputFileName);
+
+        $spreadsheet->getActiveSheet()->getCell('B1')->setValue(12.5);
+
+        $calculatedCellValue = $spreadsheet->getActiveSheet()->getCell($cellAddress)->getCalculatedValue();
+        self::assertSame($expectedValue, $calculatedCellValue, "Failed calculation for cell {$cellAddress}");
+    }
+
+    public function namedRangeCalculationTest1(): array
+    {
+        return [
+            ['C4', 56.25],
+            ['C5', 54.375],
+            ['C6', 48.75],
+            ['C7', 52.5],
+            ['C8', 41.25],
+            ['B10', 33.75],
+            ['C10', 253.125],
+        ];
+    }
+
+    public function namedRangeCalculationTest2(): array
+    {
+        return [
+            ['C4', 93.75],
+            ['C5', 90.625],
+            ['C6', 81.25],
+            ['C7', 87.5],
+            ['C8', 68.75],
+            ['C10', 421.875],
+        ];
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php b/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php
index 9dfa4bf0..4f1ff397 100644
--- a/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/Engine/RangeTest.php
@@ -29,10 +29,9 @@ class RangeTest extends TestCase
     /**
      * @dataProvider providerRangeEvaluation
      *
-     * @param string $formula
-     * @param int $expectedResult
+     * @param mixed $expectedResult
      */
-    public function testRangeEvaluation($formula, $expectedResult): void
+    public function testRangeEvaluation(string $formula, $expectedResult): void
     {
         $workSheet = $this->spreadSheet->getActiveSheet();
         $workSheet->setCellValue('E1', $formula);
@@ -76,13 +75,8 @@ class RangeTest extends TestCase
 
     /**
      * @dataProvider providerNamedRangeEvaluation
-     *
-     * @param string $group1
-     * @param string $group2
-     * @param string $formula
-     * @param int $expectedResult
      */
-    public function testNamedRangeEvaluation($group1, $group2, $formula, $expectedResult): void
+    public function testNamedRangeEvaluation(string $group1, string $group2, string $formula, int $expectedResult): void
     {
         $workSheet = $this->spreadSheet->getActiveSheet();
         $this->spreadSheet->addNamedRange(new NamedRange('GROUP1', $workSheet, $group1));
@@ -97,26 +91,26 @@ class RangeTest extends TestCase
     public function providerNamedRangeEvaluation()
     {
         return[
-            ['A1:B3', 'A1:C2', '=SUM(GROUP1,GROUP2)', 48],
-            ['A1:B3', 'A1:C2', '=COUNT(GROUP1,GROUP2)', 12],
-            ['A1:B3', 'A1:C2', '=SUM(GROUP1 GROUP2)', 12],
-            ['A1:B3', 'A1:C2', '=COUNT(GROUP1 GROUP2)', 4],
-            ['A1:B2', 'B2:C3', '=SUM(GROUP1,GROUP2)', 40],
-            ['A1:B2', 'B2:C3', '=COUNT(GROUP1,GROUP2)', 8],
-            ['A1:B2', 'B2:C3', '=SUM(GROUP1 GROUP2)', 5],
-            ['A1:B2', 'B2:C3', '=COUNT(GROUP1 GROUP2)', 1],
+            ['$A$1:$B$3', '$A$1:$C$2', '=SUM(GROUP1,GROUP2)', 48],
+            ['$A$1:$B$3', '$A$1:$C$2', '=COUNT(GROUP1,GROUP2)', 12],
+            ['$A$1:$B$3', '$A$1:$C$2', '=SUM(GROUP1 GROUP2)', 12],
+            ['$A$1:$B$3', '$A$1:$C$2', '=COUNT(GROUP1 GROUP2)', 4],
+            ['$A$1:$B$2', '$B$2:$C$3', '=SUM(GROUP1,GROUP2)', 40],
+            ['$A$1:$B$2', '$B$2:$C$3', '=COUNT(GROUP1,GROUP2)', 8],
+            ['$A$1:$B$2', '$B$2:$C$3', '=SUM(GROUP1 GROUP2)', 5],
+            ['$A$1:$B$2', '$B$2:$C$3', '=COUNT(GROUP1 GROUP2)', 1],
+            ['Worksheet!$A$1:$B$2', 'Worksheet!$B$2:$C$3', '=SUM(GROUP1,GROUP2)', 40],
+            ['Worksheet!$A$1:Worksheet!$B$2', 'Worksheet!$B$2:Worksheet!$C$3', '=SUM(GROUP1,GROUP2)', 40],
         ];
     }
 
     /**
      * @dataProvider providerUTF8NamedRangeEvaluation
      *
-     * @param string $names
-     * @param string $ranges
-     * @param string $formula
-     * @param int $expectedResult
+     * @param string[] $names
+     * @param string[] $ranges
      */
-    public function testUTF8NamedRangeEvaluation($names, $ranges, $formula, $expectedResult): void
+    public function testUTF8NamedRangeEvaluation(array $names, array $ranges, string $formula, int $expectedResult): void
     {
         $workSheet = $this->spreadSheet->getActiveSheet();
         foreach ($names as $index => $name) {
@@ -132,21 +126,19 @@ class RangeTest extends TestCase
     public function providerUTF8NamedRangeEvaluation()
     {
         return[
-            [['Γειά', 'σου', 'Κόσμε'], ['A1', 'B1:B2', 'C1:C3'], '=SUM(Γειά,σου,Κόσμε)', 26],
-            [['Γειά', 'σου', 'Κόσμε'], ['A1', 'B1:B2', 'C1:C3'], '=COUNT(Γειά,σου,Κόσμε)', 6],
-            [['Здравствуй', 'мир'], ['A1:A3', 'C1:C3'], '=SUM(Здравствуй,мир)', 30],
+            [['Γειά', 'σου', 'Κόσμε'], ['$A$1', '$B$1:$B$2', '$C$1:$C$3'], '=SUM(Γειά,σου,Κόσμε)', 26],
+            [['Γειά', 'σου', 'Κόσμε'], ['$A$1', '$B$1:$B$2', '$C$1:$C$3'], '=COUNT(Γειά,σου,Κόσμε)', 6],
+            [['Здравствуй', 'мир'], ['$A$1:$A$3', '$C$1:$C$3'], '=SUM(Здравствуй,мир)', 30],
         ];
     }
 
     /**
      * @dataProvider providerCompositeNamedRangeEvaluation
-     *
-     * @param string $composite
-     * @param int $expectedSum
-     * @param int $expectedCount
      */
-    public function testCompositeNamedRangeEvaluation($composite, $expectedSum, $expectedCount): void
+    public function testCompositeNamedRangeEvaluation(string $composite, int $expectedSum, int $expectedCount): void
     {
+        self::markTestSkipped('must be revisited.');
+
         $workSheet = $this->spreadSheet->getActiveSheet();
         $this->spreadSheet->addNamedRange(new NamedRange('COMPOSITE', $workSheet, $composite));
 
@@ -163,12 +155,12 @@ class RangeTest extends TestCase
     {
         return[
             //  Calculation engine doesn't yet handle union ranges with overlap
-            //  'Union with overlap' => [
-            //      'A1:C1,A3:C3,B1:C3',
-            //      63,
-            //      12,
-            //  ],
-            'Intersection' => [
+            'Union with overlap' => [
+                'A1:C1,A3:C3,B1:C3',
+                63,
+                12,
+            ],
+            'Union and Intersection' => [
                 'A1:C1,A3:C3 B1:C3',
                 23,
                 5,
diff --git a/tests/PhpSpreadsheetTests/Calculation/FormulaAsStringTest.php b/tests/PhpSpreadsheetTests/Calculation/FormulaAsStringTest.php
index 2cbdc960..9afe5570 100644
--- a/tests/PhpSpreadsheetTests/Calculation/FormulaAsStringTest.php
+++ b/tests/PhpSpreadsheetTests/Calculation/FormulaAsStringTest.php
@@ -21,7 +21,7 @@ class FormulaAsStringTest extends TestCase
         $workSheet->setCellValue('A2', 20);
         $workSheet->setCellValue('A3', 30);
         $workSheet->setCellValue('A4', 40);
-        $spreadsheet->addNamedRange(new \PhpOffice\PhpSpreadsheet\NamedRange('namedCell', $workSheet, 'A4'));
+        $spreadsheet->addNamedRange(new \PhpOffice\PhpSpreadsheet\NamedRange('namedCell', $workSheet, '$A$4'));
         $workSheet->setCellValue('B1', 'uPPER');
         $workSheet->setCellValue('B2', '=TRUE()');
         $workSheet->setCellValue('B3', '=FALSE()');
@@ -30,7 +30,7 @@ class FormulaAsStringTest extends TestCase
         $ws2->setCellValue('A1', 100);
         $ws2->setCellValue('A2', 200);
         $ws2->setTitle('Sheet2');
-        $spreadsheet->addNamedRange(new \PhpOffice\PhpSpreadsheet\NamedRange('A2B', $ws2, 'A2'));
+        $spreadsheet->addNamedRange(new \PhpOffice\PhpSpreadsheet\NamedRange('A2B', $ws2, '$A$2'));
 
         $spreadsheet->setActiveSheetIndex(0);
         $cell2 = $workSheet->getCell('D1');
diff --git a/tests/PhpSpreadsheetTests/DefinedNameFormulaTest.php b/tests/PhpSpreadsheetTests/DefinedNameFormulaTest.php
new file mode 100644
index 00000000..50304991
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/DefinedNameFormulaTest.php
@@ -0,0 +1,167 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests;
+
+use PhpOffice\PhpSpreadsheet\DefinedName;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PHPUnit\Framework\TestCase;
+
+class DefinedNameFormulaTest extends TestCase
+{
+    /**
+     * @dataProvider providerRangeOrFormula
+     */
+    public function testRangeOrFormula(string $value, bool $expectedResult): void
+    {
+        $actualResult = DefinedName::testIfFormula($value);
+        self::assertSame($expectedResult, $actualResult);
+    }
+
+    public function testAddDefinedNames(): void
+    {
+        $spreadSheet = new Spreadsheet();
+        $workSheet = $spreadSheet->getActiveSheet();
+
+        $definedNamesForTest = $this->providerRangeOrFormula();
+        foreach ($definedNamesForTest as $key => $definedNameData) {
+            [$value] = $definedNameData;
+            $name = str_replace([' ', '-'], '_', $key);
+            $spreadSheet->addDefinedName(DefinedName::createInstance($name, $workSheet, $value));
+        }
+
+        $allDefinedNames = $spreadSheet->getDefinedNames();
+        self::assertSame(count($definedNamesForTest), count($allDefinedNames));
+    }
+
+    public function testGetNamedRanges(): void
+    {
+        $spreadSheet = new Spreadsheet();
+        $workSheet = $spreadSheet->getActiveSheet();
+
+        $rangeOrFormula = [];
+        $definedNamesForTest = $this->providerRangeOrFormula();
+        foreach ($definedNamesForTest as $key => $definedNameData) {
+            [$value, $isFormula] = $definedNameData;
+            $rangeOrFormula[] = !$isFormula;
+            $name = str_replace([' ', '-'], '_', $key);
+            $spreadSheet->addDefinedName(DefinedName::createInstance($name, $workSheet, $value));
+        }
+
+        $allNamedRanges = $spreadSheet->getNamedRanges();
+        self::assertSame(count(array_filter($rangeOrFormula)), count($allNamedRanges));
+    }
+
+    public function testGetScopedNamedRange(): void
+    {
+        $rangeName = 'NAMED_RANGE';
+        $globalRangeValue = 'A1';
+        $localRangeValue = 'A2';
+
+        $spreadSheet = new Spreadsheet();
+        $workSheet = $spreadSheet->getActiveSheet();
+
+        $spreadSheet->addDefinedName(DefinedName::createInstance($rangeName, $workSheet, $globalRangeValue));
+        $spreadSheet->addDefinedName(DefinedName::createInstance($rangeName, $workSheet, $localRangeValue, true));
+
+        $localScopedRange = $spreadSheet->getNamedRange($rangeName, $workSheet);
+        self::assertSame($localRangeValue, $localScopedRange->getValue());
+    }
+
+    public function testGetGlobalNamedRange(): void
+    {
+        $rangeName = 'NAMED_RANGE';
+        $globalRangeValue = 'A1';
+        $localRangeValue = 'A2';
+
+        $spreadSheet = new Spreadsheet();
+        $workSheet1 = $spreadSheet->getActiveSheet();
+        $spreadSheet->createSheet(1);
+        $workSheet2 = $spreadSheet->getSheet(1);
+
+        $spreadSheet->addDefinedName(DefinedName::createInstance($rangeName, $workSheet1, $globalRangeValue));
+        $spreadSheet->addDefinedName(DefinedName::createInstance($rangeName, $workSheet1, $localRangeValue, true));
+
+        $localScopedRange = $spreadSheet->getNamedRange($rangeName, $workSheet2);
+        self::assertSame($globalRangeValue, $localScopedRange->getValue());
+    }
+
+    public function testGetNamedFormulae(): void
+    {
+        $spreadSheet = new Spreadsheet();
+        $workSheet = $spreadSheet->getActiveSheet();
+
+        $rangeOrFormula = [];
+        $definedNamesForTest = $this->providerRangeOrFormula();
+        foreach ($definedNamesForTest as $key => $definedNameData) {
+            [$value, $isFormula] = $definedNameData;
+            $rangeOrFormula[] = $isFormula;
+            $name = str_replace([' ', '-'], '_', $key);
+            $spreadSheet->addDefinedName(DefinedName::createInstance($name, $workSheet, $value));
+        }
+
+        $allNamedFormulae = $spreadSheet->getNamedFormulae();
+        self::assertSame(count(array_filter($rangeOrFormula)), count($allNamedFormulae));
+    }
+
+    public function testGetScopedNamedFormula(): void
+    {
+        $formulaName = 'GERMAN_VAT_RATE';
+        $globalFormulaValue = '=19.0%';
+        $localFormulaValue = '=16.0%';
+
+        $spreadSheet = new Spreadsheet();
+        $workSheet = $spreadSheet->getActiveSheet();
+
+        $spreadSheet->addDefinedName(DefinedName::createInstance($formulaName, $workSheet, $globalFormulaValue));
+        $spreadSheet->addDefinedName(DefinedName::createInstance($formulaName, $workSheet, $localFormulaValue, true));
+
+        $localScopedFormula = $spreadSheet->getNamedFormula($formulaName, $workSheet);
+        self::assertSame($localFormulaValue, $localScopedFormula->getValue());
+    }
+
+    public function testGetGlobalNamedFormula(): void
+    {
+        $formulaName = 'GERMAN_VAT_RATE';
+        $globalFormulaValue = '=19.0%';
+        $localFormulaValue = '=16.0%';
+
+        $spreadSheet = new Spreadsheet();
+        $workSheet1 = $spreadSheet->getActiveSheet();
+        $spreadSheet->createSheet(1);
+        $workSheet2 = $spreadSheet->getSheet(1);
+
+        $spreadSheet->addDefinedName(DefinedName::createInstance($formulaName, $workSheet1, $globalFormulaValue));
+        $spreadSheet->addDefinedName(DefinedName::createInstance($formulaName, $workSheet1, $localFormulaValue, true));
+
+        $localScopedFormula = $spreadSheet->getNamedFormula($formulaName, $workSheet2);
+        self::assertSame($globalFormulaValue, $localScopedFormula->getValue());
+    }
+
+    public function providerRangeOrFormula(): array
+    {
+        return [
+            'simple range' => ['A1', false],
+            'simple absolute range' => ['$A$1', false],
+            'simple integer value' => ['42', true],
+            'simple float value' => ['12.5', true],
+            'simple string value' => ['"HELLO WORLD"', true],
+            'range with a worksheet name' => ['Sheet2!$A$1', false],
+            'range with a quoted worksheet name' => ["'Work Sheet #2'!\$A\$1:\$E\$1", false],
+            'range with a quoted worksheet name containing quotes' => ["'Mark''s WorkSheet'!\$A\$1:\$E\$1", false],
+            'range with a utf-8 worksheet name' => ['Γειά!$A$1', false],
+            'range with a quoted utf-8 worksheet name' => ["'Γειά σου Κόσμε'!\$A\$1", false],
+            'range with a quoted worksheet name with quotes in a formula' => ["'Mark''s WorkSheet'!\$A\$1+5", true],
+            'range with a quoted worksheet name in a formula' => ["5*'Work Sheet #2'!\$A\$1", true],
+            'multiple ranges with quoted worksheet names with quotes in a formula' => ["'Mark''s WorkSheet'!\$A\$1+'Mark''s WorkSheet'!\$B\$2", true],
+            'named range in a formula' => ['NAMED_RANGE_VALUE+12', true],
+            'named range and range' => ['NAMED_RANGE_VALUE_1,Sheet2!$A$1', false],
+            'range with quoted utf-8 worksheet name and a named range' => ["NAMED_RANGE_VALUE_1,'Γειά σου Κόσμε'!\$A\$1", false],
+            'composite named range' => ['NAMED_RANGE_VALUE_1,NAMED_RANGE_VALUE_2 NAMED_RANGE_VALUE_3', false],
+            'named ranges in a formula' => ['NAMED_RANGE_VALUE_1/NAMED_RANGE_VALUE_2', true],
+            'utf-8 named range' => ['Γειά', false],
+            'utf-8 named range in a formula' => ['2*Γειά', true],
+            'utf-8 named ranges' => ['Γειά,σου Κόσμε', false],
+            'utf-8 named ranges in a formula' => ['Здравствуй+мир', true],
+        ];
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/DefinedNameTest.php b/tests/PhpSpreadsheetTests/DefinedNameTest.php
new file mode 100644
index 00000000..3f5b75a0
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/DefinedNameTest.php
@@ -0,0 +1,124 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests;
+
+use PhpOffice\PhpSpreadsheet\DefinedName;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use PHPUnit\Framework\TestCase;
+
+class DefinedNameTest extends TestCase
+{
+    /** @var Spreadsheet */
+    private $spreadsheet;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->spreadsheet = new Spreadsheet();
+
+        $this->spreadsheet->getActiveSheet()
+            ->setTitle('Sheet #1');
+
+        $worksheet2 = new Worksheet();
+        $worksheet2->setTitle('Sheet #2');
+        $this->spreadsheet->addSheet($worksheet2);
+
+        $this->spreadsheet->setActiveSheetIndex(0);
+    }
+
+    public function testAddDefinedName(): void
+    {
+        $this->spreadsheet->addDefinedName(
+            DefinedName::createInstance('Foo', $this->spreadsheet->getActiveSheet(), '=A1')
+        );
+
+        self::assertCount(1, $this->spreadsheet->getDefinedNames());
+    }
+
+    public function testAddDuplicateDefinedName(): void
+    {
+        $this->spreadsheet->addDefinedName(
+            DefinedName::createInstance('Foo', $this->spreadsheet->getActiveSheet(), '=A1')
+        );
+        $this->spreadsheet->addDefinedName(
+            DefinedName::createInstance('FOO', $this->spreadsheet->getActiveSheet(), '=B1')
+        );
+
+        self::assertCount(1, $this->spreadsheet->getDefinedNames());
+        self::assertSame(
+            '=B1',
+            $this->spreadsheet->getDefinedName('foo', $this->spreadsheet->getActiveSheet())->getValue()
+        );
+    }
+
+    public function testAddScopedDefinedNameWithSameName(): void
+    {
+        $this->spreadsheet->addDefinedName(
+            DefinedName::createInstance('Foo', $this->spreadsheet->getActiveSheet(), '=A1')
+        );
+        $this->spreadsheet->addDefinedName(
+            DefinedName::createInstance('FOO', $this->spreadsheet->getSheetByName('Sheet #2'), '=B1', true)
+        );
+
+        self::assertCount(2, $this->spreadsheet->getDefinedNames());
+        self::assertSame(
+            '=A1',
+            $this->spreadsheet->getDefinedName('foo', $this->spreadsheet->getActiveSheet())->getValue()
+        );
+        self::assertSame(
+            '=B1',
+            $this->spreadsheet->getDefinedName('foo', $this->spreadsheet->getSheetByName('Sheet #2'))->getValue()
+        );
+    }
+
+    public function testRemoveDefinedName(): void
+    {
+        $this->spreadsheet->addDefinedName(
+            DefinedName::createInstance('Foo', $this->spreadsheet->getActiveSheet(), '=A1')
+        );
+        $this->spreadsheet->addDefinedName(
+            DefinedName::createInstance('Bar', $this->spreadsheet->getActiveSheet(), '=B1')
+        );
+
+        $this->spreadsheet->removeDefinedName('Foo', $this->spreadsheet->getActiveSheet());
+
+        self::assertCount(1, $this->spreadsheet->getDefinedNames());
+    }
+
+    public function testRemoveGlobalDefinedNameWhenDuplicateNames(): void
+    {
+        $this->spreadsheet->addDefinedName(
+            DefinedName::createInstance('Foo', $this->spreadsheet->getActiveSheet(), '=A1')
+        );
+        $this->spreadsheet->addDefinedName(
+            DefinedName::createInstance('FOO', $this->spreadsheet->getSheetByName('Sheet #2'), '=B1', true)
+        );
+
+        $this->spreadsheet->removeDefinedName('Foo', $this->spreadsheet->getActiveSheet());
+
+        self::assertCount(1, $this->spreadsheet->getDefinedNames());
+        self::assertSame(
+            '=B1',
+            $this->spreadsheet->getDefinedName('foo', $this->spreadsheet->getSheetByName('Sheet #2'))->getValue()
+        );
+    }
+
+    public function testRemoveScopedDefinedNameWhenDuplicateNames(): void
+    {
+        $this->spreadsheet->addDefinedName(
+            DefinedName::createInstance('Foo', $this->spreadsheet->getActiveSheet(), '=A1')
+        );
+        $this->spreadsheet->addDefinedName(
+            DefinedName::createInstance('FOO', $this->spreadsheet->getSheetByName('Sheet #2'), '=B1', true)
+        );
+
+        $this->spreadsheet->removeDefinedName('Foo', $this->spreadsheet->getSheetByName('Sheet #2'));
+
+        self::assertCount(1, $this->spreadsheet->getDefinedNames());
+        self::assertSame(
+            '=A1',
+            $this->spreadsheet->getDefinedName('foo')->getValue()
+        );
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/NamedFormulaTest.php b/tests/PhpSpreadsheetTests/NamedFormulaTest.php
new file mode 100644
index 00000000..44254829
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/NamedFormulaTest.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests;
+
+use PhpOffice\PhpSpreadsheet\NamedFormula;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use PHPUnit\Framework\TestCase;
+
+class NamedFormulaTest extends TestCase
+{
+    /** @var Spreadsheet */
+    private $spreadsheet;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->spreadsheet = new Spreadsheet();
+
+        $this->spreadsheet->getActiveSheet()
+            ->setTitle('Sheet #1');
+
+        $worksheet2 = new Worksheet();
+        $worksheet2->setTitle('Sheet #2');
+        $this->spreadsheet->addSheet($worksheet2);
+
+        $this->spreadsheet->setActiveSheetIndex(0);
+    }
+
+    public function testAddNamedRange(): void
+    {
+        $this->spreadsheet->addNamedFormula(
+            new NamedFormula('Foo', $this->spreadsheet->getActiveSheet(), '=19%')
+        );
+
+        self::assertCount(1, $this->spreadsheet->getDefinedNames());
+        self::assertCount(1, $this->spreadsheet->getNamedFormulae());
+        self::assertCount(0, $this->spreadsheet->getNamedRanges());
+    }
+
+    public function testAddDuplicateNamedRange(): void
+    {
+        $this->spreadsheet->addNamedFormula(
+            new NamedFormula('Foo', $this->spreadsheet->getActiveSheet(), '=19%')
+        );
+        $this->spreadsheet->addNamedFormula(
+            new NamedFormula('FOO', $this->spreadsheet->getActiveSheet(), '=16%')
+        );
+
+        self::assertCount(1, $this->spreadsheet->getNamedFormulae());
+        self::assertSame(
+            '=16%',
+            $this->spreadsheet->getNamedFormula('foo', $this->spreadsheet->getActiveSheet())->getValue()
+        );
+    }
+
+    public function testAddScopedNamedFormulaWithSameName(): void
+    {
+        $this->spreadsheet->addNamedFormula(
+            new NamedFormula('Foo', $this->spreadsheet->getActiveSheet(), '=19%')
+        );
+        $this->spreadsheet->addNamedFormula(
+            new NamedFormula('FOO', $this->spreadsheet->getSheetByName('Sheet #2'), '=16%', true)
+        );
+
+        self::assertCount(2, $this->spreadsheet->getNamedFormulae());
+        self::assertSame(
+            '=19%',
+            $this->spreadsheet->getNamedFormula('foo', $this->spreadsheet->getActiveSheet())->getValue()
+        );
+        self::assertSame(
+            '=16%',
+            $this->spreadsheet->getNamedFormula('foo', $this->spreadsheet->getSheetByName('Sheet #2'))->getValue()
+        );
+    }
+
+    public function testRemoveNamedFormula(): void
+    {
+        $this->spreadsheet->addDefinedName(
+            new NamedFormula('Foo', $this->spreadsheet->getActiveSheet(), '=16%')
+        );
+        $this->spreadsheet->addDefinedName(
+            new NamedFormula('Bar', $this->spreadsheet->getActiveSheet(), '=19%')
+        );
+
+        $this->spreadsheet->removeNamedFormula('Foo', $this->spreadsheet->getActiveSheet());
+
+        self::assertCount(1, $this->spreadsheet->getNamedFormulae());
+    }
+
+    public function testRemoveGlobalNamedFormulaWhenDuplicateNames(): void
+    {
+        $this->spreadsheet->addNamedFormula(
+            new NamedFormula('Foo', $this->spreadsheet->getActiveSheet(), '=19%')
+        );
+        $this->spreadsheet->addNamedFormula(
+            new NamedFormula('FOO', $this->spreadsheet->getSheetByName('Sheet #2'), '=16%', true)
+        );
+
+        $this->spreadsheet->removeNamedFormula('Foo', $this->spreadsheet->getActiveSheet());
+
+        self::assertCount(1, $this->spreadsheet->getNamedFormulae());
+        self::assertSame(
+            '=16%',
+            $this->spreadsheet->getNamedFormula('foo', $this->spreadsheet->getSheetByName('Sheet #2'))->getValue()
+        );
+    }
+
+    public function testRemoveScopedNamedFormulaWhenDuplicateNames(): void
+    {
+        $this->spreadsheet->addNamedFormula(
+            new NamedFormula('Foo', $this->spreadsheet->getActiveSheet(), '=19%')
+        );
+        $this->spreadsheet->addNamedFormula(
+            new NamedFormula('FOO', $this->spreadsheet->getSheetByName('Sheet #2'), '=16%', true)
+        );
+
+        $this->spreadsheet->removeNamedFormula('Foo', $this->spreadsheet->getSheetByName('Sheet #2'));
+
+        self::assertCount(1, $this->spreadsheet->getNamedFormulae());
+        self::assertSame(
+            '=19%',
+            $this->spreadsheet->getNamedFormula('foo')->getValue()
+        );
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/NamedRangeTest.php b/tests/PhpSpreadsheetTests/NamedRangeTest.php
new file mode 100644
index 00000000..62cd735b
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/NamedRangeTest.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests;
+
+use PhpOffice\PhpSpreadsheet\NamedRange;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use PHPUnit\Framework\TestCase;
+
+class NamedRangeTest extends TestCase
+{
+    /** @var Spreadsheet */
+    private $spreadsheet;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->spreadsheet = new Spreadsheet();
+
+        $this->spreadsheet->getActiveSheet()
+            ->setTitle('Sheet #1');
+
+        $worksheet2 = new Worksheet();
+        $worksheet2->setTitle('Sheet #2');
+        $this->spreadsheet->addSheet($worksheet2);
+
+        $this->spreadsheet->setActiveSheetIndex(0);
+    }
+
+    public function testAddNamedRange(): void
+    {
+        $this->spreadsheet->addNamedRange(
+            new NamedRange('Foo', $this->spreadsheet->getActiveSheet(), '=A1')
+        );
+
+        self::assertCount(1, $this->spreadsheet->getDefinedNames());
+        self::assertCount(1, $this->spreadsheet->getNamedRanges());
+        self::assertCount(0, $this->spreadsheet->getNamedFormulae());
+    }
+
+    public function testAddDuplicateNamedRange(): void
+    {
+        $this->spreadsheet->addNamedRange(
+            new NamedRange('Foo', $this->spreadsheet->getActiveSheet(), '=A1')
+        );
+        $this->spreadsheet->addNamedRange(
+            new NamedRange('FOO', $this->spreadsheet->getActiveSheet(), '=B1')
+        );
+
+        self::assertCount(1, $this->spreadsheet->getNamedRanges());
+        self::assertSame(
+            '=B1',
+            $this->spreadsheet->getNamedRange('foo', $this->spreadsheet->getActiveSheet())->getValue()
+        );
+    }
+
+    public function testAddScopedNamedRangeWithSameName(): void
+    {
+        $this->spreadsheet->addNamedRange(
+            new NamedRange('Foo', $this->spreadsheet->getActiveSheet(), '=A1')
+        );
+        $this->spreadsheet->addNamedRange(
+            new NamedRange('FOO', $this->spreadsheet->getSheetByName('Sheet #2'), '=B1', true)
+        );
+
+        self::assertCount(2, $this->spreadsheet->getNamedRanges());
+        self::assertSame(
+            '=A1',
+            $this->spreadsheet->getNamedRange('foo', $this->spreadsheet->getActiveSheet())->getValue()
+        );
+        self::assertSame(
+            '=B1',
+            $this->spreadsheet->getNamedRange('foo', $this->spreadsheet->getSheetByName('Sheet #2'))->getValue()
+        );
+    }
+
+    public function testRemoveNamedRange(): void
+    {
+        $this->spreadsheet->addDefinedName(
+            new NamedRange('Foo', $this->spreadsheet->getActiveSheet(), '=A1')
+        );
+        $this->spreadsheet->addDefinedName(
+            new NamedRange('Bar', $this->spreadsheet->getActiveSheet(), '=B1')
+        );
+
+        $this->spreadsheet->removeNamedRange('Foo', $this->spreadsheet->getActiveSheet());
+
+        self::assertCount(1, $this->spreadsheet->getNamedRanges());
+    }
+
+    public function testRemoveGlobalNamedRangeWhenDuplicateNames(): void
+    {
+        $this->spreadsheet->addNamedRange(
+            new NamedRange('Foo', $this->spreadsheet->getActiveSheet(), '=A1')
+        );
+        $this->spreadsheet->addNamedRange(
+            new NamedRange('FOO', $this->spreadsheet->getSheetByName('Sheet #2'), '=B1', true)
+        );
+
+        $this->spreadsheet->removeNamedRange('Foo', $this->spreadsheet->getActiveSheet());
+
+        self::assertCount(1, $this->spreadsheet->getNamedRanges());
+        self::assertSame(
+            '=B1',
+            $this->spreadsheet->getNamedRange('foo', $this->spreadsheet->getSheetByName('Sheet #2'))->getValue()
+        );
+    }
+
+    public function testRemoveScopedNamedRangeWhenDuplicateNames(): void
+    {
+        $this->spreadsheet->addNamedRange(
+            new NamedRange('Foo', $this->spreadsheet->getActiveSheet(), '=A1')
+        );
+        $this->spreadsheet->addNamedRange(
+            new NamedRange('FOO', $this->spreadsheet->getSheetByName('Sheet #2'), '=B1', true)
+        );
+
+        $this->spreadsheet->removeNamedRange('Foo', $this->spreadsheet->getSheetByName('Sheet #2'));
+
+        self::assertCount(1, $this->spreadsheet->getNamedRanges());
+        self::assertSame(
+            '=A1',
+            $this->spreadsheet->getNamedRange('foo')->getValue()
+        );
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/ReferenceHelperTest.php b/tests/PhpSpreadsheetTests/ReferenceHelperTest.php
index 08462b5b..bf32f746 100644
--- a/tests/PhpSpreadsheetTests/ReferenceHelperTest.php
+++ b/tests/PhpSpreadsheetTests/ReferenceHelperTest.php
@@ -112,4 +112,21 @@ class ReferenceHelperTest extends TestCase
     {
         return require 'tests/data/ReferenceHelperFormulaUpdates.php';
     }
+
+    /**
+     * @dataProvider providerMultipleWorksheetFormulaUpdates
+     */
+    public function testUpdateFormulaForMultipleWorksheets(string $formula, int $insertRows, int $insertColumns, string $expectedResult): void
+    {
+        $referenceHelper = ReferenceHelper::getInstance();
+
+        $result = $referenceHelper->updateFormulaReferencesAnyWorksheet($formula, $insertRows, $insertColumns);
+
+        self::assertSame($expectedResult, $result);
+    }
+
+    public function providerMultipleWorksheetFormulaUpdates(): array
+    {
+        return require 'tests/data/ReferenceHelperFormulaUpdatesMultipleSheet.php';
+    }
 }
diff --git a/tests/PhpSpreadsheetTests/Writer/Xls/FormulaErrTest.php b/tests/PhpSpreadsheetTests/Writer/Xls/FormulaErrTest.php
index 21a7c928..bbb00d89 100644
--- a/tests/PhpSpreadsheetTests/Writer/Xls/FormulaErrTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Xls/FormulaErrTest.php
@@ -14,7 +14,7 @@ class FormulaErrTest extends TestCase
         $obj = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
         $sheet0 = $obj->setActiveSheetIndex(0);
         $sheet0->setCellValue('A1', 2);
-        $obj->addNamedRange(new NamedRange('DEFNAM', $sheet0, 'A1'));
+        $obj->addNamedRange(new NamedRange('DEFNAM', $sheet0, '$A$1'));
         $sheet0->setCellValue('B1', '=2*DEFNAM');
         $sheet0->setCellValue('C1', '=DEFNAM=2');
         $sheet0->setCellValue('D1', '=CONCAT("X",DEFNAM)');
diff --git a/tests/PhpSpreadsheetTests/Writer/Xls/WorkbookTest.php b/tests/PhpSpreadsheetTests/Writer/Xls/WorkbookTest.php
index 7a83b697..5ebe645f 100644
--- a/tests/PhpSpreadsheetTests/Writer/Xls/WorkbookTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Xls/WorkbookTest.php
@@ -22,7 +22,7 @@ class WorkbookTest extends TestCase
         $strUnique = 0;
         $str_table = [];
         $colors = [];
-        $parser = new Parser();
+        $parser = new Parser($spreadsheet);
 
         $this->workbook = new Workbook($spreadsheet, $strTotal, $strUnique, $str_table, $colors, $parser);
     }
diff --git a/tests/data/Calculation/DefinedNames/NamedFormulae.xlsx b/tests/data/Calculation/DefinedNames/NamedFormulae.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..d6b77c06ac49a59407d210755f9c6ccbb076be30
GIT binary patch
literal 9216
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

literal 0
HcmV?d00001

diff --git a/tests/data/Calculation/DefinedNames/NamedRanges.xlsx b/tests/data/Calculation/DefinedNames/NamedRanges.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..d4cea6ca3068296056658bb75cffaf252c356f44
GIT binary patch
literal 9221
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

literal 0
HcmV?d00001

diff --git a/tests/data/ReferenceHelperFormulaUpdatesMultipleSheet.php b/tests/data/ReferenceHelperFormulaUpdatesMultipleSheet.php
new file mode 100644
index 00000000..9c59359d
--- /dev/null
+++ b/tests/data/ReferenceHelperFormulaUpdatesMultipleSheet.php
@@ -0,0 +1,88 @@
+<?php
+
+return [
+    [
+        "=IF('2020'!\$B1=\"\",\"-\",(('2020'!\$B1/'2019'!\$B1)-1))",
+        2,
+        2,
+        "=IF('2020'!\$B3=\"\",\"-\",(('2020'!\$B3/'2019'!\$B3)-1))",
+    ],
+    [
+        "=IF('2020'!B$1=\"\",\"-\",(('2020'!B$1/'2019'!B$1)-1))",
+        2,
+        2,
+        "=IF('2020'!D\$1=\"\",\"-\",(('2020'!D\$1/'2019'!D\$1)-1))",
+    ],
+    [
+        "=IF('2020'!Z$1=\"\",\"-\",(('2020'!Z$1/'2019'!Z$1)-1))",
+        2,
+        2,
+        "=IF('2020'!AB\$1=\"\",\"-\",(('2020'!AB\$1/'2019'!AB\$1)-1))",
+    ],
+    [
+        '=SUM(A1:C3)',
+        2,
+        2,
+        '=SUM(C3:E5)',
+    ],
+    [
+        '=SUM($A1:C3)',
+        2,
+        2,
+        '=SUM($A3:E5)',
+    ],
+    [
+        '=SUM($A1:$A3)',
+        2,
+        2,
+        '=SUM($A3:$A5)',
+    ],
+    [
+        '=SUM(A$1:C3)',
+        2,
+        2,
+        '=SUM(C$1:E5)',
+    ],
+    [
+        '=SUM(A$1:C$3)',
+        2,
+        2,
+        '=SUM(C$1:E$3)',
+    ],
+    [
+        '=SUM(A:C)',
+        2,
+        2,
+        '=SUM(C:E)',
+    ],
+    [
+        '=SUM($A:C)',
+        2,
+        2,
+        '=SUM($A:E)',
+    ],
+    [
+        '=SUM(A:$E)',
+        2,
+        2,
+        '=SUM(C:$E)',
+    ],
+    [
+        '=SUM(1:3)',
+        2,
+        2,
+        '=SUM(3:5)',
+    ],
+    [
+        '=SUM($1:3)',
+        2,
+        2,
+        '=SUM($1:5)',
+    ],
+    [
+        '=SUM(1:$5)',
+        2,
+        2,
+        '=SUM(3:$5)',
+    ],
+];
diff --git a/tests/data/Writer/Ods/content-with-data.xml b/tests/data/Writer/Ods/content-with-data.xml
index 48184386..a9048047 100644
--- a/tests/data/Writer/Ods/content-with-data.xml
+++ b/tests/data/Writer/Ods/content-with-data.xml
@@ -79,7 +79,7 @@
                     <table:table-cell table:style-name="ce0" office:value-type="boolean" office:value="">
                         <text:p></text:p>
                     </table:table-cell>
-                    <table:table-cell table:style-name="ce10" table:formula="of:=IF(A3, CONCATENATE(A1, &quot; &quot;, A2), CONCATENATE(A2, &quot; &quot;, A1))" office:value-type="string" office:value="1 1">
+                    <table:table-cell table:style-name="ce10" table:formula="of:=IF([.A3]; CONCATENATE([.A1]; &quot; &quot;; [.A2]); CONCATENATE([.A2]; &quot; &quot;; [.A1]))" office:value-type="string" office:value="1 1">
                         <text:p>1 1</text:p>
                     </table:table-cell>
                     <table:table-cell table:style-name="ce1" office:value-type="float" office:value="42798.572060185">

From f34cc6cf6efbf98e65f761bfad448443b527c6b9 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Sun, 26 Jul 2020 13:56:27 +0200
Subject: [PATCH 108/153] Fix reference to PR in changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9dfe3dfe..a5e4e5b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,13 +33,13 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Changed
 
-- Improve Coverage for ODS Reader [#1545](https://github.com/phpoffice/phpspreadsheet/pull/1544)
+- Improve Coverage for ODS Reader [#1545](https://github.com/phpoffice/phpspreadsheet/pull/1545)
 - Named formula implementation, and improved handling of Defined Names generally [#1535](https://github.com/PHPOffice/PhpSpreadsheet/pull/1535)
   - fix resolution of relative named range values in the calculation engine; previously all named range values had been treated as absolute.
 
 ### Deprecated
 
--   **IMPORTANT NOTE:** This Introduces a **BC break** in the handling of named ranges. Previously, a named range cell reference of `B2` would be treated identically to a named range cell reference of `$B2` or `B$2` or `$B$2` because the calculation engine treated then all as absolute references. These changes "fix" that, so the calculation engine now handles relative references in named ranges correctly.
+- **IMPORTANT NOTE:** This Introduces a **BC break** in the handling of named ranges. Previously, a named range cell reference of `B2` would be treated identically to a named range cell reference of `$B2` or `B$2` or `$B$2` because the calculation engine treated then all as absolute references. These changes "fix" that, so the calculation engine now handles relative references in named ranges correctly.
   This change that resolves previously incorrect behaviour in the calculation may affect users who have dynamically defined named ranges using relative references when they should have used absolute references.
 
 ### Removed

From a9c8470b3b15a45e7f393dfcbf8e2f5c2fc68d97 Mon Sep 17 00:00:00 2001
From: Mark Baker <mark@lange.demon.co.uk>
Date: Sun, 26 Jul 2020 22:10:53 +0200
Subject: [PATCH 109/153] Identify HYPGEOM.DIST() as a separate Excel function,
 and additional unit tests (including unhappy path) (#1595)

---
 .../Calculation/Calculation.php               |  5 +++
 .../Calculation/Statistical.php               | 13 ++++---
 .../Functions/Statistical/HypGeomDistTest.php | 25 +++++++++++++
 .../data/Calculation/Statistical/CHIDIST.php  |  4 +++
 .../Calculation/Statistical/GAMMADIST.php     |  8 +++++
 .../data/Calculation/Statistical/GAMMAINV.php |  4 +++
 .../data/Calculation/Statistical/GAMMALN.php  |  4 +++
 .../data/Calculation/Statistical/GEOMEAN.php  |  7 ++++
 .../data/Calculation/Statistical/HARMEAN.php  | 11 ++++++
 .../Calculation/Statistical/HYPGEOMDIST.php   | 36 +++++++++++++++++++
 10 files changed, 113 insertions(+), 4 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/HypGeomDistTest.php
 create mode 100644 tests/data/Calculation/Statistical/HYPGEOMDIST.php

diff --git a/src/PhpSpreadsheet/Calculation/Calculation.php b/src/PhpSpreadsheet/Calculation/Calculation.php
index 8cb1c297..99260e3b 100644
--- a/src/PhpSpreadsheet/Calculation/Calculation.php
+++ b/src/PhpSpreadsheet/Calculation/Calculation.php
@@ -1250,6 +1250,11 @@ class Calculation
             'functionCall' => [Statistical::class, 'HYPGEOMDIST'],
             'argumentCount' => '4',
         ],
+        'HYPGEOM.DIST' => [
+            'category' => Category::CATEGORY_STATISTICAL,
+            'functionCall' => [Functions::class, 'DUMMY'],
+            'argumentCount' => '5',
+        ],
         'IF' => [
             'category' => Category::CATEGORY_LOGICAL,
             'functionCall' => [Logical::class, 'statementIf'],
diff --git a/src/PhpSpreadsheet/Calculation/Statistical.php b/src/PhpSpreadsheet/Calculation/Statistical.php
index 524438ea..4b113726 100644
--- a/src/PhpSpreadsheet/Calculation/Statistical.php
+++ b/src/PhpSpreadsheet/Calculation/Statistical.php
@@ -1901,12 +1901,17 @@ class Statistical
      */
     public static function HYPGEOMDIST($sampleSuccesses, $sampleNumber, $populationSuccesses, $populationNumber)
     {
-        $sampleSuccesses = floor(Functions::flattenSingleValue($sampleSuccesses));
-        $sampleNumber = floor(Functions::flattenSingleValue($sampleNumber));
-        $populationSuccesses = floor(Functions::flattenSingleValue($populationSuccesses));
-        $populationNumber = floor(Functions::flattenSingleValue($populationNumber));
+        $sampleSuccesses = Functions::flattenSingleValue($sampleSuccesses);
+        $sampleNumber = Functions::flattenSingleValue($sampleNumber);
+        $populationSuccesses = Functions::flattenSingleValue($populationSuccesses);
+        $populationNumber = Functions::flattenSingleValue($populationNumber);
 
         if ((is_numeric($sampleSuccesses)) && (is_numeric($sampleNumber)) && (is_numeric($populationSuccesses)) && (is_numeric($populationNumber))) {
+            $sampleSuccesses = floor($sampleSuccesses);
+            $sampleNumber = floor($sampleNumber);
+            $populationSuccesses = floor($populationSuccesses);
+            $populationNumber = floor($populationNumber);
+
             if (($sampleSuccesses < 0) || ($sampleSuccesses > $sampleNumber) || ($sampleSuccesses > $populationSuccesses)) {
                 return Functions::NAN();
             }
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/HypGeomDistTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/HypGeomDistTest.php
new file mode 100644
index 00000000..d05b60b5
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/HypGeomDistTest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class HypGeomDistTest extends TestCase
+{
+    /**
+     * @dataProvider providerHYPGEOMDIST
+     *
+     * @param mixed $expectedResult
+     */
+    public function testHYPGEOMDIST($expectedResult, ...$args): void
+    {
+        $result = Statistical::HYPGEOMDIST(...$args);
+        self::assertEqualsWithDelta($expectedResult, $result, 1E-12);
+    }
+
+    public function providerHYPGEOMDIST()
+    {
+        return require 'tests/data/Calculation/Statistical/HYPGEOMDIST.php';
+    }
+}
diff --git a/tests/data/Calculation/Statistical/CHIDIST.php b/tests/data/Calculation/Statistical/CHIDIST.php
index 023d2a7c..5cfdc664 100644
--- a/tests/data/Calculation/Statistical/CHIDIST.php
+++ b/tests/data/Calculation/Statistical/CHIDIST.php
@@ -37,6 +37,10 @@ return [
         '#VALUE!',
         'NAN', 3,
     ],
+    [
+        '#NUM!',
+        8, 0,
+    ],
     [
         '#NUM!',
         -8, 3,
diff --git a/tests/data/Calculation/Statistical/GAMMADIST.php b/tests/data/Calculation/Statistical/GAMMADIST.php
index dfc93c63..e79b3869 100644
--- a/tests/data/Calculation/Statistical/GAMMADIST.php
+++ b/tests/data/Calculation/Statistical/GAMMADIST.php
@@ -1,6 +1,14 @@
 <?php
 
 return [
+    [
+        0.03263913041829,
+        10.00001131, 9, 2, false,
+    ],
+    [
+        0.06809400387,
+        10.00001131, 9, 2, true,
+    ],
     [
         0.112020903828,
         6, 3, 2, false,
diff --git a/tests/data/Calculation/Statistical/GAMMAINV.php b/tests/data/Calculation/Statistical/GAMMAINV.php
index 64869092..3b3604b4 100644
--- a/tests/data/Calculation/Statistical/GAMMAINV.php
+++ b/tests/data/Calculation/Statistical/GAMMAINV.php
@@ -1,6 +1,10 @@
 <?php
 
 return [
+    [
+        10.0000111914377,
+        0.068094, 9, 2,
+    ],
     [
         5.348120627447,
         0.5, 3, 2,
diff --git a/tests/data/Calculation/Statistical/GAMMALN.php b/tests/data/Calculation/Statistical/GAMMALN.php
index 783f0afd..a415f559 100644
--- a/tests/data/Calculation/Statistical/GAMMALN.php
+++ b/tests/data/Calculation/Statistical/GAMMALN.php
@@ -5,6 +5,10 @@ return [
         2.453736570842,
         4.5,
     ],
+    [
+        1.791759469228,
+        4,
+    ],
     [
         '#VALUE!',
         'NAN',
diff --git a/tests/data/Calculation/Statistical/GEOMEAN.php b/tests/data/Calculation/Statistical/GEOMEAN.php
index 4e064b0c..f7627f40 100644
--- a/tests/data/Calculation/Statistical/GEOMEAN.php
+++ b/tests/data/Calculation/Statistical/GEOMEAN.php
@@ -1,8 +1,15 @@
 <?php
 
 return [
+    [
+        5.47698696965696,
+        4, 5, 8, 7, 11, 4, 3,
+    ],
     [
         1.6226711115996,
         2.5, 3, 0.5, 1, 3,
     ],
+    [
+        '#NUM!',
+    ],
 ];
diff --git a/tests/data/Calculation/Statistical/HARMEAN.php b/tests/data/Calculation/Statistical/HARMEAN.php
index c884b4ce..504d1b5e 100644
--- a/tests/data/Calculation/Statistical/HARMEAN.php
+++ b/tests/data/Calculation/Statistical/HARMEAN.php
@@ -1,8 +1,19 @@
 <?php
 
 return [
+    [
+        5.028375962062,
+        4, 5, 8, 7, 11, 4, 3,
+    ],
     [
         1.2295081967213,
         2.5, 3, 0.5, 1, 3,
     ],
+    [
+        '#NUM!',
+        2.5, -3, 0.5, 1, 3,
+    ],
+    [
+        '#N/A',
+    ],
 ];
diff --git a/tests/data/Calculation/Statistical/HYPGEOMDIST.php b/tests/data/Calculation/Statistical/HYPGEOMDIST.php
new file mode 100644
index 00000000..faec26c3
--- /dev/null
+++ b/tests/data/Calculation/Statistical/HYPGEOMDIST.php
@@ -0,0 +1,36 @@
+<?php
+
+return [
+    [
+        0.3632610939112,
+        1, 4, 8, 20,
+    ],
+    [
+        0.4525252525252,
+        1, 4, 4, 12,
+    ],
+    [
+        0.3393939393939,
+        2, 4, 4, 12,
+    ],
+    [
+        0.0646464646465,
+        3, 4, 4, 12,
+    ],
+    [
+        0.0020202020202,
+        4, 4, 4, 12,
+    ],
+    [
+        '#VALUE!',
+        'NAN', 4, 4, 12,
+    ],
+    [
+        '#NUM!',
+        5, 4, 4, 12,
+    ],
+    [
+        '#NUM!',
+        4, 4, 4, 3,
+    ],
+];

From a203c3a7eaf84152bb0b63de4c5cbc9fbbb8ba0d Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Mon, 27 Jul 2020 10:03:26 +0900
Subject: [PATCH 110/153] Drop obsolete code

---
 src/PhpSpreadsheet/Writer/Xls/Workbook.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/PhpSpreadsheet/Writer/Xls/Workbook.php b/src/PhpSpreadsheet/Writer/Xls/Workbook.php
index 27d3395f..f752bce6 100644
--- a/src/PhpSpreadsheet/Writer/Xls/Workbook.php
+++ b/src/PhpSpreadsheet/Writer/Xls/Workbook.php
@@ -2,7 +2,6 @@
 
 namespace PhpOffice\PhpSpreadsheet\Writer\Xls;
 
-use PHP_CodeSniffer\Tokenizers\PHP;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\DefinedName;

From 9683e5be189080a9c75298e00efb72be3f5c866a Mon Sep 17 00:00:00 2001
From: Mark Baker <mark@lange.demon.co.uk>
Date: Wed, 29 Jul 2020 23:56:37 +0200
Subject: [PATCH 111/153] More unit tests for statistical functions, including
 a bugfix to LARGE() (#1601)

* More unit tests for statistical functions, including a bugfix to LARGE() that was identified in testing
---
 src/PhpSpreadsheet/Calculation/Database.php   |  4 +--
 src/PhpSpreadsheet/Calculation/LookupRef.php  |  6 ++--
 src/PhpSpreadsheet/Calculation/MathTrig.php   | 13 +++----
 .../Calculation/Statistical.php               | 31 +++++++++--------
 src/PhpSpreadsheet/Calculation/TextData.php   |  5 +--
 .../Functions/Statistical/LargeTest.php       | 27 +++++++++++++++
 .../Functions/Statistical/LinEstTest.php      | 33 ++++++++++++++++++
 .../Functions/Statistical/LogEstTest.php      | 33 ++++++++++++++++++
 .../Functions/Statistical/LogInvTest.php      | 25 ++++++++++++++
 .../Functions/Statistical/MaxATest.php        | 25 ++++++++++++++
 .../Functions/Statistical/MaxTest.php         | 25 ++++++++++++++
 .../Functions/Statistical/MinATest.php        | 25 ++++++++++++++
 .../Functions/Statistical/MinTest.php         | 25 ++++++++++++++
 .../Functions/Statistical/SmallTest.php       | 27 +++++++++++++++
 tests/data/Calculation/Statistical/LARGE.php  | 34 +++++++++++++++++++
 tests/data/Calculation/Statistical/LINEST.php | 11 ++++++
 tests/data/Calculation/Statistical/LOGEST.php | 11 ++++++
 tests/data/Calculation/Statistical/LOGINV.php | 24 +++++++++++++
 tests/data/Calculation/Statistical/MAX.php    | 16 +++++++++
 tests/data/Calculation/Statistical/MAXA.php   | 28 +++++++++++++++
 tests/data/Calculation/Statistical/MIN.php    | 16 +++++++++
 tests/data/Calculation/Statistical/MINA.php   | 28 +++++++++++++++
 tests/data/Calculation/Statistical/SMALL.php  | 34 +++++++++++++++++++
 23 files changed, 478 insertions(+), 28 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LargeTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LinEstTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogEstTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogInvTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MaxATest.php
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MaxTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MinATest.php
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MinTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/SmallTest.php
 create mode 100644 tests/data/Calculation/Statistical/LARGE.php
 create mode 100644 tests/data/Calculation/Statistical/LINEST.php
 create mode 100644 tests/data/Calculation/Statistical/LOGEST.php
 create mode 100644 tests/data/Calculation/Statistical/LOGINV.php
 create mode 100644 tests/data/Calculation/Statistical/MAX.php
 create mode 100644 tests/data/Calculation/Statistical/MAXA.php
 create mode 100644 tests/data/Calculation/Statistical/MIN.php
 create mode 100644 tests/data/Calculation/Statistical/MINA.php
 create mode 100644 tests/data/Calculation/Statistical/SMALL.php

diff --git a/src/PhpSpreadsheet/Calculation/Database.php b/src/PhpSpreadsheet/Calculation/Database.php
index 96599088..2ba4af2d 100644
--- a/src/PhpSpreadsheet/Calculation/Database.php
+++ b/src/PhpSpreadsheet/Calculation/Database.php
@@ -552,7 +552,7 @@ class Database
      *                                        the column label in which you specify a condition for the
      *                                        column.
      *
-     * @return float
+     * @return float|string (string if result is an error)
      */
     public static function DVAR($database, $field, $criteria)
     {
@@ -591,7 +591,7 @@ class Database
      *                                        the column label in which you specify a condition for the
      *                                        column.
      *
-     * @return float
+     * @return float|string (string if result is an error)
      */
     public static function DVARP($database, $field, $criteria)
     {
diff --git a/src/PhpSpreadsheet/Calculation/LookupRef.php b/src/PhpSpreadsheet/Calculation/LookupRef.php
index 0636258b..45aa9239 100644
--- a/src/PhpSpreadsheet/Calculation/LookupRef.php
+++ b/src/PhpSpreadsheet/Calculation/LookupRef.php
@@ -126,7 +126,7 @@ class LookupRef
      *
      * @param null|array|string $cellAddress An array or array formula, or a reference to a range of cells for which you want the number of columns
      *
-     * @return int The number of columns in cellAddress
+     * @return int|string The number of columns in cellAddress, or a string if arguments are invalid
      */
     public static function COLUMNS($cellAddress = null)
     {
@@ -160,7 +160,7 @@ class LookupRef
      *
      * @param null|array|string $cellAddress A reference to a range of cells for which you want the row numbers
      *
-     * @return int or array of integer
+     * @return int|mixed[]|string
      */
     public static function ROW($cellAddress = null)
     {
@@ -203,7 +203,7 @@ class LookupRef
      *
      * @param null|array|string $cellAddress An array or array formula, or a reference to a range of cells for which you want the number of rows
      *
-     * @return int The number of rows in cellAddress
+     * @return int|string The number of rows in cellAddress, or a string if arguments are invalid
      */
     public static function ROWS($cellAddress = null)
     {
diff --git a/src/PhpSpreadsheet/Calculation/MathTrig.php b/src/PhpSpreadsheet/Calculation/MathTrig.php
index fa4c74d3..7539659e 100644
--- a/src/PhpSpreadsheet/Calculation/MathTrig.php
+++ b/src/PhpSpreadsheet/Calculation/MathTrig.php
@@ -871,7 +871,7 @@ class MathTrig
      *
      * Returns the ratio of the factorial of a sum of values to the product of factorials.
      *
-     * @param array of mixed Data Series
+     * @param mixed[] $args An array of mixed values for the Data Series
      *
      * @return float|string The result, or a string containing an error
      */
@@ -1149,7 +1149,7 @@ class MathTrig
      *
      * Returns the sum of a power series
      *
-     * @param array of mixed Data Series
+     * @param mixed[] $args An array of mixed values for the Data Series
      *
      * @return float|string The result, or a string containing an error
      */
@@ -1273,21 +1273,22 @@ class MathTrig
      *
      * Returns a subtotal in a list or database.
      *
-     * @param int the number 1 to 11 that specifies which function to
+     * @param int $functionType
+     *            A number 1 to 11 that specifies which function to
      *                    use in calculating subtotals within a range
      *                    list
      *            Numbers 101 to 111 shadow the functions of 1 to 11
      *                    but ignore any values in the range that are
      *                    in hidden rows or columns
-     * @param array of mixed Data Series
+     * @param mixed[] $args A mixed data series of values
      *
      * @return float|string
      */
-    public static function SUBTOTAL(...$args)
+    public static function SUBTOTAL($functionType, ...$args)
     {
         $cellReference = array_pop($args);
         $aArgs = Functions::flattenArrayIndexed($args);
-        $subtotal = array_shift($aArgs);
+        $subtotal = Functions::flattenSingleValue($functionType);
 
         // Calculate
         if ((is_numeric($subtotal)) && (!is_string($subtotal))) {
diff --git a/src/PhpSpreadsheet/Calculation/Statistical.php b/src/PhpSpreadsheet/Calculation/Statistical.php
index 4b113726..19f40f2d 100644
--- a/src/PhpSpreadsheet/Calculation/Statistical.php
+++ b/src/PhpSpreadsheet/Calculation/Statistical.php
@@ -1445,7 +1445,7 @@ class Statistical
             return $returnValue;
         }
 
-        return self::NA();
+        return Functions::NA();
     }
 
     /**
@@ -1701,7 +1701,6 @@ class Statistical
             $xHi = $alpha * $beta * 5;
 
             $x = $xNew = 1;
-            $error = $pdf = 0;
             $dx = 1024;
             $i = 0;
 
@@ -2019,11 +2018,12 @@ class Statistical
     public static function LARGE(...$args)
     {
         $aArgs = Functions::flattenArray($args);
-
-        // Calculate
-        $entry = floor(array_pop($aArgs));
+        $entry = array_pop($aArgs);
 
         if ((is_numeric($entry)) && (!is_string($entry))) {
+            $entry = (int) floor($entry);
+
+            // Calculate
             $mArgs = [];
             foreach ($aArgs as $arg) {
                 // Is it a numeric value?
@@ -2032,7 +2032,7 @@ class Statistical
                 }
             }
             $count = self::COUNT($mArgs);
-            $entry = floor(--$entry);
+            --$entry;
             if (($entry < 0) || ($entry >= $count) || ($count == 0)) {
                 return Functions::NAN();
             }
@@ -2873,7 +2873,7 @@ class Statistical
      * @param int $value the number whose rank you want to find
      * @param int $significance the number of significant digits for the returned percentage value
      *
-     * @return float
+     * @return float|string (string if result is an error)
      */
     public static function PERCENTRANK($valueSet, $value, $significance = 3)
     {
@@ -3169,6 +3169,8 @@ class Statistical
         $entry = array_pop($aArgs);
 
         if ((is_numeric($entry)) && (!is_string($entry))) {
+            $entry = (int) floor($entry);
+
             $mArgs = [];
             foreach ($aArgs as $arg) {
                 // Is it a numeric value?
@@ -3177,7 +3179,7 @@ class Statistical
                 }
             }
             $count = self::COUNT($mArgs);
-            $entry = floor(--$entry);
+            --$entry;
             if (($entry < 0) || ($entry >= $count) || ($count == 0)) {
                 return Functions::NAN();
             }
@@ -3481,7 +3483,6 @@ class Statistical
             $ttheta = atan2($value, sqrt($tterm));
             $tc = cos($ttheta);
             $ts = sin($ttheta);
-            $tsum = 0;
 
             if (($degrees % 2) == 1) {
                 $ti = 3;
@@ -3657,7 +3658,7 @@ class Statistical
      *
      * @param mixed ...$args Data values
      *
-     * @return float
+     * @return float|string (string if result is an error)
      */
     public static function VARFunc(...$args)
     {
@@ -3699,7 +3700,7 @@ class Statistical
      *
      * @param mixed ...$args Data values
      *
-     * @return float
+     * @return float|string (string if result is an error)
      */
     public static function VARA(...$args)
     {
@@ -3754,7 +3755,7 @@ class Statistical
      *
      * @param mixed ...$args Data values
      *
-     * @return float
+     * @return float|string (string if result is an error)
      */
     public static function VARP(...$args)
     {
@@ -3797,7 +3798,7 @@ class Statistical
      *
      * @param mixed ...$args Data values
      *
-     * @return float
+     * @return float|string (string if result is an error)
      */
     public static function VARPA(...$args)
     {
@@ -3853,7 +3854,7 @@ class Statistical
      * @param float $beta Beta Parameter
      * @param bool $cumulative
      *
-     * @return float
+     * @return float|string (string if result is an error)
      */
     public static function WEIBULL($value, $alpha, $beta, $cumulative)
     {
@@ -3887,7 +3888,7 @@ class Statistical
      * @param float $m0 Alpha Parameter
      * @param float $sigma Beta Parameter
      *
-     * @return float|string
+     * @return float|string (string if result is an error)
      */
     public static function ZTEST($dataSet, $m0, $sigma = null)
     {
diff --git a/src/PhpSpreadsheet/Calculation/TextData.php b/src/PhpSpreadsheet/Calculation/TextData.php
index 8f4b7d87..da958836 100644
--- a/src/PhpSpreadsheet/Calculation/TextData.php
+++ b/src/PhpSpreadsheet/Calculation/TextData.php
@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Calculation;
 
+use DateTimeInterface;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
@@ -98,7 +99,7 @@ class TextData
      *
      * @param string $characters Value
      *
-     * @return int
+     * @return int|string A string if arguments are invalid
      */
     public static function ASCIICODE($characters)
     {
@@ -543,7 +544,7 @@ class TextData
      *
      * @param mixed $value Value to check
      *
-     * @return bool
+     * @return DateTimeInterface|float|int|string A string if arguments are invalid
      */
     public static function VALUE($value = '')
     {
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LargeTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LargeTest.php
new file mode 100644
index 00000000..194248d0
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LargeTest.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class LargeTest extends TestCase
+{
+    /**
+     * @dataProvider providerLARGE
+     *
+     * @param mixed $expectedResult
+     * @param mixed $values
+     * @param mixed $position
+     */
+    public function testLARGE($expectedResult, $values, $position): void
+    {
+        $result = Statistical::LARGE($values, $position);
+        self::assertEqualsWithDelta($expectedResult, $result, 1E-12);
+    }
+
+    public function providerLARGE()
+    {
+        return require 'tests/data/Calculation/Statistical/LARGE.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LinEstTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LinEstTest.php
new file mode 100644
index 00000000..083ac899
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LinEstTest.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class LinEstTest extends TestCase
+{
+    /**
+     * @dataProvider providerLINEST
+     *
+     * @param mixed $expectedResult
+     * @param mixed $xValues
+     * @param mixed $yValues
+     * @param mixed $const
+     * @param mixed $stats
+     */
+    public function testLINEST($expectedResult, $yValues, $xValues, $const, $stats): void
+    {
+        $result = Statistical::LINEST($yValues, $xValues, $const, $stats);
+
+        $elements = count($expectedResult);
+        for ($element = 0; $element < $elements; ++$element) {
+            self::assertEqualsWithDelta($expectedResult[$element], $result[$element], 1E-12);
+        }
+    }
+
+    public function providerLINEST()
+    {
+        return require 'tests/data/Calculation/Statistical/LINEST.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogEstTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogEstTest.php
new file mode 100644
index 00000000..4d926f76
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogEstTest.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class LogEstTest extends TestCase
+{
+    /**
+     * @dataProvider providerLOGEST
+     *
+     * @param mixed $expectedResult
+     * @param mixed $xValues
+     * @param mixed $yValues
+     * @param mixed $const
+     * @param mixed $stats
+     */
+    public function testLOGEST($expectedResult, $yValues, $xValues, $const, $stats): void
+    {
+        $result = Statistical::LOGEST($yValues, $xValues, $const, $stats);
+
+        $elements = count($expectedResult);
+        for ($element = 0; $element < $elements; ++$element) {
+            self::assertEqualsWithDelta($expectedResult[$element], $result[$element], 1E-12);
+        }
+    }
+
+    public function providerLOGEST()
+    {
+        return require 'tests/data/Calculation/Statistical/LOGEST.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogInvTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogInvTest.php
new file mode 100644
index 00000000..8371707d
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/LogInvTest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class LogInvTest extends TestCase
+{
+    /**
+     * @dataProvider providerLOGINV
+     *
+     * @param mixed $expectedResult
+     */
+    public function testLOGINV($expectedResult, ...$args): void
+    {
+        $result = Statistical::LOGINV(...$args);
+        self::assertEqualsWithDelta($expectedResult, $result, 1E-12);
+    }
+
+    public function providerLOGINV(): array
+    {
+        return require 'tests/data/Calculation/Statistical/LOGINV.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MaxATest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MaxATest.php
new file mode 100644
index 00000000..ce338e84
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MaxATest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class MaxATest extends TestCase
+{
+    /**
+     * @dataProvider providerMAXA
+     *
+     * @param mixed $expectedResult
+     */
+    public function testMAXA($expectedResult, ...$args): void
+    {
+        $result = Statistical::MAXA(...$args);
+        self::assertEqualsWithDelta($expectedResult, $result, 1E-12);
+    }
+
+    public function providerMAXA(): array
+    {
+        return require 'tests/data/Calculation/Statistical/MAXA.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MaxTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MaxTest.php
new file mode 100644
index 00000000..cd329aa9
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MaxTest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class MaxTest extends TestCase
+{
+    /**
+     * @dataProvider providerMAX
+     *
+     * @param mixed $expectedResult
+     */
+    public function testMAX($expectedResult, ...$args): void
+    {
+        $result = Statistical::MAX(...$args);
+        self::assertEqualsWithDelta($expectedResult, $result, 1E-12);
+    }
+
+    public function providerMAX(): array
+    {
+        return require 'tests/data/Calculation/Statistical/MAX.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MinATest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MinATest.php
new file mode 100644
index 00000000..f24d1ca2
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MinATest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class MinATest extends TestCase
+{
+    /**
+     * @dataProvider providerMINA
+     *
+     * @param mixed $expectedResult
+     */
+    public function testMINA($expectedResult, ...$args): void
+    {
+        $result = Statistical::MINA(...$args);
+        self::assertEqualsWithDelta($expectedResult, $result, 1E-12);
+    }
+
+    public function providerMINA(): array
+    {
+        return require 'tests/data/Calculation/Statistical/MINA.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MinTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MinTest.php
new file mode 100644
index 00000000..a5a16588
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/MinTest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class MinTest extends TestCase
+{
+    /**
+     * @dataProvider providerMIN
+     *
+     * @param mixed $expectedResult
+     */
+    public function testMIN($expectedResult, ...$args): void
+    {
+        $result = Statistical::MIN(...$args);
+        self::assertEqualsWithDelta($expectedResult, $result, 1E-12);
+    }
+
+    public function providerMIN(): array
+    {
+        return require 'tests/data/Calculation/Statistical/MIN.php';
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/SmallTest.php b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/SmallTest.php
new file mode 100644
index 00000000..a40e5eb3
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Calculation/Functions/Statistical/SmallTest.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Statistical;
+
+use PhpOffice\PhpSpreadsheet\Calculation\Statistical;
+use PHPUnit\Framework\TestCase;
+
+class SmallTest extends TestCase
+{
+    /**
+     * @dataProvider providerSMALL
+     *
+     * @param mixed $expectedResult
+     * @param mixed $values
+     * @param mixed $position
+     */
+    public function testSMALL($expectedResult, $values, $position): void
+    {
+        $result = Statistical::SMALL($values, $position);
+        self::assertEqualsWithDelta($expectedResult, $result, 1E-12);
+    }
+
+    public function providerSMALL()
+    {
+        return require 'tests/data/Calculation/Statistical/SMALL.php';
+    }
+}
diff --git a/tests/data/Calculation/Statistical/LARGE.php b/tests/data/Calculation/Statistical/LARGE.php
new file mode 100644
index 00000000..3a6adcba
--- /dev/null
+++ b/tests/data/Calculation/Statistical/LARGE.php
@@ -0,0 +1,34 @@
+<?php
+
+return [
+    [
+        5,
+        [3, 4, 5, 2, 3, 4, 5, 6, 4, 7],
+        3,
+    ],
+    [
+        4,
+        [3, 4, 5, 2, 3, 4, 5, 6, 4, 7],
+        7,
+    ],
+    [
+        2,
+        [3, 4, '5', 2, 3, 4, '5', '6', 4, '7'],
+        6,
+    ],
+    [
+        '#VALUE!',
+        [3, 4, 5, 2, 3, 4, 5, 6, 4, 7],
+        'NAN',
+    ],
+    [
+        '#NUM!',
+        [3, 4, 5, 2, 3, 4, 5, 6, 4, 7],
+        -1,
+    ],
+    [
+        '#NUM!',
+        [],
+        1,
+    ],
+];
diff --git a/tests/data/Calculation/Statistical/LINEST.php b/tests/data/Calculation/Statistical/LINEST.php
new file mode 100644
index 00000000..2b2680c7
--- /dev/null
+++ b/tests/data/Calculation/Statistical/LINEST.php
@@ -0,0 +1,11 @@
+<?php
+
+return [
+    [
+        [2.0, 1.0],
+        [1, 9, 5, 7],
+        [0, 4, 2, 3],
+        true,
+        false,
+    ],
+];
diff --git a/tests/data/Calculation/Statistical/LOGEST.php b/tests/data/Calculation/Statistical/LOGEST.php
new file mode 100644
index 00000000..e74db005
--- /dev/null
+++ b/tests/data/Calculation/Statistical/LOGEST.php
@@ -0,0 +1,11 @@
+<?php
+
+return [
+    [
+        [1.463275628116, 495.304770158727],
+        [33100, 47300, 69000, 102000, 150000, 220000],
+        [11, 12, 13, 14, 15, 16],
+        true,
+        false,
+    ],
+];
diff --git a/tests/data/Calculation/Statistical/LOGINV.php b/tests/data/Calculation/Statistical/LOGINV.php
new file mode 100644
index 00000000..d8b626a9
--- /dev/null
+++ b/tests/data/Calculation/Statistical/LOGINV.php
@@ -0,0 +1,24 @@
+<?php
+
+return [
+    [
+        4.000025209777,
+        0.039084, 3.5, 1.2,
+    ],
+    [
+        6.653346075337,
+        0.3, 2, 0.2,
+    ],
+    [
+        7.135708009256,
+        0.3, 2.5, 1.02,
+    ],
+    [
+        '#VALUE!',
+        1.1, 2.2, 'NAN',
+    ],
+    [
+        '#NUM!',
+        1.1, 2.2, 3.3,
+    ],
+];
diff --git a/tests/data/Calculation/Statistical/MAX.php b/tests/data/Calculation/Statistical/MAX.php
new file mode 100644
index 00000000..63585307
--- /dev/null
+++ b/tests/data/Calculation/Statistical/MAX.php
@@ -0,0 +1,16 @@
+<?php
+
+return [
+    [
+        27,
+        10, 7, 9, 27, 2,
+    ],
+    [
+        10,
+        10, 7, 9, '27', 2,
+    ],
+    [
+        0,
+        null, 'STRING', true, '', '27',
+    ],
+];
diff --git a/tests/data/Calculation/Statistical/MAXA.php b/tests/data/Calculation/Statistical/MAXA.php
new file mode 100644
index 00000000..7f9d7608
--- /dev/null
+++ b/tests/data/Calculation/Statistical/MAXA.php
@@ -0,0 +1,28 @@
+<?php
+
+return [
+    [
+        27,
+        10, 7, 9, 27, 2,
+    ],
+    [
+        10,
+        10, 7, 9, '17', 2,
+    ],
+    [
+        0,
+        -10, -7, -9, '17', -2,
+    ],
+    [
+        1,
+        -10, true, -9, '17', -2,
+    ],
+    [
+        1,
+        null, 'STRING', true, '', -2, 0, false, '27',
+    ],
+    [
+        0,
+        null, 'STRING', '', 'xl95',
+    ],
+];
diff --git a/tests/data/Calculation/Statistical/MIN.php b/tests/data/Calculation/Statistical/MIN.php
new file mode 100644
index 00000000..f5c350bd
--- /dev/null
+++ b/tests/data/Calculation/Statistical/MIN.php
@@ -0,0 +1,16 @@
+<?php
+
+return [
+    [
+        2,
+        10, 7, 2, 9, 27,
+    ],
+    [
+        -9,
+        10, 7, -9, '-27', 2,
+    ],
+    [
+        0,
+        null, 'STRING', true, '', '27',
+    ],
+];
diff --git a/tests/data/Calculation/Statistical/MINA.php b/tests/data/Calculation/Statistical/MINA.php
new file mode 100644
index 00000000..754f9aad
--- /dev/null
+++ b/tests/data/Calculation/Statistical/MINA.php
@@ -0,0 +1,28 @@
+<?php
+
+return [
+    [
+        2,
+        10, 7, 9, 27, 2,
+    ],
+    [
+        -7,
+        10, '-9', -7, '17', 2,
+    ],
+    [
+        0,
+        10, 7, 9, '17', 2,
+    ],
+    [
+        1,
+        10, true, 9, 2,
+    ],
+    [
+        0,
+        null, true, 2, false,
+    ],
+    [
+        0,
+        null, 'STRING', '', 'xl95',
+    ],
+];
diff --git a/tests/data/Calculation/Statistical/SMALL.php b/tests/data/Calculation/Statistical/SMALL.php
new file mode 100644
index 00000000..d3395660
--- /dev/null
+++ b/tests/data/Calculation/Statistical/SMALL.php
@@ -0,0 +1,34 @@
+<?php
+
+return [
+    [
+        3,
+        [1, 4, 8, 3, 7, 12, 54, 8, 23],
+        2,
+    ],
+    [
+        4,
+        [3, 4, 5, 2, 3, 4, 6, 4, 7],
+        4,
+    ],
+    [
+        6,
+        ['3', 4, 5, '2', '3', 4, 5, 6, 4, 7],
+        6,
+    ],
+    [
+        '#VALUE!',
+        [3, 4, 5, 2, 3, 4, 5, 6, 4, 7],
+        'NAN',
+    ],
+    [
+        '#NUM!',
+        [3, 4, 5, 2, 3, 4, 5, 6, 4, 7],
+        -1,
+    ],
+    [
+        '#NUM!',
+        [],
+        1,
+    ],
+];

From 91185a93dcb38190a31c5e40d4910cef7e04e90c Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Sun, 9 Aug 2020 14:12:17 +0200
Subject: [PATCH 112/153] Starting from scratch again: PHP8 nightly build
 included in test run, and it should pickup PHPUnit >= 9.3

---
 .travis.yml   | 1 +
 composer.json | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 77eed441..b22f6a26 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ php:
   - 7.2
   - 7.3
   - 7.4
+  - nightly
 
 cache:
   directories:
diff --git a/composer.json b/composer.json
index 00b6fe9e..5e966ed9 100644
--- a/composer.json
+++ b/composer.json
@@ -66,7 +66,7 @@
         "jpgraph/jpgraph": "^4.0",
         "mpdf/mpdf": "^8.0",
         "phpcompatibility/php-compatibility": "^9.3",
-        "phpunit/phpunit": "^8.5",
+        "phpunit/phpunit": "^8.5|^9.3",
         "squizlabs/php_codesniffer": "^3.5",
         "tecnickcom/tcpdf": "^6.3"
     },

From 9d17408f1d212cdc42b027d8c59563886de6f0cc Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Sun, 9 Aug 2020 14:26:44 +0200
Subject: [PATCH 113/153] xdebug isn't built into the nightly PHP, so we'll get
 an error if we try to remove it; nightly should also be allow failures
 untilany identified issues are resolved

---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b22f6a26..95ba404d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,12 +14,15 @@ cache:
 
 before_script:
   # Deactivate xdebug
-  - phpenv config-rm xdebug.ini
+  - if [[ $TRAVIS_PHP_VERSION <> nightly ]]; then phpenv config-rm xdebug.ini; fi
   - composer install --ignore-platform-reqs
 
 script:
   - ./vendor/bin/phpunit --color=always --coverage-text
 
+allow_failures:
+  - php: nightly
+
 jobs:
   include:
 

From adc0e980e152583f804141b774cf8e46de6d1b5d Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Sun, 9 Aug 2020 14:33:13 +0200
Subject: [PATCH 114/153] <>/!=

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 95ba404d..c99c3aa4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ cache:
 
 before_script:
   # Deactivate xdebug
-  - if [[ $TRAVIS_PHP_VERSION <> nightly ]]; then phpenv config-rm xdebug.ini; fi
+  - if [[ $TRAVIS_PHP_VERSION != nightly ]]; then phpenv config-rm xdebug.ini; fi
   - composer install --ignore-platform-reqs
 
 script:

From 23e3a09dd365da772c463e9338d14dc15a7fd944 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Tue, 1 Sep 2020 11:02:07 +0200
Subject: [PATCH 115/153] Update to versions of complex and matrix libraries

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 5e966ed9..a122ec2c 100644
--- a/composer.json
+++ b/composer.json
@@ -54,8 +54,8 @@
         "ext-zip": "*",
         "ext-zlib": "*",
         "maennchen/zipstream-php": "^2.1",
-        "markbaker/complex": "^1.4",
-        "markbaker/matrix": "^1.2",
+        "markbaker/complex": "^1.5|^2.0",
+        "markbaker/matrix": "^1.2|^2.0",
         "psr/simple-cache": "^1.0",
         "psr/http-client": "^1.0",
         "psr/http-factory": "^1.0"

From 43db94e94fb2f8bfce3d3d95405ae5204d684289 Mon Sep 17 00:00:00 2001
From: oleibman <eclipsechasers2@yahoo.com>
Date: Thu, 1 Oct 2020 02:24:53 -0700
Subject: [PATCH 116/153] Calculation/DateTime Failure With PHP8 (#1661)

The following code generates an error with PHP8:
  if ($t1[1] > 29) {
    $t1[1] += 1900;

Under the "right" conditions, PHP8 evaluates the condition as true
when PHP8 is a non-numeric string and then generates an error trying
to perform += on that non-numeric string. Adding a numeric test
eliminates the problem. All unit tests involving this code now
succeed with both PHP7 and PHP8.
---
 src/PhpSpreadsheet/Calculation/DateTime.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PhpSpreadsheet/Calculation/DateTime.php b/src/PhpSpreadsheet/Calculation/DateTime.php
index bfce2a02..4c2b108a 100644
--- a/src/PhpSpreadsheet/Calculation/DateTime.php
+++ b/src/PhpSpreadsheet/Calculation/DateTime.php
@@ -489,7 +489,7 @@ class DateTime
             if ($yearFound) {
                 array_unshift($t1, 1);
             } else {
-                if ($t1[1] > 29) {
+                if (is_numeric($t1[1]) && $t1[1] > 29) {
                     $t1[1] += 1900;
                     array_unshift($t1, 1);
                 } else {

From 7d05e0557c1c0150db1ec02492c66aeec3e34724 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Thu, 1 Oct 2020 11:30:09 +0200
Subject: [PATCH 117/153] Update to versions of complex and matrix libraries

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index a122ec2c..09e6edf9 100644
--- a/composer.json
+++ b/composer.json
@@ -39,7 +39,7 @@
         ]
     },
     "require": {
-        "php": "^7.2",
+        "php": "^7.2|^8.0",
         "ext-ctype": "*",
         "ext-dom": "*",
         "ext-gd": "*",

From fe6221fe4950c97992e0444608d366e972ccd023 Mon Sep 17 00:00:00 2001
From: oleibman <eclipsechasers2@yahoo.com>
Date: Thu, 1 Oct 2020 03:38:36 -0700
Subject: [PATCH 118/153] Reader/Gnumeric Failure with PHP8 (#1662)

* Reader/Gnumeric Failure with PHP8

An explicit cast from SimpleXML to int is now needed with PHP8,
where it was performed implicitly with PHP7.
Unit tests run correctly for both PHP7 and PHP8 on corrected code.
---
 src/PhpSpreadsheet/Reader/Gnumeric.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/PhpSpreadsheet/Reader/Gnumeric.php b/src/PhpSpreadsheet/Reader/Gnumeric.php
index f4a44895..dc921c1e 100644
--- a/src/PhpSpreadsheet/Reader/Gnumeric.php
+++ b/src/PhpSpreadsheet/Reader/Gnumeric.php
@@ -543,7 +543,8 @@ class Gnumeric extends BaseReader
 
                     $endColumn = ($styleAttributes['endCol'] > $maxCol) ? $maxCol : (int) $styleAttributes['endCol'];
                     $endColumn = Coordinate::stringFromColumnIndex($endColumn + 1);
-                    $endRow = 1 + (($styleAttributes['endRow'] > $maxRow) ? $maxRow : $styleAttributes['endRow']);
+
+                    $endRow = 1 + (($styleAttributes['endRow'] > $maxRow) ? $maxRow : (int) $styleAttributes['endRow']);
                     $cellRange = $startColumn . $startRow . ':' . $endColumn . $endRow;
 
                     $styleAttributes = $styleRegion->Style->attributes();

From 416e27b6323b10e5f2072736553bf7fd6fc229e5 Mon Sep 17 00:00:00 2001
From: oleibman <eclipsechasers2@yahoo.com>
Date: Fri, 2 Oct 2020 01:52:28 -0700
Subject: [PATCH 119/153] ReverseSort bug, exposed but not caused by PHP8
 (#1660)

Some tests of ReferenceHelper functions columnReverseSort and
cellReverseSort which passed with PHP7 fail with PHP8.
Both functions use the following construction:
  return 1 - strcasecmp(whatever);
The "1" seems very mysterious. I believe that the correct code should be:
  return -strcasecmp(whatever);
It appears in particular that PHP7 strcasecmp was never returning a
value of 1 for the tests in question, but PHP8 strcasecmp does so.
With the corrected code, the tests pass in both PHP7 and PHP8.
---
 src/PhpSpreadsheet/ReferenceHelper.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PhpSpreadsheet/ReferenceHelper.php b/src/PhpSpreadsheet/ReferenceHelper.php
index 9205b76e..13f7cf71 100644
--- a/src/PhpSpreadsheet/ReferenceHelper.php
+++ b/src/PhpSpreadsheet/ReferenceHelper.php
@@ -69,7 +69,7 @@ class ReferenceHelper
      */
     public static function columnReverseSort($a, $b)
     {
-        return 1 - strcasecmp(strlen($a) . $a, strlen($b) . $b);
+        return -strcasecmp(strlen($a) . $a, strlen($b) . $b);
     }
 
     /**
@@ -108,7 +108,7 @@ class ReferenceHelper
         [$bc, $br] = sscanf($b, '%[A-Z]%d');
 
         if ($ar === $br) {
-            return 1 - strcasecmp(strlen($ac) . $ac, strlen($bc) . $bc);
+            return -strcasecmp(strlen($ac) . $ac, strlen($bc) . $bc);
         }
 
         return ($ar < $br) ? 1 : -1;

From 3d9867ce95c1134a2ddc44a115d8bbef1aef8e99 Mon Sep 17 00:00:00 2001
From: Simon Podlipsky <simon@podlipsky.net>
Date: Fri, 2 Oct 2020 10:55:50 +0200
Subject: [PATCH 120/153] Drop $this->spreadSheet null check from Xlsx Writer
 (#1646)

$this->spreadSheet cannot be null
---
 src/PhpSpreadsheet/Writer/Xlsx.php | 458 ++++++++++++++---------------
 1 file changed, 225 insertions(+), 233 deletions(-)

diff --git a/src/PhpSpreadsheet/Writer/Xlsx.php b/src/PhpSpreadsheet/Writer/Xlsx.php
index 4cb10287..d71541c8 100644
--- a/src/PhpSpreadsheet/Writer/Xlsx.php
+++ b/src/PhpSpreadsheet/Writer/Xlsx.php
@@ -178,238 +178,234 @@ class Xlsx extends BaseWriter
      */
     public function save($pFilename): void
     {
-        if ($this->spreadSheet !== null) {
-            // garbage collect
-            $this->pathNames = [];
-            $this->spreadSheet->garbageCollect();
+        // garbage collect
+        $this->pathNames = [];
+        $this->spreadSheet->garbageCollect();
 
-            $this->openFileHandle($pFilename);
+        $this->openFileHandle($pFilename);
 
-            $saveDebugLog = Calculation::getInstance($this->spreadSheet)->getDebugLog()->getWriteDebugLog();
-            Calculation::getInstance($this->spreadSheet)->getDebugLog()->setWriteDebugLog(false);
-            $saveDateReturnType = Functions::getReturnDateType();
-            Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
+        $saveDebugLog = Calculation::getInstance($this->spreadSheet)->getDebugLog()->getWriteDebugLog();
+        Calculation::getInstance($this->spreadSheet)->getDebugLog()->setWriteDebugLog(false);
+        $saveDateReturnType = Functions::getReturnDateType();
+        Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
 
-            // Create string lookup table
-            $this->stringTable = [];
-            for ($i = 0; $i < $this->spreadSheet->getSheetCount(); ++$i) {
-                $this->stringTable = $this->getWriterPart('StringTable')->createStringTable($this->spreadSheet->getSheet($i), $this->stringTable);
-            }
-
-            // Create styles dictionaries
-            $this->styleHashTable->addFromSource($this->getWriterPart('Style')->allStyles($this->spreadSheet));
-            $this->stylesConditionalHashTable->addFromSource($this->getWriterPart('Style')->allConditionalStyles($this->spreadSheet));
-            $this->fillHashTable->addFromSource($this->getWriterPart('Style')->allFills($this->spreadSheet));
-            $this->fontHashTable->addFromSource($this->getWriterPart('Style')->allFonts($this->spreadSheet));
-            $this->bordersHashTable->addFromSource($this->getWriterPart('Style')->allBorders($this->spreadSheet));
-            $this->numFmtHashTable->addFromSource($this->getWriterPart('Style')->allNumberFormats($this->spreadSheet));
-
-            // Create drawing dictionary
-            $this->drawingHashTable->addFromSource($this->getWriterPart('Drawing')->allDrawings($this->spreadSheet));
-
-            $options = new Archive();
-            $options->setEnableZip64(false);
-            $options->setOutputStream($this->fileHandle);
-
-            $this->zip = new ZipStream(null, $options);
-
-            // Add [Content_Types].xml to ZIP file
-            $this->addZipFile('[Content_Types].xml', $this->getWriterPart('ContentTypes')->writeContentTypes($this->spreadSheet, $this->includeCharts));
-
-            //if hasMacros, add the vbaProject.bin file, Certificate file(if exists)
-            if ($this->spreadSheet->hasMacros()) {
-                $macrosCode = $this->spreadSheet->getMacrosCode();
-                if ($macrosCode !== null) {
-                    // we have the code ?
-                    $this->addZipFile('xl/vbaProject.bin', $macrosCode); //allways in 'xl', allways named vbaProject.bin
-                    if ($this->spreadSheet->hasMacrosCertificate()) {
-                        //signed macros ?
-                        // Yes : add the certificate file and the related rels file
-                        $this->addZipFile('xl/vbaProjectSignature.bin', $this->spreadSheet->getMacrosCertificate());
-                        $this->addZipFile('xl/_rels/vbaProject.bin.rels', $this->getWriterPart('RelsVBA')->writeVBARelationships($this->spreadSheet));
-                    }
-                }
-            }
-            //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');
-                $this->addZipFile($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) {
-                        $this->addZipFile($tmpRootPath . $aPath, $aContent);
-                    }
-                    //the rels for files
-                    $this->addZipFile($tmpRootPath . '_rels/' . basename($tmpRibbonTarget) . '.rels', $this->getWriterPart('RelsRibbonObjects')->writeRibbonRelationships($this->spreadSheet));
-                }
-            }
-
-            // Add relationships to ZIP file
-            $this->addZipFile('_rels/.rels', $this->getWriterPart('Rels')->writeRelationships($this->spreadSheet));
-            $this->addZipFile('xl/_rels/workbook.xml.rels', $this->getWriterPart('Rels')->writeWorkbookRelationships($this->spreadSheet));
-
-            // Add document properties to ZIP file
-            $this->addZipFile('docProps/app.xml', $this->getWriterPart('DocProps')->writeDocPropsApp($this->spreadSheet));
-            $this->addZipFile('docProps/core.xml', $this->getWriterPart('DocProps')->writeDocPropsCore($this->spreadSheet));
-            $customPropertiesPart = $this->getWriterPart('DocProps')->writeDocPropsCustom($this->spreadSheet);
-            if ($customPropertiesPart !== null) {
-                $this->addZipFile('docProps/custom.xml', $customPropertiesPart);
-            }
-
-            // Add theme to ZIP file
-            $this->addZipFile('xl/theme/theme1.xml', $this->getWriterPart('Theme')->writeTheme($this->spreadSheet));
-
-            // Add string table to ZIP file
-            $this->addZipFile('xl/sharedStrings.xml', $this->getWriterPart('StringTable')->writeStringTable($this->stringTable));
-
-            // Add styles to ZIP file
-            $this->addZipFile('xl/styles.xml', $this->getWriterPart('Style')->writeStyles($this->spreadSheet));
-
-            // Add workbook to ZIP file
-            $this->addZipFile('xl/workbook.xml', $this->getWriterPart('Workbook')->writeWorkbook($this->spreadSheet, $this->preCalculateFormulas));
-
-            $chartCount = 0;
-            // Add worksheets
-            for ($i = 0; $i < $this->spreadSheet->getSheetCount(); ++$i) {
-                $this->addZipFile('xl/worksheets/sheet' . ($i + 1) . '.xml', $this->getWriterPart('Worksheet')->writeWorksheet($this->spreadSheet->getSheet($i), $this->stringTable, $this->includeCharts));
-                if ($this->includeCharts) {
-                    $charts = $this->spreadSheet->getSheet($i)->getChartCollection();
-                    if (count($charts) > 0) {
-                        foreach ($charts as $chart) {
-                            $this->addZipFile('xl/charts/chart' . ($chartCount + 1) . '.xml', $this->getWriterPart('Chart')->writeChart($chart, $this->preCalculateFormulas));
-                            ++$chartCount;
-                        }
-                    }
-                }
-            }
-
-            $chartRef1 = 0;
-            // Add worksheet relationships (drawings, ...)
-            for ($i = 0; $i < $this->spreadSheet->getSheetCount(); ++$i) {
-                // Add relationships
-                $this->addZipFile('xl/worksheets/_rels/sheet' . ($i + 1) . '.xml.rels', $this->getWriterPart('Rels')->writeWorksheetRelationships($this->spreadSheet->getSheet($i), ($i + 1), $this->includeCharts));
-
-                // Add unparsedLoadedData
-                $sheetCodeName = $this->spreadSheet->getSheet($i)->getCodeName();
-                $unparsedLoadedData = $this->spreadSheet->getUnparsedLoadedData();
-                if (isset($unparsedLoadedData['sheets'][$sheetCodeName]['ctrlProps'])) {
-                    foreach ($unparsedLoadedData['sheets'][$sheetCodeName]['ctrlProps'] as $ctrlProp) {
-                        $this->addZipFile($ctrlProp['filePath'], $ctrlProp['content']);
-                    }
-                }
-                if (isset($unparsedLoadedData['sheets'][$sheetCodeName]['printerSettings'])) {
-                    foreach ($unparsedLoadedData['sheets'][$sheetCodeName]['printerSettings'] as $ctrlProp) {
-                        $this->addZipFile($ctrlProp['filePath'], $ctrlProp['content']);
-                    }
-                }
-
-                $drawings = $this->spreadSheet->getSheet($i)->getDrawingCollection();
-                $drawingCount = count($drawings);
-                if ($this->includeCharts) {
-                    $chartCount = $this->spreadSheet->getSheet($i)->getChartCount();
-                }
-
-                // Add drawing and image relationship parts
-                if (($drawingCount > 0) || ($chartCount > 0)) {
-                    // Drawing relationships
-                    $this->addZipFile('xl/drawings/_rels/drawing' . ($i + 1) . '.xml.rels', $this->getWriterPart('Rels')->writeDrawingRelationships($this->spreadSheet->getSheet($i), $chartRef1, $this->includeCharts));
-
-                    // Drawings
-                    $this->addZipFile('xl/drawings/drawing' . ($i + 1) . '.xml', $this->getWriterPart('Drawing')->writeDrawings($this->spreadSheet->getSheet($i), $this->includeCharts));
-                } elseif (isset($unparsedLoadedData['sheets'][$sheetCodeName]['drawingAlternateContents'])) {
-                    // Drawings
-                    $this->addZipFile('xl/drawings/drawing' . ($i + 1) . '.xml', $this->getWriterPart('Drawing')->writeDrawings($this->spreadSheet->getSheet($i), $this->includeCharts));
-                }
-
-                // Add unparsed drawings
-                if (isset($unparsedLoadedData['sheets'][$sheetCodeName]['Drawings'])) {
-                    foreach ($unparsedLoadedData['sheets'][$sheetCodeName]['Drawings'] as $relId => $drawingXml) {
-                        $drawingFile = array_search($relId, $unparsedLoadedData['sheets'][$sheetCodeName]['drawingOriginalIds']);
-                        if ($drawingFile !== false) {
-                            $drawingFile = ltrim($drawingFile, '.');
-                            $this->addZipFile('xl' . $drawingFile, $drawingXml);
-                        }
-                    }
-                }
-
-                // Add comment relationship parts
-                if (count($this->spreadSheet->getSheet($i)->getComments()) > 0) {
-                    // VML Comments
-                    $this->addZipFile('xl/drawings/vmlDrawing' . ($i + 1) . '.vml', $this->getWriterPart('Comments')->writeVMLComments($this->spreadSheet->getSheet($i)));
-
-                    // Comments
-                    $this->addZipFile('xl/comments' . ($i + 1) . '.xml', $this->getWriterPart('Comments')->writeComments($this->spreadSheet->getSheet($i)));
-                }
-
-                // Add unparsed relationship parts
-                if (isset($unparsedLoadedData['sheets'][$sheetCodeName]['vmlDrawings'])) {
-                    foreach ($unparsedLoadedData['sheets'][$sheetCodeName]['vmlDrawings'] as $vmlDrawing) {
-                        $this->addZipFile($vmlDrawing['filePath'], $vmlDrawing['content']);
-                    }
-                }
-
-                // Add header/footer relationship parts
-                if (count($this->spreadSheet->getSheet($i)->getHeaderFooter()->getImages()) > 0) {
-                    // VML Drawings
-                    $this->addZipFile('xl/drawings/vmlDrawingHF' . ($i + 1) . '.vml', $this->getWriterPart('Drawing')->writeVMLHeaderFooterImages($this->spreadSheet->getSheet($i)));
-
-                    // VML Drawing relationships
-                    $this->addZipFile('xl/drawings/_rels/vmlDrawingHF' . ($i + 1) . '.vml.rels', $this->getWriterPart('Rels')->writeHeaderFooterDrawingRelationships($this->spreadSheet->getSheet($i)));
-
-                    // Media
-                    foreach ($this->spreadSheet->getSheet($i)->getHeaderFooter()->getImages() as $image) {
-                        $this->addZipFile('xl/media/' . $image->getIndexedFilename(), file_get_contents($image->getPath()));
-                    }
-                }
-            }
-
-            // Add media
-            for ($i = 0; $i < $this->getDrawingHashTable()->count(); ++$i) {
-                if ($this->getDrawingHashTable()->getByIndex($i) instanceof WorksheetDrawing) {
-                    $imageContents = null;
-                    $imagePath = $this->getDrawingHashTable()->getByIndex($i)->getPath();
-                    if (strpos($imagePath, 'zip://') !== false) {
-                        $imagePath = substr($imagePath, 6);
-                        $imagePathSplitted = explode('#', $imagePath);
-
-                        $imageZip = new ZipArchive();
-                        $imageZip->open($imagePathSplitted[0]);
-                        $imageContents = $imageZip->getFromName($imagePathSplitted[1]);
-                        $imageZip->close();
-                        unset($imageZip);
-                    } else {
-                        $imageContents = file_get_contents($imagePath);
-                    }
-
-                    $this->addZipFile('xl/media/' . str_replace(' ', '_', $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()), $imageContents);
-                } elseif ($this->getDrawingHashTable()->getByIndex($i) instanceof MemoryDrawing) {
-                    ob_start();
-                    call_user_func(
-                        $this->getDrawingHashTable()->getByIndex($i)->getRenderingFunction(),
-                        $this->getDrawingHashTable()->getByIndex($i)->getImageResource()
-                    );
-                    $imageContents = ob_get_contents();
-                    ob_end_clean();
-
-                    $this->addZipFile('xl/media/' . str_replace(' ', '_', $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()), $imageContents);
-                }
-            }
-
-            Functions::setReturnDateType($saveDateReturnType);
-            Calculation::getInstance($this->spreadSheet)->getDebugLog()->setWriteDebugLog($saveDebugLog);
-
-            // Close file
-            try {
-                $this->zip->finish();
-            } catch (OverflowException $e) {
-                throw new WriterException('Could not close resource.');
-            }
-
-            $this->maybeCloseFileHandle();
-        } else {
-            throw new WriterException('PhpSpreadsheet object unassigned.');
+        // Create string lookup table
+        $this->stringTable = [];
+        for ($i = 0; $i < $this->spreadSheet->getSheetCount(); ++$i) {
+            $this->stringTable = $this->getWriterPart('StringTable')->createStringTable($this->spreadSheet->getSheet($i), $this->stringTable);
         }
+
+        // Create styles dictionaries
+        $this->styleHashTable->addFromSource($this->getWriterPart('Style')->allStyles($this->spreadSheet));
+        $this->stylesConditionalHashTable->addFromSource($this->getWriterPart('Style')->allConditionalStyles($this->spreadSheet));
+        $this->fillHashTable->addFromSource($this->getWriterPart('Style')->allFills($this->spreadSheet));
+        $this->fontHashTable->addFromSource($this->getWriterPart('Style')->allFonts($this->spreadSheet));
+        $this->bordersHashTable->addFromSource($this->getWriterPart('Style')->allBorders($this->spreadSheet));
+        $this->numFmtHashTable->addFromSource($this->getWriterPart('Style')->allNumberFormats($this->spreadSheet));
+
+        // Create drawing dictionary
+        $this->drawingHashTable->addFromSource($this->getWriterPart('Drawing')->allDrawings($this->spreadSheet));
+
+        $options = new Archive();
+        $options->setEnableZip64(false);
+        $options->setOutputStream($this->fileHandle);
+
+        $this->zip = new ZipStream(null, $options);
+
+        // Add [Content_Types].xml to ZIP file
+        $this->addZipFile('[Content_Types].xml', $this->getWriterPart('ContentTypes')->writeContentTypes($this->spreadSheet, $this->includeCharts));
+
+        //if hasMacros, add the vbaProject.bin file, Certificate file(if exists)
+        if ($this->spreadSheet->hasMacros()) {
+            $macrosCode = $this->spreadSheet->getMacrosCode();
+            if ($macrosCode !== null) {
+                // we have the code ?
+                $this->addZipFile('xl/vbaProject.bin', $macrosCode); //allways in 'xl', allways named vbaProject.bin
+                if ($this->spreadSheet->hasMacrosCertificate()) {
+                    //signed macros ?
+                    // Yes : add the certificate file and the related rels file
+                    $this->addZipFile('xl/vbaProjectSignature.bin', $this->spreadSheet->getMacrosCertificate());
+                    $this->addZipFile('xl/_rels/vbaProject.bin.rels', $this->getWriterPart('RelsVBA')->writeVBARelationships($this->spreadSheet));
+                }
+            }
+        }
+        //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');
+            $this->addZipFile($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) {
+                    $this->addZipFile($tmpRootPath . $aPath, $aContent);
+                }
+                //the rels for files
+                $this->addZipFile($tmpRootPath . '_rels/' . basename($tmpRibbonTarget) . '.rels', $this->getWriterPart('RelsRibbonObjects')->writeRibbonRelationships($this->spreadSheet));
+            }
+        }
+
+        // Add relationships to ZIP file
+        $this->addZipFile('_rels/.rels', $this->getWriterPart('Rels')->writeRelationships($this->spreadSheet));
+        $this->addZipFile('xl/_rels/workbook.xml.rels', $this->getWriterPart('Rels')->writeWorkbookRelationships($this->spreadSheet));
+
+        // Add document properties to ZIP file
+        $this->addZipFile('docProps/app.xml', $this->getWriterPart('DocProps')->writeDocPropsApp($this->spreadSheet));
+        $this->addZipFile('docProps/core.xml', $this->getWriterPart('DocProps')->writeDocPropsCore($this->spreadSheet));
+        $customPropertiesPart = $this->getWriterPart('DocProps')->writeDocPropsCustom($this->spreadSheet);
+        if ($customPropertiesPart !== null) {
+            $this->addZipFile('docProps/custom.xml', $customPropertiesPart);
+        }
+
+        // Add theme to ZIP file
+        $this->addZipFile('xl/theme/theme1.xml', $this->getWriterPart('Theme')->writeTheme($this->spreadSheet));
+
+        // Add string table to ZIP file
+        $this->addZipFile('xl/sharedStrings.xml', $this->getWriterPart('StringTable')->writeStringTable($this->stringTable));
+
+        // Add styles to ZIP file
+        $this->addZipFile('xl/styles.xml', $this->getWriterPart('Style')->writeStyles($this->spreadSheet));
+
+        // Add workbook to ZIP file
+        $this->addZipFile('xl/workbook.xml', $this->getWriterPart('Workbook')->writeWorkbook($this->spreadSheet, $this->preCalculateFormulas));
+
+        $chartCount = 0;
+        // Add worksheets
+        for ($i = 0; $i < $this->spreadSheet->getSheetCount(); ++$i) {
+            $this->addZipFile('xl/worksheets/sheet' . ($i + 1) . '.xml', $this->getWriterPart('Worksheet')->writeWorksheet($this->spreadSheet->getSheet($i), $this->stringTable, $this->includeCharts));
+            if ($this->includeCharts) {
+                $charts = $this->spreadSheet->getSheet($i)->getChartCollection();
+                if (count($charts) > 0) {
+                    foreach ($charts as $chart) {
+                        $this->addZipFile('xl/charts/chart' . ($chartCount + 1) . '.xml', $this->getWriterPart('Chart')->writeChart($chart, $this->preCalculateFormulas));
+                        ++$chartCount;
+                    }
+                }
+            }
+        }
+
+        $chartRef1 = 0;
+        // Add worksheet relationships (drawings, ...)
+        for ($i = 0; $i < $this->spreadSheet->getSheetCount(); ++$i) {
+            // Add relationships
+            $this->addZipFile('xl/worksheets/_rels/sheet' . ($i + 1) . '.xml.rels', $this->getWriterPart('Rels')->writeWorksheetRelationships($this->spreadSheet->getSheet($i), ($i + 1), $this->includeCharts));
+
+            // Add unparsedLoadedData
+            $sheetCodeName = $this->spreadSheet->getSheet($i)->getCodeName();
+            $unparsedLoadedData = $this->spreadSheet->getUnparsedLoadedData();
+            if (isset($unparsedLoadedData['sheets'][$sheetCodeName]['ctrlProps'])) {
+                foreach ($unparsedLoadedData['sheets'][$sheetCodeName]['ctrlProps'] as $ctrlProp) {
+                    $this->addZipFile($ctrlProp['filePath'], $ctrlProp['content']);
+                }
+            }
+            if (isset($unparsedLoadedData['sheets'][$sheetCodeName]['printerSettings'])) {
+                foreach ($unparsedLoadedData['sheets'][$sheetCodeName]['printerSettings'] as $ctrlProp) {
+                    $this->addZipFile($ctrlProp['filePath'], $ctrlProp['content']);
+                }
+            }
+
+            $drawings = $this->spreadSheet->getSheet($i)->getDrawingCollection();
+            $drawingCount = count($drawings);
+            if ($this->includeCharts) {
+                $chartCount = $this->spreadSheet->getSheet($i)->getChartCount();
+            }
+
+            // Add drawing and image relationship parts
+            if (($drawingCount > 0) || ($chartCount > 0)) {
+                // Drawing relationships
+                $this->addZipFile('xl/drawings/_rels/drawing' . ($i + 1) . '.xml.rels', $this->getWriterPart('Rels')->writeDrawingRelationships($this->spreadSheet->getSheet($i), $chartRef1, $this->includeCharts));
+
+                // Drawings
+                $this->addZipFile('xl/drawings/drawing' . ($i + 1) . '.xml', $this->getWriterPart('Drawing')->writeDrawings($this->spreadSheet->getSheet($i), $this->includeCharts));
+            } elseif (isset($unparsedLoadedData['sheets'][$sheetCodeName]['drawingAlternateContents'])) {
+                // Drawings
+                $this->addZipFile('xl/drawings/drawing' . ($i + 1) . '.xml', $this->getWriterPart('Drawing')->writeDrawings($this->spreadSheet->getSheet($i), $this->includeCharts));
+            }
+
+            // Add unparsed drawings
+            if (isset($unparsedLoadedData['sheets'][$sheetCodeName]['Drawings'])) {
+                foreach ($unparsedLoadedData['sheets'][$sheetCodeName]['Drawings'] as $relId => $drawingXml) {
+                    $drawingFile = array_search($relId, $unparsedLoadedData['sheets'][$sheetCodeName]['drawingOriginalIds']);
+                    if ($drawingFile !== false) {
+                        $drawingFile = ltrim($drawingFile, '.');
+                        $this->addZipFile('xl' . $drawingFile, $drawingXml);
+                    }
+                }
+            }
+
+            // Add comment relationship parts
+            if (count($this->spreadSheet->getSheet($i)->getComments()) > 0) {
+                // VML Comments
+                $this->addZipFile('xl/drawings/vmlDrawing' . ($i + 1) . '.vml', $this->getWriterPart('Comments')->writeVMLComments($this->spreadSheet->getSheet($i)));
+
+                // Comments
+                $this->addZipFile('xl/comments' . ($i + 1) . '.xml', $this->getWriterPart('Comments')->writeComments($this->spreadSheet->getSheet($i)));
+            }
+
+            // Add unparsed relationship parts
+            if (isset($unparsedLoadedData['sheets'][$sheetCodeName]['vmlDrawings'])) {
+                foreach ($unparsedLoadedData['sheets'][$sheetCodeName]['vmlDrawings'] as $vmlDrawing) {
+                    $this->addZipFile($vmlDrawing['filePath'], $vmlDrawing['content']);
+                }
+            }
+
+            // Add header/footer relationship parts
+            if (count($this->spreadSheet->getSheet($i)->getHeaderFooter()->getImages()) > 0) {
+                // VML Drawings
+                $this->addZipFile('xl/drawings/vmlDrawingHF' . ($i + 1) . '.vml', $this->getWriterPart('Drawing')->writeVMLHeaderFooterImages($this->spreadSheet->getSheet($i)));
+
+                // VML Drawing relationships
+                $this->addZipFile('xl/drawings/_rels/vmlDrawingHF' . ($i + 1) . '.vml.rels', $this->getWriterPart('Rels')->writeHeaderFooterDrawingRelationships($this->spreadSheet->getSheet($i)));
+
+                // Media
+                foreach ($this->spreadSheet->getSheet($i)->getHeaderFooter()->getImages() as $image) {
+                    $this->addZipFile('xl/media/' . $image->getIndexedFilename(), file_get_contents($image->getPath()));
+                }
+            }
+        }
+
+        // Add media
+        for ($i = 0; $i < $this->getDrawingHashTable()->count(); ++$i) {
+            if ($this->getDrawingHashTable()->getByIndex($i) instanceof WorksheetDrawing) {
+                $imageContents = null;
+                $imagePath = $this->getDrawingHashTable()->getByIndex($i)->getPath();
+                if (strpos($imagePath, 'zip://') !== false) {
+                    $imagePath = substr($imagePath, 6);
+                    $imagePathSplitted = explode('#', $imagePath);
+
+                    $imageZip = new ZipArchive();
+                    $imageZip->open($imagePathSplitted[0]);
+                    $imageContents = $imageZip->getFromName($imagePathSplitted[1]);
+                    $imageZip->close();
+                    unset($imageZip);
+                } else {
+                    $imageContents = file_get_contents($imagePath);
+                }
+
+                $this->addZipFile('xl/media/' . str_replace(' ', '_', $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()), $imageContents);
+            } elseif ($this->getDrawingHashTable()->getByIndex($i) instanceof MemoryDrawing) {
+                ob_start();
+                call_user_func(
+                    $this->getDrawingHashTable()->getByIndex($i)->getRenderingFunction(),
+                    $this->getDrawingHashTable()->getByIndex($i)->getImageResource()
+                );
+                $imageContents = ob_get_contents();
+                ob_end_clean();
+
+                $this->addZipFile('xl/media/' . str_replace(' ', '_', $this->getDrawingHashTable()->getByIndex($i)->getIndexedFilename()), $imageContents);
+            }
+        }
+
+        Functions::setReturnDateType($saveDateReturnType);
+        Calculation::getInstance($this->spreadSheet)->getDebugLog()->setWriteDebugLog($saveDebugLog);
+
+        // Close file
+        try {
+            $this->zip->finish();
+        } catch (OverflowException $e) {
+            throw new WriterException('Could not close resource.');
+        }
+
+        $this->maybeCloseFileHandle();
     }
 
     /**
@@ -419,11 +415,7 @@ class Xlsx extends BaseWriter
      */
     public function getSpreadsheet()
     {
-        if ($this->spreadSheet !== null) {
-            return $this->spreadSheet;
-        }
-
-        throw new WriterException('No Spreadsheet object assigned.');
+        return $this->spreadSheet;
     }
 
     /**

From b9ca8a1a7ba1967d5acdc4e1e5c4de589ab4d5c6 Mon Sep 17 00:00:00 2001
From: Arman Hosseini <namra.1377@gmail.com>
Date: Fri, 2 Oct 2020 12:35:29 +0330
Subject: [PATCH 121/153] Update index.md (#1620)

---
 docs/index.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/index.md b/docs/index.md
index c1a06459..b1207d53 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -2,9 +2,8 @@
 
 ![Logo](./assets/logo.svg)
 
-PhpSpreadsheet is a library written in pure PHP and providing a set of
-classes that allow you to read from and to write to different
-spreadsheet file formats, like Excel and LibreOffice Calc.
+PhpSpreadsheet is a library written in pure PHP and offers a set of classes that
+allow you to read and write various spreadsheet file formats such as Excel and LibreOffice Calc.
 
 ## File formats supported
 

From ef997a0c8e54c4f8d7604fe2c69d1e97ce68a537 Mon Sep 17 00:00:00 2001
From: oleibman <eclipsechasers2@yahoo.com>
Date: Sun, 4 Oct 2020 18:21:40 -0700
Subject: [PATCH 122/153] Bug setting Superscript/Subscript to false (#1567)

If font style Superscript is set to true, Subscript is set to false.
Likewise, setting Subscript to true sets Superscript to false.
Both of these are working as they should. However,
setting Superscript to false causes Subscript to be set to true,
and setting Subscript to false causes Superscript to be set to true.
I believe that is an error in both cases. This change fixes it.

There seem to be no existing tests for Font styles.
I added the tests necessary to validate this change.
I will put adding more on my to-do list.
---
 src/PhpSpreadsheet/Style/Font.php            | 22 ++++------
 tests/PhpSpreadsheetTests/Style/FontTest.php | 42 ++++++++++++++++++++
 2 files changed, 50 insertions(+), 14 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Style/FontTest.php

diff --git a/src/PhpSpreadsheet/Style/Font.php b/src/PhpSpreadsheet/Style/Font.php
index eee7df04..a062a38f 100644
--- a/src/PhpSpreadsheet/Style/Font.php
+++ b/src/PhpSpreadsheet/Style/Font.php
@@ -357,21 +357,18 @@ class Font extends Supervisor
     /**
      * Set Superscript.
      *
-     * @param bool $pValue
-     *
      * @return $this
      */
-    public function setSuperscript($pValue)
+    public function setSuperscript(bool $pValue)
     {
-        if ($pValue == '') {
-            $pValue = false;
-        }
         if ($this->isSupervisor) {
             $styleArray = $this->getStyleArray(['superscript' => $pValue]);
             $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
         } else {
             $this->superscript = $pValue;
-            $this->subscript = !$pValue;
+            if ($this->superscript) {
+                $this->subscript = false;
+            }
         }
 
         return $this;
@@ -394,21 +391,18 @@ class Font extends Supervisor
     /**
      * Set Subscript.
      *
-     * @param bool $pValue
-     *
      * @return $this
      */
-    public function setSubscript($pValue)
+    public function setSubscript(bool $pValue)
     {
-        if ($pValue == '') {
-            $pValue = false;
-        }
         if ($this->isSupervisor) {
             $styleArray = $this->getStyleArray(['subscript' => $pValue]);
             $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
         } else {
             $this->subscript = $pValue;
-            $this->superscript = !$pValue;
+            if ($this->subscript) {
+                $this->superscript = false;
+            }
         }
 
         return $this;
diff --git a/tests/PhpSpreadsheetTests/Style/FontTest.php b/tests/PhpSpreadsheetTests/Style/FontTest.php
new file mode 100644
index 00000000..c014a4b6
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Style/FontTest.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Style;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PHPUnit\Framework\TestCase;
+
+class FontTest extends TestCase
+{
+    public function testSuperSubScript(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $cell = $sheet->getCell('A1');
+        $cell->setValue('Cell A1');
+        $font = $cell->getStyle()->getFont();
+        $font->setSuperscript(true);
+        $font->setSubscript(true);
+        self::assertFalse($font->getSuperscript(), 'Earlier set true loses');
+        self::assertTrue($font->getSubscript(), 'Last set true wins');
+        $font->setSubscript(true);
+        $font->setSuperscript(true);
+        self::assertTrue($font->getSuperscript(), 'Last set true wins');
+        self::assertFalse($font->getSubscript(), 'Earlier set true loses');
+        $font->setSuperscript(false);
+        $font->setSubscript(false);
+        self::assertFalse($font->getSuperscript(), 'False remains unchanged');
+        self::assertFalse($font->getSubscript(), 'False remains unchanged');
+        $font->setSubscript(false);
+        $font->setSuperscript(false);
+        self::assertFalse($font->getSuperscript(), 'False remains unchanged');
+        self::assertFalse($font->getSubscript(), 'False remains unchanged');
+        $font->setSubscript(true);
+        $font->setSuperscript(false);
+        self::assertFalse($font->getSuperscript(), 'False remains unchanged');
+        self::assertTrue($font->getSubscript(), 'True remains unchanged');
+        $font->setSubscript(false);
+        $font->setSuperscript(true);
+        self::assertTrue($font->getSuperscript());
+        self::assertFalse($font->getSubscript(), 'False remains unchanged');
+    }
+}

From 9f6da8a7c26c423947cf468c18f68f9fe8a18eb8 Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Mon, 5 Oct 2020 10:27:19 +0900
Subject: [PATCH 123/153] Update CHANGELOG

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5e4e5b9..f4d98d94 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,7 +35,8 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 - Improve Coverage for ODS Reader [#1545](https://github.com/phpoffice/phpspreadsheet/pull/1545)
 - Named formula implementation, and improved handling of Defined Names generally [#1535](https://github.com/PHPOffice/PhpSpreadsheet/pull/1535)
-  - fix resolution of relative named range values in the calculation engine; previously all named range values had been treated as absolute.
+- fix resolution of relative named range values in the calculation engine; previously all named range values had been treated as absolute.
+- Drop $this->spreadSheet null check from Xlsx Writer [#1646](https://github.com/phpoffice/phpspreadsheet/pull/1646)
 
 ### Deprecated
 
@@ -49,6 +50,10 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 ### Fixed
 
 - PrintArea causes exception [#1544](https://github.com/phpoffice/phpspreadsheet/pull/1544) 
+- Calculation/DateTime Failure With PHP8 [#1661](https://github.com/phpoffice/phpspreadsheet/pull/1661)
+- Reader/Gnumeric Failure with PHP8 [#1662](https://github.com/phpoffice/phpspreadsheet/pull/1662)
+- ReverseSort bug, exposed but not caused by PHP8 [#1660](https://github.com/phpoffice/phpspreadsheet/pull/1660)
+- Bug setting Superscript/Subscript to false [#1567](https://github.com/phpoffice/phpspreadsheet/pull/1567)
 
 ## 1.14.1 - 2020-07-19
 

From 12bdcaa78377848c48fdc7ebf137a550160b2b2f Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Mon, 5 Oct 2020 10:27:27 +0900
Subject: [PATCH 124/153] Sync README

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

diff --git a/README.md b/README.md
index 893b3784..0fed4301 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,8 @@
 [![License](https://poser.pugx.org/phpoffice/phpspreadsheet/license.png)](https://packagist.org/packages/phpoffice/phpspreadsheet)
 [![Join the chat at https://gitter.im/PHPOffice/PhpSpreadsheet](https://img.shields.io/badge/GITTER-join%20chat-green.svg)](https://gitter.im/PHPOffice/PhpSpreadsheet)
 
-PhpSpreadsheet is a library written in pure PHP and providing a set of classes that allow you to read from and to write to different spreadsheet file formats, like Excel and LibreOffice Calc.
+PhpSpreadsheet is a library written in pure PHP and offers a set of classes that
+allow you to read and write various spreadsheet file formats such as Excel and LibreOffice Calc.
 
 ## Documentation
 

From 71f21fb94aff88603cca26bcbf694f51c1cc5943 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Thu, 8 Oct 2020 02:56:13 +0200
Subject: [PATCH 125/153] Separate compoer.json for PHP8 to enforce phpunit
 ^9.3

---
 .travis.yml        |  1 +
 composer.php8.json | 89 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 composer.php8.json

diff --git a/.travis.yml b/.travis.yml
index c99c3aa4..24888140 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,7 @@ cache:
 before_script:
   # Deactivate xdebug
   - if [[ $TRAVIS_PHP_VERSION != nightly ]]; then phpenv config-rm xdebug.ini; fi
+  - if [[ $TRAVIS_PHP_VERSION == nightly ]]; then cp composer.php8.json composer.json; fi
   - composer install --ignore-platform-reqs
 
 script:
diff --git a/composer.php8.json b/composer.php8.json
new file mode 100644
index 00000000..b7ba2813
--- /dev/null
+++ b/composer.php8.json
@@ -0,0 +1,89 @@
+{
+  "name": "phpoffice/phpspreadsheet",
+  "description": "PHPSpreadsheet - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine",
+  "keywords": ["PHP", "OpenXML", "Excel", "xlsx", "xls", "ods", "gnumeric", "spreadsheet"],
+  "homepage": "https://github.com/PHPOffice/PhpSpreadsheet",
+  "type": "library",
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "Maarten Balliauw",
+      "homepage": "https://blog.maartenballiauw.be"
+    },
+    {
+      "name": "Mark Baker",
+      "homepage": "https://markbakeruk.net"
+    },
+    {
+      "name": "Franck Lefevre",
+      "homepage": "https://rootslabs.net"
+    },
+    {
+      "name": "Erik Tilt"
+    },
+    {
+      "name": "Adrien Crivelli"
+    }
+  ],
+  "scripts": {
+    "check": [
+      "php-cs-fixer fix --ansi --dry-run --diff",
+      "phpcs",
+      "phpunit --color=always"
+    ],
+    "fix": [
+      "php-cs-fixer fix --ansi"
+    ],
+    "versions": [
+      "phpcs --report-width=200 samples/ src/ tests/ --ignore=samples/Header.php --standard=PHPCompatibility --runtime-set testVersion 7.2- -n"
+    ]
+  },
+  "require": {
+    "php": "^7.2|^8.0",
+    "ext-ctype": "*",
+    "ext-dom": "*",
+    "ext-gd": "*",
+    "ext-iconv": "*",
+    "ext-fileinfo": "*",
+    "ext-libxml": "*",
+    "ext-mbstring": "*",
+    "ext-SimpleXML": "*",
+    "ext-xml": "*",
+    "ext-xmlreader": "*",
+    "ext-xmlwriter": "*",
+    "ext-zip": "*",
+    "ext-zlib": "*",
+    "maennchen/zipstream-php": "^2.1",
+    "markbaker/complex": "^1.5|^2.0",
+    "markbaker/matrix": "^1.2|^2.0",
+    "psr/simple-cache": "^1.0",
+    "psr/http-client": "^1.0",
+    "psr/http-factory": "^1.0"
+  },
+  "require-dev": {
+    "dompdf/dompdf": "^0.8.5",
+    "friendsofphp/php-cs-fixer": "^2.16",
+    "jpgraph/jpgraph": "^4.0",
+    "mpdf/mpdf": "^8.0",
+    "phpcompatibility/php-compatibility": "^9.3",
+    "phpunit/phpunit": "^9.3",
+    "squizlabs/php_codesniffer": "^3.5",
+    "tecnickcom/tcpdf": "^6.3"
+  },
+  "suggest": {
+    "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",
+    "jpgraph/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers"
+  },
+  "autoload": {
+    "psr-4": {
+      "PhpOffice\\PhpSpreadsheet\\": "src/PhpSpreadsheet"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "PhpOffice\\PhpSpreadsheetTests\\": "tests/PhpSpreadsheetTests"
+    }
+  }
+}

From f399acccc9adca54202b609f58397ff8740e6871 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Thu, 8 Oct 2020 03:00:53 +0200
Subject: [PATCH 126/153] We don't want the composer lock file for PHP8

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 24888140..f5866b98 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,7 @@ cache:
 before_script:
   # Deactivate xdebug
   - if [[ $TRAVIS_PHP_VERSION != nightly ]]; then phpenv config-rm xdebug.ini; fi
+  - if [[ $TRAVIS_PHP_VERSION == nightly ]]; then rm composer.lock; fi
   - if [[ $TRAVIS_PHP_VERSION == nightly ]]; then cp composer.php8.json composer.json; fi
   - composer install --ignore-platform-reqs
 

From 3db9fb7958623360c7f21e3222f785a156d1997a Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Thu, 8 Oct 2020 05:51:06 +0200
Subject: [PATCH 127/153] Work with existing composer file; but force a fresh
 install to require new dependency versions

---
 .travis.yml        |  1 -
 composer.php8.json | 89 ----------------------------------------------
 2 files changed, 90 deletions(-)
 delete mode 100644 composer.php8.json

diff --git a/.travis.yml b/.travis.yml
index f5866b98..d8e0c168 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,6 @@ before_script:
   # Deactivate xdebug
   - if [[ $TRAVIS_PHP_VERSION != nightly ]]; then phpenv config-rm xdebug.ini; fi
   - if [[ $TRAVIS_PHP_VERSION == nightly ]]; then rm composer.lock; fi
-  - if [[ $TRAVIS_PHP_VERSION == nightly ]]; then cp composer.php8.json composer.json; fi
   - composer install --ignore-platform-reqs
 
 script:
diff --git a/composer.php8.json b/composer.php8.json
deleted file mode 100644
index b7ba2813..00000000
--- a/composer.php8.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "name": "phpoffice/phpspreadsheet",
-  "description": "PHPSpreadsheet - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine",
-  "keywords": ["PHP", "OpenXML", "Excel", "xlsx", "xls", "ods", "gnumeric", "spreadsheet"],
-  "homepage": "https://github.com/PHPOffice/PhpSpreadsheet",
-  "type": "library",
-  "license": "MIT",
-  "authors": [
-    {
-      "name": "Maarten Balliauw",
-      "homepage": "https://blog.maartenballiauw.be"
-    },
-    {
-      "name": "Mark Baker",
-      "homepage": "https://markbakeruk.net"
-    },
-    {
-      "name": "Franck Lefevre",
-      "homepage": "https://rootslabs.net"
-    },
-    {
-      "name": "Erik Tilt"
-    },
-    {
-      "name": "Adrien Crivelli"
-    }
-  ],
-  "scripts": {
-    "check": [
-      "php-cs-fixer fix --ansi --dry-run --diff",
-      "phpcs",
-      "phpunit --color=always"
-    ],
-    "fix": [
-      "php-cs-fixer fix --ansi"
-    ],
-    "versions": [
-      "phpcs --report-width=200 samples/ src/ tests/ --ignore=samples/Header.php --standard=PHPCompatibility --runtime-set testVersion 7.2- -n"
-    ]
-  },
-  "require": {
-    "php": "^7.2|^8.0",
-    "ext-ctype": "*",
-    "ext-dom": "*",
-    "ext-gd": "*",
-    "ext-iconv": "*",
-    "ext-fileinfo": "*",
-    "ext-libxml": "*",
-    "ext-mbstring": "*",
-    "ext-SimpleXML": "*",
-    "ext-xml": "*",
-    "ext-xmlreader": "*",
-    "ext-xmlwriter": "*",
-    "ext-zip": "*",
-    "ext-zlib": "*",
-    "maennchen/zipstream-php": "^2.1",
-    "markbaker/complex": "^1.5|^2.0",
-    "markbaker/matrix": "^1.2|^2.0",
-    "psr/simple-cache": "^1.0",
-    "psr/http-client": "^1.0",
-    "psr/http-factory": "^1.0"
-  },
-  "require-dev": {
-    "dompdf/dompdf": "^0.8.5",
-    "friendsofphp/php-cs-fixer": "^2.16",
-    "jpgraph/jpgraph": "^4.0",
-    "mpdf/mpdf": "^8.0",
-    "phpcompatibility/php-compatibility": "^9.3",
-    "phpunit/phpunit": "^9.3",
-    "squizlabs/php_codesniffer": "^3.5",
-    "tecnickcom/tcpdf": "^6.3"
-  },
-  "suggest": {
-    "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",
-    "jpgraph/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers"
-  },
-  "autoload": {
-    "psr-4": {
-      "PhpOffice\\PhpSpreadsheet\\": "src/PhpSpreadsheet"
-    }
-  },
-  "autoload-dev": {
-    "psr-4": {
-      "PhpOffice\\PhpSpreadsheetTests\\": "tests/PhpSpreadsheetTests"
-    }
-  }
-}

From 8d0bb374e4337d74f426c807c303353636b58c19 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Thu, 8 Oct 2020 06:09:16 +0200
Subject: [PATCH 128/153] Allow failures on nightly

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d8e0c168..29e780f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,6 @@ php:
   - 7.2
   - 7.3
   - 7.4
-  - nightly
 
 cache:
   directories:

From 723ca37530ceb7ee42e1680c582d2edf45f5f1e1 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Thu, 8 Oct 2020 06:10:16 +0200
Subject: [PATCH 129/153] Allow failures on nightly fails if we remove it from
 the grid

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 29e780f3..d8e0c168 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ php:
   - 7.2
   - 7.3
   - 7.4
+  - nightly
 
 cache:
   directories:

From ab4d7413b0987d07f9e99378679ac5806d805018 Mon Sep 17 00:00:00 2001
From: Roland Eigelsreiter <brainfoolong@users.noreply.github.com>
Date: Thu, 8 Oct 2020 15:02:14 +0200
Subject: [PATCH 130/153] fixed php8 deprecation warning for
 libxml_disable_entity_loader() (#1625)

* fixed php8 deprecation warning for libxml_disable_entity_loader()
---
 CHANGELOG.md                                  |  3 ++-
 .../Reader/Security/XmlScanner.php            |  4 +--
 .../Reader/Security/XmlScannerTest.php        | 25 +++++++++++++++----
 tests/PhpSpreadsheetTests/SettingsTest.php    | 22 ++++++++++++----
 4 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4d98d94..fd9e8fd4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -560,6 +560,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Ignore inlineStr type if formula element exists - @ncrypthic [#570](https://github.com/PHPOffice/PHPExcel/issues/570)
 - Excel 2007 Reader freezes because of conditional formatting - @rentalhost [#575](https://github.com/PHPOffice/PHPExcel/issues/575)
 - Readers will now parse files containing worksheet titles over 31 characters [#176](https://github.com/PHPOffice/PhpSpreadsheet/pull/176)
+- Fixed PHP8 deprecation warning for libxml_disable_entity_loader() [#1625](https://github.com/phpoffice/phpspreadsheet/pull/1625) 
 
 ### General
 
@@ -581,4 +582,4 @@ For a comprehensive list of all class changes, and a semi-automated migration pa
 
 ## Previous versions of PHPExcel
 
-The changelog for the project when it was called PHPExcel is [still available](./CHANGELOG.PHPExcel.md).
+The changelog for the project when it was called PHPExcel is [still available](./CHANGELOG.PHPExcel.md).
\ No newline at end of file
diff --git a/src/PhpSpreadsheet/Reader/Security/XmlScanner.php b/src/PhpSpreadsheet/Reader/Security/XmlScanner.php
index 55bba632..a65797c1 100644
--- a/src/PhpSpreadsheet/Reader/Security/XmlScanner.php
+++ b/src/PhpSpreadsheet/Reader/Security/XmlScanner.php
@@ -63,7 +63,7 @@ class XmlScanner
 
     private function disableEntityLoaderCheck(): void
     {
-        if (Settings::getLibXmlDisableEntityLoader()) {
+        if (Settings::getLibXmlDisableEntityLoader() && \PHP_VERSION_ID < 80000) {
             $libxmlDisableEntityLoaderValue = libxml_disable_entity_loader(true);
 
             if (self::$libxmlDisableEntityLoaderValue === null) {
@@ -74,7 +74,7 @@ class XmlScanner
 
     public static function shutdown(): void
     {
-        if (self::$libxmlDisableEntityLoaderValue !== null) {
+        if (self::$libxmlDisableEntityLoaderValue !== null && \PHP_VERSION_ID < 80000) {
             libxml_disable_entity_loader(self::$libxmlDisableEntityLoaderValue);
             self::$libxmlDisableEntityLoaderValue = null;
         }
diff --git a/tests/PhpSpreadsheetTests/Reader/Security/XmlScannerTest.php b/tests/PhpSpreadsheetTests/Reader/Security/XmlScannerTest.php
index 8f42af10..f98ff7e1 100644
--- a/tests/PhpSpreadsheetTests/Reader/Security/XmlScannerTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Security/XmlScannerTest.php
@@ -12,7 +12,10 @@ class XmlScannerTest extends TestCase
 {
     protected function setUp(): void
     {
-        libxml_disable_entity_loader(false);
+        // php 8.+ deprecated libxml_disable_entity_loader() - It's on by default
+        if (\PHP_VERSION_ID < 80000) {
+            libxml_disable_entity_loader(false);
+        }
     }
 
     /**
@@ -24,13 +27,19 @@ class XmlScannerTest extends TestCase
      */
     public function testValidXML($filename, $expectedResult, $libxmlDisableEntityLoader): void
     {
-        $oldDisableEntityLoaderState = libxml_disable_entity_loader($libxmlDisableEntityLoader);
+        // php 8.+ deprecated libxml_disable_entity_loader() - It's on by default
+        if (\PHP_VERSION_ID < 80000) {
+            $oldDisableEntityLoaderState = libxml_disable_entity_loader($libxmlDisableEntityLoader);
+        }
 
         $reader = XmlScanner::getInstance(new \PhpOffice\PhpSpreadsheet\Reader\Xml());
         $result = $reader->scanFile($filename);
         self::assertEquals($expectedResult, $result);
 
-        libxml_disable_entity_loader($oldDisableEntityLoaderState);
+        // php 8.+ deprecated libxml_disable_entity_loader() - It's on by default
+        if (\PHP_VERSION_ID < 80000) {
+            libxml_disable_entity_loader($oldDisableEntityLoaderState);
+        }
     }
 
     public function providerValidXML()
@@ -56,13 +65,19 @@ class XmlScannerTest extends TestCase
     {
         $this->expectException(\PhpOffice\PhpSpreadsheet\Reader\Exception::class);
 
-        libxml_disable_entity_loader($libxmlDisableEntityLoader);
+        // php 8.+ deprecated libxml_disable_entity_loader() - It's on by default
+        if (\PHP_VERSION_ID < 80000) {
+            libxml_disable_entity_loader($libxmlDisableEntityLoader);
+        }
 
         $reader = XmlScanner::getInstance(new \PhpOffice\PhpSpreadsheet\Reader\Xml());
         $expectedResult = 'FAILURE: Should throw an Exception rather than return a value';
         $result = $reader->scanFile($filename);
         self::assertEquals($expectedResult, $result);
-        self::assertEquals($libxmlDisableEntityLoader, libxml_disable_entity_loader());
+        // php 8.+ deprecated libxml_disable_entity_loader() - It's on by default
+        if (\PHP_VERSION_ID < 80000) {
+            self::assertEquals($libxmlDisableEntityLoader, libxml_disable_entity_loader());
+        }
     }
 
     public function providerInvalidXML()
diff --git a/tests/PhpSpreadsheetTests/SettingsTest.php b/tests/PhpSpreadsheetTests/SettingsTest.php
index 4dff2d25..92f3bb1f 100644
--- a/tests/PhpSpreadsheetTests/SettingsTest.php
+++ b/tests/PhpSpreadsheetTests/SettingsTest.php
@@ -14,20 +14,29 @@ class SettingsTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->prevValue = libxml_disable_entity_loader();
-        libxml_disable_entity_loader(false); // Enable entity loader
+        // php 8.+ deprecated libxml_disable_entity_loader() - It's on by default
+        if (\PHP_VERSION_ID < 80000) {
+            $this->prevValue = libxml_disable_entity_loader();
+            libxml_disable_entity_loader(false); // Enable entity loader
+        }
     }
 
     protected function tearDown(): void
     {
-        libxml_disable_entity_loader($this->prevValue);
+        // php 8.+ deprecated libxml_disable_entity_loader() - It's on by default
+        if (\PHP_VERSION_ID < 80000) {
+            libxml_disable_entity_loader($this->prevValue);
+        }
     }
 
     public function testGetXMLSettings(): void
     {
         $result = Settings::getLibXmlLoaderOptions();
         self::assertTrue((bool) ((LIBXML_DTDLOAD | LIBXML_DTDATTR) & $result));
-        self::assertFalse(libxml_disable_entity_loader());
+        // php 8.+ deprecated libxml_disable_entity_loader() - It's on by default
+        if (\PHP_VERSION_ID < 80000) {
+            self::assertFalse(libxml_disable_entity_loader());
+        }
     }
 
     public function testSetXMLSettings(): void
@@ -35,6 +44,9 @@ class SettingsTest extends TestCase
         Settings::setLibXmlLoaderOptions(LIBXML_DTDLOAD | LIBXML_DTDATTR | LIBXML_DTDVALID);
         $result = Settings::getLibXmlLoaderOptions();
         self::assertTrue((bool) ((LIBXML_DTDLOAD | LIBXML_DTDATTR | LIBXML_DTDVALID) & $result));
-        self::assertFalse(libxml_disable_entity_loader());
+        // php 8.+ deprecated libxml_disable_entity_loader() - It's on by default
+        if (\PHP_VERSION_ID < 80000) {
+            self::assertFalse(libxml_disable_entity_loader());
+        }
     }
 }

From 87a909aaf8987166541d95b702b05a16fd7e5163 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Fri, 9 Oct 2020 12:58:33 +0200
Subject: [PATCH 131/153] Use ZipArchive methods as zip_* functions are
 deprecated in PHP8

---
 .../Writer/Xlsx/UnparsedDataCloneTest.php       | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/tests/PhpSpreadsheetTests/Writer/Xlsx/UnparsedDataCloneTest.php b/tests/PhpSpreadsheetTests/Writer/Xlsx/UnparsedDataCloneTest.php
index d2afb423..2eeaef9d 100644
--- a/tests/PhpSpreadsheetTests/Writer/Xlsx/UnparsedDataCloneTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Xlsx/UnparsedDataCloneTest.php
@@ -34,19 +34,20 @@ class UnparsedDataCloneTest extends TestCase
         $writer = new \PhpOffice\PhpSpreadsheet\Writer\Xlsx($spreadsheet);
         $writer->save($resultFilename);
         $dupname = 'Unable to open saved file';
-        $zip = zip_open($resultFilename);
-        if (is_resource($zip)) {
+
+        $zip = new \ZipArchive();
+        if ($zip->open($resultFilename) !== false) {
             $names = [];
             $dupname = '';
-            while ($zip_entry = zip_read($zip)) {
-                $zipname = zip_entry_name($zip_entry);
-                if (in_array($zipname, $names)) {
-                    $dupname .= "$zipname,";
+            for ($index = 0; $index < $zip->numFiles; ++$index) {
+                $filename = $zip->getNameIndex($index);
+                if (in_array($filename, $names)) {
+                    $dupname .= "$filename,";
                 } else {
-                    $names[] = $zipname;
+                    $names[] = $filename;
                 }
             }
-            zip_close($zip);
+            $zip->close();
         }
         unlink($resultFilename);
         self::assertEquals('', $dupname);

From ee13533db3c06b3f256bcd96e0e75b5f5ce53aad Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Fri, 9 Oct 2020 14:31:16 +0200
Subject: [PATCH 132/153] Remove tests that include tcPDF and DomPDF libraries
 when running against PHP8, because neither library is yet PHP8-ready

---
 samples/Basic/26_Utf8.php                     | 10 ++++----
 samples/Pdf/21b_Pdf.php                       | 24 +++++++++++--------
 .../Functional/StreamTest.php                 | 13 +++++++---
 .../PhpSpreadsheetTests/Helper/SampleTest.php | 10 ++++++++
 4 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/samples/Basic/26_Utf8.php b/samples/Basic/26_Utf8.php
index 52a64509..52953251 100644
--- a/samples/Basic/26_Utf8.php
+++ b/samples/Basic/26_Utf8.php
@@ -12,10 +12,12 @@ $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']);
 
-// Export to PDF (.pdf)
-$helper->log('Write to PDF format');
-IOFactory::registerWriter('Pdf', \PhpOffice\PhpSpreadsheet\Writer\Pdf\Dompdf::class);
-$helper->write($spreadsheet, __FILE__, ['Pdf']);
+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']);
+}
 
 // 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 c67ff3d2..6770b7c5 100644
--- a/samples/Pdf/21b_Pdf.php
+++ b/samples/Pdf/21b_Pdf.php
@@ -32,11 +32,13 @@ $spreadsheet->getActiveSheet()->setShowGridLines(false);
 $helper->log('Set orientation to landscape');
 $spreadsheet->getActiveSheet()->getPageSetup()->setOrientation(PageSetup::ORIENTATION_LANDSCAPE);
 
-$helper->log('Write to Dompdf');
-$writer = new Dompdf($spreadsheet);
-$filename = $helper->getFileName('21b_Pdf_dompdf.xlsx', 'pdf');
-$writer->setEditHtmlCallback('replaceBody');
-$writer->save($filename);
+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 Mpdf');
 $writer = new Mpdf($spreadsheet);
@@ -44,8 +46,10 @@ $filename = $helper->getFileName('21b_Pdf_mpdf.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);
+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);
+}
\ No newline at end of file
diff --git a/tests/PhpSpreadsheetTests/Functional/StreamTest.php b/tests/PhpSpreadsheetTests/Functional/StreamTest.php
index dcca6b8a..3ca01fc4 100644
--- a/tests/PhpSpreadsheetTests/Functional/StreamTest.php
+++ b/tests/PhpSpreadsheetTests/Functional/StreamTest.php
@@ -10,16 +10,23 @@ class StreamTest extends TestCase
 {
     public function providerFormats(): array
     {
-        return [
+        $providerFormats = [
             ['Xls'],
             ['Xlsx'],
             ['Ods'],
             ['Csv'],
             ['Html'],
-            ['Tcpdf'],
-            ['Dompdf'],
             ['Mpdf'],
         ];
+
+        if (\PHP_VERSION_ID < 80000) {
+            $providerFormats = array_merge(
+                $providerFormats,
+                [['Tcpdf'],['Dompdf']]
+            );
+        }
+
+        return $providerFormats;
     }
 
     /**
diff --git a/tests/PhpSpreadsheetTests/Helper/SampleTest.php b/tests/PhpSpreadsheetTests/Helper/SampleTest.php
index eb729dc9..369b205e 100644
--- a/tests/PhpSpreadsheetTests/Helper/SampleTest.php
+++ b/tests/PhpSpreadsheetTests/Helper/SampleTest.php
@@ -31,6 +31,16 @@ class SampleTest extends TestCase
             '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
         ];
+        // TCPDF and DomPDF libraries don't support PHP8 yet
+        if (\PHP_VERSION_ID >= 80000) {
+            $skipped = array_merge(
+                $skipped,
+                [
+                    'Pdf/21_Pdf_Domdf.php',
+                    'Pdf/21_Pdf_TCPDF.php',
+                ]
+            );
+        }
 
         // Unfortunately some tests are too long be ran with code-coverage
         // analysis on Travis, so we need to exclude them

From 6e6c68e7b3e294d9e8a1acd921ca4a039db56aa6 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Fri, 9 Oct 2020 14:52:01 +0200
Subject: [PATCH 133/153] Let's try to figure out why we're having an issue
 with a temp csv file

---
 src/PhpSpreadsheet/Reader/Csv.php                         | 1 +
 tests/PhpSpreadsheetTests/Writer/Csv/CsvEnclosureTest.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/PhpSpreadsheet/Reader/Csv.php b/src/PhpSpreadsheet/Reader/Csv.php
index db2b50b9..30b39a9b 100644
--- a/src/PhpSpreadsheet/Reader/Csv.php
+++ b/src/PhpSpreadsheet/Reader/Csv.php
@@ -522,6 +522,7 @@ class Csv extends BaseReader
 
         // Attempt to guess mimetype
         $type = mime_content_type($pFilename);
+        var_dump($type);
         $supportedTypes = [
             'text/csv',
             'text/plain',
diff --git a/tests/PhpSpreadsheetTests/Writer/Csv/CsvEnclosureTest.php b/tests/PhpSpreadsheetTests/Writer/Csv/CsvEnclosureTest.php
index d048183c..d4799356 100644
--- a/tests/PhpSpreadsheetTests/Writer/Csv/CsvEnclosureTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Csv/CsvEnclosureTest.php
@@ -153,6 +153,7 @@ class CsvEnclosureTest extends Functional\AbstractFunctional
         $writer->save($filename);
         $filedata = file_get_contents($filename);
         $filedata = preg_replace('/\\r/', '', $filedata);
+        var_dump($filedata);
         $reader = new CsvReader();
         $reader->setDelimiter($delimiter);
         $reader->setEnclosure($enclosure);

From e3b9b0d29cfd301a8ba3f9af37e1080607dac6df Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Fri, 9 Oct 2020 14:57:45 +0200
Subject: [PATCH 134/153] Need to add `application/csv` to the list of valid
 CSV mime types

---
 src/PhpSpreadsheet/Reader/Csv.php                         | 2 +-
 tests/PhpSpreadsheetTests/Writer/Csv/CsvEnclosureTest.php | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/PhpSpreadsheet/Reader/Csv.php b/src/PhpSpreadsheet/Reader/Csv.php
index 30b39a9b..d6eb16b0 100644
--- a/src/PhpSpreadsheet/Reader/Csv.php
+++ b/src/PhpSpreadsheet/Reader/Csv.php
@@ -522,8 +522,8 @@ class Csv extends BaseReader
 
         // Attempt to guess mimetype
         $type = mime_content_type($pFilename);
-        var_dump($type);
         $supportedTypes = [
+            'application/csv',
             'text/csv',
             'text/plain',
             'inode/x-empty',
diff --git a/tests/PhpSpreadsheetTests/Writer/Csv/CsvEnclosureTest.php b/tests/PhpSpreadsheetTests/Writer/Csv/CsvEnclosureTest.php
index d4799356..d048183c 100644
--- a/tests/PhpSpreadsheetTests/Writer/Csv/CsvEnclosureTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Csv/CsvEnclosureTest.php
@@ -153,7 +153,6 @@ class CsvEnclosureTest extends Functional\AbstractFunctional
         $writer->save($filename);
         $filedata = file_get_contents($filename);
         $filedata = preg_replace('/\\r/', '', $filedata);
-        var_dump($filedata);
         $reader = new CsvReader();
         $reader->setDelimiter($delimiter);
         $reader->setEnclosure($enclosure);

From 930fdc1b0c0f3ef3bbeb50641997e1a330de0402 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Fri, 9 Oct 2020 15:59:59 +0200
Subject: [PATCH 135/153] Locale-specific float to string is changed in PHP as
 per https://wiki.php.net/rfc/locale_independent_float_to_string

---
 tests/PhpSpreadsheetTests/Writer/Xlsx/LocaleFloatsTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/PhpSpreadsheetTests/Writer/Xlsx/LocaleFloatsTest.php b/tests/PhpSpreadsheetTests/Writer/Xlsx/LocaleFloatsTest.php
index 81d4a777..83defb7b 100644
--- a/tests/PhpSpreadsheetTests/Writer/Xlsx/LocaleFloatsTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Xlsx/LocaleFloatsTest.php
@@ -54,6 +54,7 @@ class LocaleFloatsTest extends TestCase
         preg_match('/(?:double|float)\(([^\)]+)\)/mui', ob_get_clean(), $matches);
         self::assertArrayHasKey(1, $matches);
         $actual = $matches[1];
-        self::assertEquals('1,1', $actual);
+        // From PHP8, https://wiki.php.net/rfc/locale_independent_float_to_string applies
+        self::assertEquals((\PHP_VERSION_ID < 80000) ? '1,1' : '1.1', $actual);
     }
 }

From dcc47fb287d4bac982fab8d80780583151b4188b Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Fri, 9 Oct 2020 16:08:20 +0200
Subject: [PATCH 136/153] Codestyle clean-ups

---
 samples/Pdf/21b_Pdf.php                                        | 2 +-
 tests/PhpSpreadsheetTests/Functional/StreamTest.php            | 2 +-
 .../PhpSpreadsheetTests/Writer/Xlsx/UnparsedDataCloneTest.php  | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/samples/Pdf/21b_Pdf.php b/samples/Pdf/21b_Pdf.php
index 6770b7c5..ad2f609b 100644
--- a/samples/Pdf/21b_Pdf.php
+++ b/samples/Pdf/21b_Pdf.php
@@ -52,4 +52,4 @@ if (\PHP_VERSION_ID < 80000) {
     $filename = $helper->getFileName('21b_Pdf_tcpdf.xlsx', 'pdf');
     $writer->setEditHtmlCallback('replaceBody');
     $writer->save($filename);
-}
\ No newline at end of file
+}
diff --git a/tests/PhpSpreadsheetTests/Functional/StreamTest.php b/tests/PhpSpreadsheetTests/Functional/StreamTest.php
index 3ca01fc4..03f9a2d9 100644
--- a/tests/PhpSpreadsheetTests/Functional/StreamTest.php
+++ b/tests/PhpSpreadsheetTests/Functional/StreamTest.php
@@ -22,7 +22,7 @@ class StreamTest extends TestCase
         if (\PHP_VERSION_ID < 80000) {
             $providerFormats = array_merge(
                 $providerFormats,
-                [['Tcpdf'],['Dompdf']]
+                [['Tcpdf'], ['Dompdf']]
             );
         }
 
diff --git a/tests/PhpSpreadsheetTests/Writer/Xlsx/UnparsedDataCloneTest.php b/tests/PhpSpreadsheetTests/Writer/Xlsx/UnparsedDataCloneTest.php
index 2eeaef9d..660e40fe 100644
--- a/tests/PhpSpreadsheetTests/Writer/Xlsx/UnparsedDataCloneTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Xlsx/UnparsedDataCloneTest.php
@@ -5,6 +5,7 @@ namespace PhpOffice\PhpSpreadsheetTests\Writer\Xlsx;
 use PhpOffice\PhpSpreadsheet\Settings;
 use PhpOffice\PhpSpreadsheet\Shared\File;
 use PHPUnit\Framework\TestCase;
+use ZipArchive;
 
 class UnparsedDataCloneTest extends TestCase
 {
@@ -35,7 +36,7 @@ class UnparsedDataCloneTest extends TestCase
         $writer->save($resultFilename);
         $dupname = 'Unable to open saved file';
 
-        $zip = new \ZipArchive();
+        $zip = new ZipArchive();
         if ($zip->open($resultFilename) !== false) {
             $names = [];
             $dupname = '';

From ebb7569dbac4fed22ce225bf3eee27511c28a528 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Fri, 9 Oct 2020 17:55:06 +0200
Subject: [PATCH 137/153] Switch from using poser badges to shields.io because
 poser wasn't picking up the correct license

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 0fed4301..0cef8326 100644
--- a/README.md
+++ b/README.md
@@ -3,9 +3,9 @@
 [![Build Status](https://travis-ci.org/PHPOffice/PhpSpreadsheet.svg?branch=master)](https://travis-ci.org/PHPOffice/PhpSpreadsheet)
 [![Code Quality](https://scrutinizer-ci.com/g/PHPOffice/PhpSpreadsheet/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/PHPOffice/PhpSpreadsheet/?branch=master)
 [![Code Coverage](https://scrutinizer-ci.com/g/PHPOffice/PhpSpreadsheet/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/PHPOffice/PhpSpreadsheet/?branch=master)
-[![Total Downloads](https://poser.pugx.org/phpoffice/phpspreadsheet/downloads.png)](https://packagist.org/packages/phpoffice/phpspreadsheet)
-[![Latest Stable Version](https://poser.pugx.org/phpoffice/phpspreadsheet/v/stable.png)](https://packagist.org/packages/phpoffice/phpspreadsheet)
-[![License](https://poser.pugx.org/phpoffice/phpspreadsheet/license.png)](https://packagist.org/packages/phpoffice/phpspreadsheet)
+[![Total Downloads](https://img.shields.io/packagist/dt/PHPOffice/PhpSpreadsheet)](https://packagist.org/packages/phpoffice/phpspreadsheet)
+[![Latest Stable Version](https://img.shields.io/github/v/release/PHPOffice/PhpSpreadsheet)](https://packagist.org/packages/phpoffice/phpspreadsheet)
+[![License](https://img.shields.io/github/license/PHPOffice/PhpSpreadsheet)](https://packagist.org/packages/phpoffice/phpspreadsheet)
 [![Join the chat at https://gitter.im/PHPOffice/PhpSpreadsheet](https://img.shields.io/badge/GITTER-join%20chat-green.svg)](https://gitter.im/PHPOffice/PhpSpreadsheet)
 
 PhpSpreadsheet is a library written in pure PHP and offers a set of classes that

From 2d93c36a1a0cc3faff4f76ccef883eec27e3cd73 Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Sat, 10 Oct 2020 12:11:00 +0200
Subject: [PATCH 138/153] Update composer suggestions

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 09e6edf9..0fcb2556 100644
--- a/composer.json
+++ b/composer.json
@@ -72,8 +72,8 @@
     },
     "suggest": {
         "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",
+        "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"
     },
     "autoload": {

From 44080a1e8bda413e325df894c328adec5a19bacc Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Sat, 10 Oct 2020 20:38:46 +0900
Subject: [PATCH 139/153] Introduce GitHub Actions

The plan is to keep Travis for a short while, until we are confident that
GitHub Actions work well enough for us. And after that we can remove Travis
entirely.

There is a bunch of duplicated things but it allows us to maximize
parallelismt to have results as soon as possible.

API documentation generation is still missing.
---
 .github/workflows/main.yml | 131 +++++++++++++++++++++++++++++++++++++
 1 file changed, 131 insertions(+)
 create mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 00000000..e9b07fe1
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,131 @@
+name: Build
+on: [ push, pull_request ]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php-version:
+          - '7.2'
+          - '7.3'
+          - '7.4'
+
+    name: PHP ${{ matrix.php-version }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          extensions: ctype, dom, gd, iconv, fileinfo, libxml, mbstring, SimpleXML, xml, xmlreader, xmlwriter, zip, zlib
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install dependencies
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
+
+      - name: Test with phpunit
+        run: ./vendor/bin/phpunit
+
+  php-cs-fixer:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.4
+          extensions: ctype, dom, gd, iconv, fileinfo, libxml, mbstring, SimpleXML, xml, xmlreader, xmlwriter, zip, zlib
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install dependencies
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
+
+      - name: Code style with PHP-CS-Fixer
+        run: ./vendor/bin/php-cs-fixer fix --diff --verbose --dry-run
+
+  phpcs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.4
+          extensions: ctype, dom, gd, iconv, fileinfo, libxml, mbstring, SimpleXML, xml, xmlreader, xmlwriter, zip, zlib
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install dependencies
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
+
+      - name: Code style with PHP_CodeSniffer
+        run: ./vendor/bin/phpcs
+
+  coverage:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.4
+          extensions: ctype, dom, gd, iconv, fileinfo, libxml, mbstring, SimpleXML, xml, xmlreader, xmlwriter, zip, zlib
+          coverage: pcov
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install dependencies
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
+
+      - name: Coverage
+        run: |
+          ./vendor/bin/phpunit --coverage-clover coverage-clover.xml
+          curl -LO https://scrutinizer-ci.com/ocular.phar
+          php ocular.phar code-coverage:upload --format=php-clover coverage-clover.xml

From 794ac801a53da35104e5cab394f79db8287f657d Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Sat, 10 Oct 2020 22:51:04 +0900
Subject: [PATCH 140/153] Annotate problems in code

---
 .github/workflows/main.yml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e9b07fe1..dc10f6b0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -36,7 +36,13 @@ jobs:
       - name: Install dependencies
         run: composer install --no-progress --prefer-dist --optimize-autoloader
 
-      - name: Test with phpunit
+      - name: Setup problem matchers for PHP
+        run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+
+      - name: Setup problem matchers for PHPUnit
+        run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+      - name: Test with PHPUnit
         run: ./vendor/bin/phpunit
 
   php-cs-fixer:
@@ -50,6 +56,7 @@ jobs:
         with:
           php-version: 7.4
           extensions: ctype, dom, gd, iconv, fileinfo, libxml, mbstring, SimpleXML, xml, xmlreader, xmlwriter, zip, zlib
+          tools: cs2pr
 
       - name: Get composer cache directory
         id: composer-cache
@@ -66,7 +73,7 @@ jobs:
         run: composer install --no-progress --prefer-dist --optimize-autoloader
 
       - name: Code style with PHP-CS-Fixer
-        run: ./vendor/bin/php-cs-fixer fix --diff --verbose --dry-run
+        run: ./vendor/bin/php-cs-fixer fix --format=checkstyle | cs2pr
 
   phpcs:
     runs-on: ubuntu-latest
@@ -79,6 +86,7 @@ jobs:
         with:
           php-version: 7.4
           extensions: ctype, dom, gd, iconv, fileinfo, libxml, mbstring, SimpleXML, xml, xmlreader, xmlwriter, zip, zlib
+          tools: cs2pr
 
       - name: Get composer cache directory
         id: composer-cache
@@ -95,7 +103,7 @@ jobs:
         run: composer install --no-progress --prefer-dist --optimize-autoloader
 
       - name: Code style with PHP_CodeSniffer
-        run: ./vendor/bin/phpcs
+        run: ./vendor/bin/phpcs -q --report=checkstyle | cs2pr
 
   coverage:
     runs-on: ubuntu-latest

From c3d1ce536b7440c32f1e392e1bace01cf75d1438 Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Sun, 11 Oct 2020 12:05:28 +0900
Subject: [PATCH 141/153] Publish API docs via GitHub Actions

---
 .github/workflows/github-pages.yml | 29 +++++++++++++++++++++++++++++
 .travis.yml                        | 13 -------------
 2 files changed, 29 insertions(+), 13 deletions(-)
 create mode 100644 .github/workflows/github-pages.yml

diff --git a/.github/workflows/github-pages.yml b/.github/workflows/github-pages.yml
new file mode 100644
index 00000000..3bdeea1d
--- /dev/null
+++ b/.github/workflows/github-pages.yml
@@ -0,0 +1,29 @@
+name: GithHub Pages
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  github-pages:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.4
+          coverage: none # remove xdebug
+
+      - name: Build API documentation
+        run: |
+          curl -LO https://github.com/phpDocumentor/phpDocumentor/releases/download/v3.0.0-rc/phpDocumentor.phar
+          php phpDocumentor.phar --directory src/ --target docs/api
+
+      - name: Deploy to GithHub Pages
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./docs/api
diff --git a/.travis.yml b/.travis.yml
index 77eed441..6e29283c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,16 +36,3 @@ jobs:
       after_script:
         - wget https://scrutinizer-ci.com/ocular.phar
         - php ocular.phar code-coverage:upload --format=php-clover tests/coverage-clover.xml
-
-    - stage: API documentations
-      if: tag is present
-      php: 7.4
-      before_script:
-        - curl -LO https://github.com/phpDocumentor/phpDocumentor/releases/download/v3.0.0-rc/phpDocumentor.phar
-      script:
-        - php phpDocumentor.phar --directory src/ --target docs/api
-      deploy:
-        provider: pages
-        skip-cleanup: true
-        local-dir: docs/api
-        github-token: $GITHUB_TOKEN

From b53199d7db45005cb681454ef780c66cf4e7502c Mon Sep 17 00:00:00 2001
From: MarkBaker <mark@lange.demon.co.uk>
Date: Sun, 11 Oct 2020 12:36:47 +0200
Subject: [PATCH 142/153] Update composer suggestions

---
 tests/PhpSpreadsheetTests/Writer/Xlsx/LocaleFloatsTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/PhpSpreadsheetTests/Writer/Xlsx/LocaleFloatsTest.php b/tests/PhpSpreadsheetTests/Writer/Xlsx/LocaleFloatsTest.php
index 83defb7b..373ef37f 100644
--- a/tests/PhpSpreadsheetTests/Writer/Xlsx/LocaleFloatsTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Xlsx/LocaleFloatsTest.php
@@ -55,6 +55,6 @@ class LocaleFloatsTest extends TestCase
         self::assertArrayHasKey(1, $matches);
         $actual = $matches[1];
         // From PHP8, https://wiki.php.net/rfc/locale_independent_float_to_string applies
-        self::assertEquals((\PHP_VERSION_ID < 80000) ? '1,1' : '1.1', $actual);
+        self::assertEquals('1,1', $actual);
     }
 }

From 7545c411f98838baba6f50c6715168a563f01e74 Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Sun, 11 Oct 2020 19:42:25 +0900
Subject: [PATCH 143/153] Test PHP 8 on GitHub Actions

---
 .github/workflows/main.yml | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index dc10f6b0..88168fa0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -9,6 +9,7 @@ jobs:
           - '7.2'
           - '7.3'
           - '7.4'
+          - '8.0'
 
     name: PHP ${{ matrix.php-version }}
 
@@ -20,7 +21,8 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-version }}
-          extensions: ctype, dom, gd, iconv, fileinfo, libxml, mbstring, SimpleXML, xml, xmlreader, xmlwriter, zip, zlib
+          extensions: ctype, dom, gd, iconv, fileinfo, libxml, mbstring, simplexml, xml, xmlreader, xmlwriter, zip, zlib
+          coverage: none
 
       - name: Get composer cache directory
         id: composer-cache
@@ -33,8 +35,15 @@ jobs:
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
+      - name: Delete composer lock file
+        id: composer-lock
+        if: ${{ matrix.php-version == '8.0' }}
+        run: |
+          rm composer.lock
+          echo "::set-output name=flags::--ignore-platform-reqs"
+
       - name: Install dependencies
-        run: composer install --no-progress --prefer-dist --optimize-autoloader
+        run: composer install --no-progress --prefer-dist --optimize-autoloader ${{ steps.composer-lock.outputs.flags }}
 
       - name: Setup problem matchers for PHP
         run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
@@ -55,7 +64,8 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: 7.4
-          extensions: ctype, dom, gd, iconv, fileinfo, libxml, mbstring, SimpleXML, xml, xmlreader, xmlwriter, zip, zlib
+          extensions: ctype, dom, gd, iconv, fileinfo, libxml, mbstring, simplexml, xml, xmlreader, xmlwriter, zip, zlib
+          coverage: none
           tools: cs2pr
 
       - name: Get composer cache directory
@@ -85,7 +95,8 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: 7.4
-          extensions: ctype, dom, gd, iconv, fileinfo, libxml, mbstring, SimpleXML, xml, xmlreader, xmlwriter, zip, zlib
+          extensions: ctype, dom, gd, iconv, fileinfo, libxml, mbstring, simplexml, xml, xmlreader, xmlwriter, zip, zlib
+          coverage: none
           tools: cs2pr
 
       - name: Get composer cache directory
@@ -115,7 +126,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: 7.4
-          extensions: ctype, dom, gd, iconv, fileinfo, libxml, mbstring, SimpleXML, xml, xmlreader, xmlwriter, zip, zlib
+          extensions: ctype, dom, gd, iconv, fileinfo, libxml, mbstring, simplexml, xml, xmlreader, xmlwriter, zip, zlib
           coverage: pcov
 
       - name: Get composer cache directory

From 1741766a9ca12c3563a617e1d61839d91aa056a8 Mon Sep 17 00:00:00 2001
From: oleibman <eclipsechasers2@yahoo.com>
Date: Sun, 11 Oct 2020 04:26:56 -0700
Subject: [PATCH 144/153] Improving Coverage for Excel2003 XML Reader (#1557)

* Improving Coverage for Excel2003 XML Reader

Reader/Xml is now 100% covered.

File templates/Excel2003XMLTest.xml, used in some tests, is *not*
readable by a current version of Excel. I have substituted a new file
excel2003.xml to be used in its place. I have not deleted the original
in case someone in future (possibly me) wants to see what it needs to
make it usable.

There are minimal code changes.
- Unused protected functions pixel2WidthUnits and widthUnits2Pixel
  are deleted.
- One regex looking to convert hex characters is changed from a-z to a-f,
  and made case insensitive.
- No calculation performed for "error" cell (previously calculation
  was attempted and threw exception).
- Empty relative row/cell is now handled correctly.
- Style applied to empty cell when appropriate.
- Support added for textRotation.
- Support added for border styles.
- Support added for diagonal borders.
- Support added for superscript and subscript.
- Support added for fill patterns.

In theory, encodings other than UTF-8 were supported.
In fact, I was unable to get SecurityScanner to pass *any* xml which is
not UTF-8. Eliminating the assumption that strings might not be UTF-8
allowed much of the code to be greatly simplified.
After that, I added some code that would permit the use of
some ASCII-compatible encodings (there is a test of ISO-8859-1).
It would be more difficult to handle other encodings (such as UTF-16).
I am not convinced that even the ISO-8859 effort is worth it,
but am willing to investigate either expanding or eliminating
non-UTF8 support.

I added a number of tests, creating an Xml directory, and moving
XmlTest to that directory.

Pull Request had problems reading old invalid sample in the code
coverage phase, not in any of the other test phases, and not in
the code coverage phase on my local machine.
As it turns out, aside from being invalid, the sample
is much larger than any of the other samples. Tests have been
adjusted accordingly.

* Smaller Test File

Should eliminate need to avoid test during xml coverage.

* Break Up Style Test into Multiple Tests

Per suggestion from Mark Baker.

* Integrate AddressHelper Change

The introduction of AddressHelper introduced a conflict which needed to
be resolved. I wanted to test it locally before resolving. This required
me to add (unchanged) AddressHelper to my local copy. I hope this is
an okay manner of resolving the conflict.

* Weird Travis Error

XmlOddTest works just fine on my local machine, but Travis failed it.
Even worse, the lines which Travis flags don't even make any sense
(one was the empty line between two methods!).
This test is not essential to the rest of the change. I am removing
it from the package, and will attempt to re-add it when I have a chance
to sync up my fork with the main project.
---
 samples/Basic/20_Read_Excel2003XML.php        |   2 +-
 .../templates/excel2003.short.bad.xml         |  26 +-
 samples/templates/excel2003.xml               | 944 ++++++++++++++++++
 src/PhpSpreadsheet/Reader/Xml.php             | 275 ++---
 tests/PhpSpreadsheetTests/IOFactoryTest.php   |   4 +-
 tests/PhpSpreadsheetTests/Reader/CsvTest.php  |   2 +-
 .../Reader/Xml/XmlFilter.php                  |  14 +
 .../Reader/Xml/XmlInfoTest.php                |  75 ++
 .../Reader/Xml/XmlLoadTest.php                | 100 ++
 .../Reader/Xml/XmlStyleCoverageTest.php       | 113 +++
 .../Reader/Xml/XmlStylesTest.php              | 135 +++
 .../Reader/{ => Xml}/XmlTest.php              |  16 +-
 tests/data/Reader/Xml/excel2003.iso8859-1.xml |  67 ++
 13 files changed, 1645 insertions(+), 128 deletions(-)
 rename tests/data/Reader/Xml/WithoutStyle.xml => samples/templates/excel2003.short.bad.xml (66%)
 create mode 100644 samples/templates/excel2003.xml
 create mode 100644 tests/PhpSpreadsheetTests/Reader/Xml/XmlFilter.php
 create mode 100644 tests/PhpSpreadsheetTests/Reader/Xml/XmlInfoTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Reader/Xml/XmlLoadTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Reader/Xml/XmlStyleCoverageTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Reader/Xml/XmlStylesTest.php
 rename tests/PhpSpreadsheetTests/Reader/{ => Xml}/XmlTest.php (70%)
 create mode 100644 tests/data/Reader/Xml/excel2003.iso8859-1.xml

diff --git a/samples/Basic/20_Read_Excel2003XML.php b/samples/Basic/20_Read_Excel2003XML.php
index 44425e20..48ac3373 100644
--- a/samples/Basic/20_Read_Excel2003XML.php
+++ b/samples/Basic/20_Read_Excel2003XML.php
@@ -4,7 +4,7 @@ use PhpOffice\PhpSpreadsheet\IOFactory;
 
 require __DIR__ . '/../Header.php';
 
-$filename = __DIR__ . '/../templates/Excel2003XMLTest.xml';
+$filename = __DIR__ . '/../templates/excel2003.xml';
 $callStartTime = microtime(true);
 $spreadsheet = IOFactory::load($filename);
 $helper->logRead('Xml', $filename, $callStartTime);
diff --git a/tests/data/Reader/Xml/WithoutStyle.xml b/samples/templates/excel2003.short.bad.xml
similarity index 66%
rename from tests/data/Reader/Xml/WithoutStyle.xml
rename to samples/templates/excel2003.short.bad.xml
index b8698b04..bd9674bc 100644
--- a/tests/data/Reader/Xml/WithoutStyle.xml
+++ b/samples/templates/excel2003.short.bad.xml
@@ -20,6 +20,19 @@
         <ProtectStructure>False</ProtectStructure>
         <ProtectWindows>False</ProtectWindows>
     </ExcelWorkbook>
+    <Styles>
+        <Style ss:ID="ce9">
+            <Alignment ss:Vertical="Bottom" ss:Rotate="0"/>
+            <Borders/>
+            <Font ss:Color="#000000" ss:FontName="Arial1" ss:Size="11"/>
+            <NumberFormat ss:Format="Short Date"/>
+        </Style>
+        <Style ss:ID="ce32">
+            <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1" ss:Rotate="0"/>
+            <Borders/>
+            <Font ss:Color="#000000" ss:FontName="Calibri" ss:Size="11"/>
+        </Style>
+    </Styles>
     <ss:Worksheet ss:Name="Sample Data">
         <Table>
             <Column ss:Width="96.4913"/>
@@ -28,7 +41,7 @@
             <Column ss:Span="6" ss:Width="48.3874"/>
             <Column ss:Index="12" ss:Width="50.2583"/>
             <Column ss:Span="1011" ss:Width="48.3874"/>
-            <Row ss:AutoFitHeight="0" ss:Height="14.9953">
+            <Row ss:Index="8" ss:AutoFitHeight="0" ss:Height="14.9953">
                 <Cell>
                     <ss:Data xmlns="http://www.w3.org/TR/REC-html40" ss:Type="String">Test String 1</ss:Data>
                     <Comment>
@@ -38,7 +51,16 @@
                     </Comment>
                 </Cell>
                 <Cell>
-                    <Data ss:Type="Number">1</Data>
+                    <Data ss:StyleID="ce32" ss:Type="Number">1</Data>
+                </Cell>
+                <Cell ss:Formula="of:=12/1">
+                    <Data ss:Type="Number">12</Data>
+                </Cell>
+                <Cell ss:Formula="of:=[.C8]-[.B8]">
+                    <Data ss:Type="Number">11</Data>
+                </Cell>
+                <Cell ss:StyleID="ce9">
+                    <Data ss:Type="DateTime">1960-12-19T00:00:00.000</Data>
                 </Cell>
             </Row>
         </Table>
diff --git a/samples/templates/excel2003.xml b/samples/templates/excel2003.xml
new file mode 100644
index 00000000..cd1188a7
--- /dev/null
+++ b/samples/templates/excel2003.xml
@@ -0,0 +1,944 @@
+<?xml version="1.0"?>
+<?mso-application progid="Excel.Sheet"?>
+<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:o="urn:schemas-microsoft-com:office:office"
+ xmlns:x="urn:schemas-microsoft-com:office:excel"
+ xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882"
+ xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:html="http://www.w3.org/TR/REC-html40">
+ <DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+  <Title>Xml2003 Workbook</Title>
+  <Subject>Test Gnumeric Workbook Subject</Subject>
+  <Author>Mark Baker</Author>
+  <Keywords>PHPExcel Xml Reader Test Keywords</Keywords>
+  <Description>Some comments about the PHPExcel Gnumeric Reader</Description>
+  <LastAuthor>Owen Leibman</LastAuthor>
+  <Created>2010-09-02T20:48:39Z</Created>
+  <LastSaved>2010-09-02T20:48:39Z</LastSaved>
+  <Category>PHPExcel Xml Reader Test Category</Category>
+  <Manager>Maarten Balliauw</Manager>
+  <Company>PHPExcel</Company>
+  <HyperlinkBase>https://github.com/PHPOffice/PhpSpreadsheet</HyperlinkBase>
+  <Version>16.00</Version>
+ </DocumentProperties>
+ <CustomDocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+  <my_API_Token dt:dt="string">AbCd1234</my_API_Token>
+  <my_API_Token_Expiry dt:dt="dateTime.tz">2019-01-31T07:00:00Z</my_API_Token_Expiry>
+  <my_API_Boolean dt:dt="boolean">1</my_API_Boolean>
+  <my_API_Int dt:dt="string">3</my_API_Int>
+  <myאInt dt:dt="string">2</myאInt>
+  <my_API_Float dt:dt="float">3.14159</my_API_Float>
+ </CustomDocumentProperties>
+ <OfficeDocumentSettings xmlns="urn:schemas-microsoft-com:office:office">
+  <AllowPNG/>
+ </OfficeDocumentSettings>
+ <ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+  <WindowHeight>8964</WindowHeight>
+  <WindowWidth>23040</WindowWidth>
+  <WindowTopX>32767</WindowTopX>
+  <WindowTopY>32767</WindowTopY>
+  <ProtectStructure>False</ProtectStructure>
+  <ProtectWindows>False</ProtectWindows>
+ </ExcelWorkbook>
+ <Styles>
+  <Style ss:ID="Default" ss:Name="Normal">
+   <Alignment ss:Vertical="Bottom"/>
+   <Borders/>
+   <Font ss:FontName="Calibri" ss:Size="11" ss:Color="#000000"/>
+   <Interior/>
+   <NumberFormat/>
+   <Protection/>
+  </Style>
+  <Style ss:ID="s62" ss:Name="Hyperlink">
+   <Font ss:FontName="Calibri" ss:Size="11" ss:Color="#0066CC"
+    ss:Underline="Single"/>
+  </Style>
+  <Style ss:ID="m1867777004784">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="3"
+     ss:Color="#00B050"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="3"
+     ss:Color="#0070C0"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="3"
+     ss:Color="#FFFF00"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="3"
+     ss:Color="#FF0000"/>
+   </Borders>
+   <Font ss:FontName="Arial1" ss:Size="11" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s63">
+   <Font ss:FontName="Arial1" ss:Size="11" ss:Color="#FF0000" ss:Bold="1"/>
+  </Style>
+  <Style ss:ID="s64">
+   <Font ss:FontName="Arial1" ss:Size="11" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s65">
+   <Font ss:FontName="Arial1" ss:Size="11" ss:Color="#000000" ss:Bold="1"
+    ss:Italic="1"/>
+  </Style>
+  <Style ss:ID="s66">
+   <Font ss:FontName="Arial1" ss:Size="11" ss:Color="#000000" ss:Bold="1"/>
+  </Style>
+  <Style ss:ID="s68">
+   <Font ss:FontName="Arial1" ss:Size="11" ss:Color="#000000" ss:Underline="Single"/>
+  </Style>
+  <Style ss:ID="s69">
+   <Interior ss:Color="#FF0000" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s70">
+   <Font ss:FontName="Calibri" ss:Size="11" ss:Color="#FF0000"/>
+  </Style>
+  <Style ss:ID="s72">
+   <Font ss:FontName="Arial1" ss:Size="11" ss:Color="#000000" ss:Italic="1"/>
+  </Style>
+  <Style ss:ID="s73">
+   <Interior ss:Color="#FF9900" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s74">
+   <Font ss:FontName="Calibri" ss:Size="11" ss:Color="#FF6600"/>
+  </Style>
+  <Style ss:ID="s75">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="DashDotDot" ss:Weight="1"
+     ss:Color="#000000"/>
+   </Borders>
+  </Style>
+  <Style ss:ID="s76">
+   <Interior ss:Color="#FFFF00" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s77">
+   <Font ss:FontName="Calibri" ss:Size="11" ss:Color="#FFFF00"/>
+  </Style>
+  <Style ss:ID="s78">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="DashDot" ss:Weight="1"
+     ss:Color="#000000"/>
+   </Borders>
+  </Style>
+  <Style ss:ID="s79">
+   <Font ss:FontName="Calibri" ss:Size="11" ss:Color="#000000"
+    ss:Underline="Single"/>
+  </Style>
+  <Style ss:ID="s80">
+   <Font ss:FontName="Arial1" ss:Size="11" ss:Color="#000000"/>
+   <NumberFormat ss:Format="dd/mm/yyyy"/>
+  </Style>
+  <Style ss:ID="s81">
+   <Interior ss:Color="#008000" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s82">
+   <Font ss:FontName="Calibri" ss:Size="11" ss:Color="#008000"/>
+  </Style>
+  <Style ss:ID="s83">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"
+     ss:Color="#000000"/>
+   </Borders>
+  </Style>
+  <Style ss:ID="s84">
+   <Font ss:FontName="Calibri" ss:Size="11" ss:Color="#000000"
+    ss:Underline="Double"/>
+  </Style>
+  <Style ss:ID="s85">
+   <Interior ss:Color="#0000FF" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s86">
+   <Font ss:FontName="Calibri" ss:Size="11" ss:Color="#0000FF"/>
+  </Style>
+  <Style ss:ID="s87">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="DashDotDot" ss:Weight="2"
+     ss:Color="#000000"/>
+   </Borders>
+  </Style>
+  <Style ss:ID="s88">
+   <Font ss:FontName="Calibri" ss:Size="11" ss:Color="#000000" ss:StrikeThrough="1"/>
+  </Style>
+  <Style ss:ID="s89">
+   <Interior ss:Color="#993366" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s90">
+   <Font ss:FontName="Calibri" ss:Size="11" ss:Color="#800080"/>
+  </Style>
+  <Style ss:ID="s91">
+   <Interior ss:Color="#FF99CC" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s92">
+   <Font ss:FontName="Calibri" ss:Size="11" ss:Color="#FF00FF"/>
+  </Style>
+  <Style ss:ID="s93">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="DashDot" ss:Weight="2"
+     ss:Color="#000000"/>
+   </Borders>
+  </Style>
+  <Style ss:ID="s94">
+   <Borders>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"
+     ss:Color="#000000"/>
+   </Borders>
+   <Font ss:FontName="Arial1" ss:Size="11" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s95">
+   <Interior ss:Color="#DDBC7D" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s96">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Dash" ss:Weight="2"
+     ss:Color="#000000"/>
+   </Borders>
+  </Style>
+  <Style ss:ID="s97">
+   <Font ss:FontName="Arial1" ss:Size="11" ss:Color="#000000"/>
+   <NumberFormat ss:Format="#\ ?0/??0"/>
+  </Style>
+  <Style ss:ID="s98">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"
+     ss:Color="#000000"/>
+   </Borders>
+  </Style>
+  <Style ss:ID="s99">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"
+     ss:Color="#000000"/>
+   </Borders>
+   <Font ss:FontName="Arial1" ss:Size="11" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s100">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="3"
+     ss:Color="#000000"/>
+   </Borders>
+  </Style>
+  <Style ss:ID="s101">
+   <NumberFormat ss:Format="hh&quot;:&quot;mm&quot;:&quot;ss"/>
+  </Style>
+  <Style ss:ID="s102">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Double" ss:Weight="3"
+     ss:Color="#000000"/>
+   </Borders>
+  </Style>
+  <Style ss:ID="s103">
+   <Borders>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"
+     ss:Color="#000000"/>
+   </Borders>
+   <Font ss:FontName="Arial1" ss:Size="11" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s104">
+   <NumberFormat ss:Format="d/m/yy\ hh&quot;:&quot;mm"/>
+  </Style>
+  <Style ss:ID="s105">
+   <Borders>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"
+     ss:Color="#000000"/>
+   </Borders>
+   <Font ss:FontName="Arial1" ss:Size="11" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s113">
+   <Borders>
+    <Border ss:Position="DiagonalLeft" ss:LineStyle="Double" ss:Weight="3"
+     ss:Color="#FF0000"/>
+    <Border ss:Position="DiagonalRight" ss:LineStyle="Double" ss:Weight="3"
+     ss:Color="#FF0000"/>
+   </Borders>
+  </Style>
+  <Style ss:ID="s114">
+   <Alignment ss:Vertical="Bottom" ss:WrapText="1"/>
+  </Style>
+  <Style ss:ID="s115">
+   <Alignment ss:Vertical="Bottom" ss:WrapText="1"/>
+   <Borders>
+    <Border ss:Position="DiagonalLeft" ss:LineStyle="Continuous" ss:Weight="1"
+     ss:Color="#000000"/>
+   </Borders>
+  </Style>
+  <Style ss:ID="s116">
+   <Borders>
+    <Border ss:Position="DiagonalRight" ss:LineStyle="Continuous" ss:Weight="1"
+     ss:Color="#000000"/>
+   </Borders>
+  </Style>
+  <Style ss:ID="s118">
+   <Alignment ss:Vertical="Bottom" ss:WrapText="1"/>
+   <Font ss:FontName="Calibri" ss:Size="11" ss:Color="#CCFFCC"/>
+   <Interior ss:Color="#FF0000" ss:Pattern="Gray0625" ss:PatternColor="#FFFF00"/>
+  </Style>
+  <Style ss:ID="s121">
+   <Font ss:FontName="Sans" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s123">
+   <Alignment ss:Vertical="Bottom" ss:Rotate="90"/>
+   <Font ss:FontName="Sans" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s125">
+   <Alignment ss:Vertical="Bottom" ss:Rotate="45"/>
+   <Font ss:FontName="Sans" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s127">
+   <Alignment ss:Vertical="Bottom" ss:Rotate="-90"/>
+   <Font ss:FontName="Sans" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s129">
+   <Alignment ss:Vertical="Bottom" ss:Rotate="-45"/>
+   <Font ss:FontName="Sans" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s130">
+   <Font ss:FontName="Sans" ss:Color="#000000" ss:Underline="Single"/>
+  </Style>
+  <Style ss:ID="s131">
+   <Font ss:FontName="Sans" ss:Color="#000000" ss:VerticalAlign="Subscript"/>
+  </Style>
+  <Style ss:ID="s132">
+   <Font ss:FontName="Sans" ss:Color="#000000" ss:Underline="Double"/>
+  </Style>
+  <Style ss:ID="s133">
+   <Font ss:FontName="Sans" ss:Color="#000000" ss:VerticalAlign="Superscript"/>
+  </Style>
+  <Style ss:ID="s134">
+   <Font ss:FontName="Sans" ss:Color="#000000" ss:Underline="SingleAccounting"/>
+  </Style>
+  <Style ss:ID="s135">
+   <Font ss:FontName="Sans" ss:Color="#000000" ss:Underline="DoubleAccounting"/>
+  </Style>
+  <Style ss:ID="s136">
+   <Alignment ss:Vertical="Bottom" ss:WrapText="1"/>
+   <Font ss:FontName="Sans" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s139">
+   <Font ss:FontName="Sans" ss:Color="#0000FF" ss:Underline="Single"/>
+  </Style>
+  <Style ss:ID="s140">
+   <Font ss:FontName="Sans" ss:Color="#000000"/>
+   <NumberFormat ss:Format="0"/>
+  </Style>
+  <Style ss:ID="s141">
+   <Alignment ss:Vertical="Bottom" ss:WrapText="1"/>
+   <Font ss:FontName="Arial1" ss:Size="12" ss:Color="#000000" ss:Bold="1"/>
+  </Style>
+  <Style ss:ID="s142">
+   <Font ss:FontName="Arial1" ss:Size="11" ss:Color="#000000"/>
+   <NumberFormat ss:Format="0.00;[Red]0.00"/>
+  </Style>
+  <Style ss:ID="s143">
+   <Font ss:FontName="Arial1" ss:Size="11" ss:Color="#000000"/>
+   <NumberFormat ss:Format="dd\-mmm\-yyyy"/>
+  </Style>
+  <Style ss:ID="s144">
+   <Font ss:FontName="Arial1" ss:Size="11" ss:Color="#000000"/>
+   <NumberFormat ss:Format="hh&quot;:&quot;mm\ AM/PM"/>
+  </Style>
+  <Style ss:ID="s145">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Dot" ss:Weight="1"
+     ss:Color="#000000"/>
+   </Borders>
+  </Style>
+  <Style ss:ID="s146">
+   <Alignment ss:Horizontal="Right" ss:Vertical="Bottom"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Dash" ss:Weight="1"
+     ss:Color="#000000"/>
+   </Borders>
+  </Style>
+  <Style ss:ID="s147">
+   <Alignment ss:Vertical="Top"/>
+   <Interior ss:Color="#00CCFF" ss:Pattern="HorzStripe" ss:PatternColor="#0000FF"/>
+  </Style>
+ </Styles>
+ <Names>
+  <NamedRange ss:Name="goodname" ss:RefersTo="='Sample Data'!R30C1"/>
+  <NamedRange ss:Name="MarksRange" ss:RefersTo="='Sample Data'!R1C2:R4C3"/>
+ </Names>
+ <Worksheet ss:Name="Sample Data">
+  <Table ss:ExpandedColumnCount="14" ss:ExpandedRowCount="32" x:FullColumns="1"
+   x:FullRows="1" ss:DefaultRowHeight="14.55">
+   <Column ss:AutoFitWidth="0" ss:Width="96.6"/>
+   <Column ss:AutoFitWidth="0" ss:Width="48.6" ss:Span="1"/>
+   <Column ss:Index="4" ss:AutoFitWidth="0" ss:Width="36"/>
+   <Column ss:AutoFitWidth="0" ss:Width="48.6" ss:Span="6"/>
+   <Column ss:Index="12" ss:AutoFitWidth="0" ss:Width="50.4"/>
+   <Column ss:AutoFitWidth="0" ss:Width="48.6" ss:Span="1"/>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell ss:StyleID="s63"><Data ss:Type="String">Test String 1</Data><Comment
+      ss:Author="Mark"><ss:Data xmlns="http://www.w3.org/TR/REC-html40"><Font
+        html:Face="Tahoma" html:Size="9" html:Color="#000000">Test for a simple colour-formatted string</Font></ss:Data></Comment></Cell>
+    <Cell ss:StyleID="s64"><Data ss:Type="Number">1</Data><NamedCell
+      ss:Name="MarksRange"/></Cell>
+    <Cell ss:StyleID="s64"><Data ss:Type="Number">5</Data><NamedCell
+      ss:Name="MarksRange"/></Cell>
+    <Cell ss:Index="5" ss:StyleID="s65"><Data ss:Type="String">A</Data></Cell>
+    <Cell ss:StyleID="s66"><Data ss:Type="String">E</Data></Cell>
+    <Cell ss:Index="8" ss:Formula="=RC[-6]+RC[-5]"><Data ss:Type="Number">6</Data></Cell>
+    <Cell ss:Index="10" ss:Formula="=RC[-5]&amp;RC[-4]"><Data ss:Type="String">AE</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell ss:StyleID="s65"><Data ss:Type="String">Test - String 2</Data></Cell>
+    <Cell><Data ss:Type="Number">2</Data><NamedCell ss:Name="MarksRange"/></Cell>
+    <Cell ss:StyleID="s64"><Data ss:Type="Number">6</Data><NamedCell
+      ss:Name="MarksRange"/></Cell>
+    <Cell ss:Index="5"><Data ss:Type="String">B</Data></Cell>
+    <Cell><Data ss:Type="String">F</Data></Cell>
+    <Cell ss:Index="8" ss:Formula="=RC[-6]+RC[-5]"><Data ss:Type="Number">8</Data></Cell>
+    <Cell ss:Index="10" ss:Formula="=RC[-5]&amp;RC[-4]"><Data ss:Type="String">BF</Data></Cell>
+    <Cell ss:Index="14" ss:StyleID="s145"><Data ss:Type="String">Dot</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell ss:StyleID="s68"><Data ss:Type="String">Test #3</Data></Cell>
+    <Cell ss:StyleID="s64"><Data ss:Type="Number">3</Data><NamedCell
+      ss:Name="MarksRange"/></Cell>
+    <Cell ss:StyleID="s64"><Data ss:Type="Number">7</Data><NamedCell
+      ss:Name="MarksRange"/></Cell>
+    <Cell ss:Index="5" ss:StyleID="s66"><Data ss:Type="String">C</Data></Cell>
+    <Cell ss:StyleID="s65"><Data ss:Type="String">G</Data></Cell>
+    <Cell ss:Index="8" ss:Formula="=RC[-6]+RC[-5]"><Data ss:Type="Number">10</Data></Cell>
+    <Cell ss:Index="10" ss:Formula="=RC[-5]&amp;RC[-4]"><Data ss:Type="String">CG</Data></Cell>
+    <Cell ss:StyleID="s69"><Data ss:Type="String">Red</Data></Cell>
+    <Cell ss:StyleID="s70"><Data ss:Type="String">Red</Data></Cell>
+    <Cell ss:Index="14" ss:StyleID="s146"><Data ss:Type="String">Dash</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell ss:StyleID="s64"><Data ss:Type="String">Test with (&quot;) in string</Data></Cell>
+    <Cell><Data ss:Type="Number">4</Data><NamedCell ss:Name="MarksRange"/></Cell>
+    <Cell ss:StyleID="s64"><Data ss:Type="Number">8</Data><NamedCell
+      ss:Name="MarksRange"/></Cell>
+    <Cell ss:Index="5" ss:StyleID="s72"><Data ss:Type="String">D</Data></Cell>
+    <Cell><Data ss:Type="String">H</Data></Cell>
+    <Cell ss:Index="8" ss:Formula="=RC[-6]+RC[-5]"><Data ss:Type="Number">12</Data></Cell>
+    <Cell ss:Index="10" ss:Formula="=RC[-5]&amp;RC[-4]"><Data ss:Type="String">DH</Data></Cell>
+    <Cell ss:StyleID="s73"><Data ss:Type="String">Orange</Data></Cell>
+    <Cell ss:StyleID="s74"><Data ss:Type="String">Orange</Data></Cell>
+    <Cell ss:Index="14" ss:StyleID="s75"><Data ss:Type="String">Dash/Dot/Dot</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell ss:Index="8" ss:Formula="=SUM(R[-4]C[-6]:R[-1]C[-6])"><Data
+      ss:Type="Number">10</Data></Cell>
+    <Cell ss:Formula="=SUM(R[-4]C[-6]:R[-1]C[-6])"><Data ss:Type="Number">26</Data></Cell>
+    <Cell ss:Formula="=SUM(R[-4]C[-8]:R[-1]C[-7])"><Data ss:Type="Number">36</Data></Cell>
+    <Cell ss:StyleID="s76"><Data ss:Type="String">Yellow</Data></Cell>
+    <Cell ss:StyleID="s77"><Data ss:Type="String">Yellow</Data></Cell>
+    <Cell ss:Index="14" ss:StyleID="s78"><Data ss:Type="String">Dash/Dot</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell ss:StyleID="s79"><Data ss:Type="String">Test #3</Data></Cell>
+    <Cell><Data ss:Type="Number">1.23</Data></Cell>
+    <Cell ss:Formula="=TRUE()"><Data ss:Type="Boolean">1</Data></Cell>
+    <Cell ss:StyleID="s80"><Data ss:Type="Boolean">1</Data></Cell>
+    <Cell ss:Index="8" ss:Formula="=SUM(R[-1]C+R[-2]C)"><Data ss:Type="Number">22</Data></Cell>
+    <Cell ss:Index="11" ss:StyleID="s81"><Data ss:Type="String">Green</Data></Cell>
+    <Cell ss:StyleID="s82"><Data ss:Type="String">Green</Data></Cell>
+    <Cell ss:Index="14" ss:StyleID="s83"><Data ss:Type="String">Thin Line</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell ss:StyleID="s84"><Data ss:Type="String">Test #3</Data></Cell>
+    <Cell><Data ss:Type="Number">2.34</Data></Cell>
+    <Cell ss:Formula="=FALSE()"><Data ss:Type="Boolean">0</Data></Cell>
+    <Cell><Data ss:Type="Boolean">0</Data></Cell>
+    <Cell ss:Index="8" ss:Formula="=SUM(MarksRange)"><Data ss:Type="Number">36</Data></Cell>
+    <Cell ss:Index="11" ss:StyleID="s85"><Data ss:Type="String">Blue</Data></Cell>
+    <Cell ss:StyleID="s86"><Data ss:Type="String">Blue</Data></Cell>
+    <Cell ss:Index="14" ss:StyleID="s87"><Data ss:Type="String">Thick Dash/Dot/Dot</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell ss:StyleID="s88"><Data ss:Type="String">Test #3</Data></Cell>
+    <Cell><Data ss:Type="Number">3.45</Data></Cell>
+    <Cell ss:Index="11" ss:StyleID="s89"><Data ss:Type="String">Purple</Data></Cell>
+    <Cell ss:StyleID="s90"><Data ss:Type="String">Purple</Data></Cell>
+    <Cell ss:Index="14" ss:StyleID="s87"><Data ss:Type="String">Variant Thick Dash/Dot/Dot</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="13.5">
+    <Cell ss:Index="11" ss:StyleID="s91"><Data ss:Type="String">Pink</Data></Cell>
+    <Cell ss:StyleID="s92"><Data ss:Type="String">Pink</Data></Cell>
+    <Cell ss:Index="14" ss:StyleID="s93"><Data ss:Type="String">Thick Dash/Dot</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell ss:StyleID="s80"><Data ss:Type="DateTime">1960-12-19T00:00:00.000</Data></Cell>
+    <Cell ss:Index="3" ss:StyleID="s94"><Data ss:Type="String">TOP</Data></Cell>
+    <Cell ss:Index="7"><Data ss:Type="Number">0</Data></Cell>
+    <Cell ss:Index="11" ss:StyleID="s95"><Data ss:Type="String">Brown</Data></Cell>
+    <Cell ss:StyleID="s74"><Data ss:Type="String">Brown</Data></Cell>
+    <Cell ss:Index="14" ss:StyleID="s96"><Data ss:Type="String">Thick Dash</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell ss:StyleID="s97"><Data ss:Type="Number">1.5</Data></Cell>
+    <Cell ss:Index="7" ss:Formula="=12/0"><Data ss:Type="Error">#DIV/0!</Data></Cell>
+    <Cell ss:Index="14" ss:StyleID="s98"><Data ss:Type="String">Thick Line</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="13.5">
+    <Cell ss:Index="3" ss:StyleID="s99"><Data ss:Type="String">BOTTOM</Data></Cell>
+    <Cell ss:Index="14" ss:StyleID="s100"><Data ss:Type="String">Extra Thick Line</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell ss:StyleID="s101"><Data ss:Type="DateTime">1899-12-31T02:30:00.000</Data></Cell>
+    <Cell ss:Index="6"><Data ss:Type="String">Мойва сушеная</Data><Comment
+      ss:Author="Mark"><ss:Data xmlns="http://www.w3.org/TR/REC-html40"><Font
+        html:Face="Tahoma" html:Size="9" html:Color="#000000">Tests for UTF-8 content</Font></ss:Data></Comment></Cell>
+    <Cell ss:Index="14" ss:StyleID="s102"><Data ss:Type="String">Double Line</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell ss:Index="3" ss:StyleID="s103"><Data ss:Type="String">LEFT</Data></Cell>
+    <Cell ss:Index="6"><Data ss:Type="String">Ärendetext</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell ss:StyleID="s104"><Data ss:Type="DateTime">1960-12-19T01:30:00.000</Data></Cell>
+    <Cell ss:Index="6"><Data ss:Type="String">Højde</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell ss:Index="3" ss:StyleID="s105"><Data ss:Type="String">RIGHT</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="13.5"/>
+   <Row ss:AutoFitHeight="0" ss:Height="27.75">
+    <Cell ss:Index="2" ss:MergeAcross="1" ss:MergeDown="1"
+     ss:StyleID="m1867777004784"><Data ss:Type="String">BOX</Data></Cell>
+    <Cell ss:Index="5" ss:StyleID="s113"/>
+    <Cell ss:Index="7" ss:StyleID="s114"><Data ss:Type="String">Test Column 1</Data></Cell>
+    <Cell ss:StyleID="s114"/>
+    <Cell ss:StyleID="s115"/>
+    <Cell ss:StyleID="s116"/>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="27.75">
+    <Cell ss:Index="7" ss:StyleID="s114"/>
+    <Cell ss:StyleID="s114"><Data ss:Type="String">Test Column 2</Data></Cell>
+    <Cell ss:StyleID="s114"/>
+    <Cell ss:Index="11" ss:StyleID="s147"><Data ss:Type="String">Patterned</Data></Cell>
+    <Cell ss:StyleID="s118"><Data ss:Type="String">Patterned 2</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="27.75">
+    <Cell ss:Index="7" ss:StyleID="s114"/>
+    <Cell ss:StyleID="s114"/>
+    <Cell ss:StyleID="s114"><Data ss:Type="String">Test Column 3</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell ss:StyleID="s62" ss:HRef="https://github.com/PHPOffice/PhpSpreadsheet"><Data
+      ss:Type="String">PhpSpreadsheet</Data></Cell>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell ss:StyleID="s121"><Data ss:Type="String">Underline None</Data></Cell>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:MergeAcross="1" ss:MergeDown="4" ss:StyleID="s123"><Data
+      ss:Type="String">Rotate 90</Data></Cell>
+    <Cell ss:MergeAcross="1" ss:MergeDown="4" ss:StyleID="s125"><Data
+      ss:Type="String">Rotate 45</Data></Cell>
+    <Cell ss:MergeAcross="1" ss:MergeDown="4" ss:StyleID="s127"><Data
+      ss:Type="String">Rotate -90</Data></Cell>
+    <Cell ss:MergeAcross="1" ss:MergeDown="4" ss:StyleID="s129"><Data
+      ss:Type="String">Rotate -45</Data></Cell>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell ss:StyleID="s130"><Data ss:Type="String">Underline 1</Data></Cell>
+    <Cell ss:StyleID="s131"><Data ss:Type="String">Subscript</Data></Cell>
+    <Cell ss:Index="11" ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell ss:StyleID="s132"><Data ss:Type="String">Underline 2</Data></Cell>
+    <Cell ss:StyleID="s133"><Data ss:Type="String">Superscript</Data></Cell>
+    <Cell ss:Index="11" ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell ss:StyleID="s134"><Data ss:Type="String">Underline 3</Data></Cell>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:Index="11" ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell ss:StyleID="s135"><Data ss:Type="String">Underline 4</Data></Cell>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:Index="11" ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell ss:MergeAcross="2" ss:StyleID="s136"><Data ss:Type="String">I don't know if Gnumeric supports Rich Text in the same way as Excel, And this row should be autofit height with text wrap</Data></Cell>
+    <Cell ss:StyleID="s136"/>
+    <Cell ss:StyleID="s136"/>
+    <Cell ss:StyleID="s136"/>
+    <Cell ss:StyleID="s136"/>
+    <Cell ss:StyleID="s136"/>
+    <Cell ss:StyleID="s136"/>
+    <Cell ss:StyleID="s136"/>
+    <Cell ss:StyleID="s136"/>
+    <Cell ss:StyleID="s136"/>
+    <Cell ss:StyleID="s136"/>
+    <Cell ss:StyleID="s136"/>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell ss:MergeAcross="2" ss:StyleID="s139"><Data ss:Type="String">Blue with underline</Data></Cell>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15" ss:Hidden="1">
+    <Cell ss:StyleID="s140"><Data ss:Type="Number">5</Data><NamedCell
+      ss:Name="goodname"/></Cell>
+    <Cell ss:StyleID="s121" ss:Formula="=goodname"><Data ss:Type="Number">5</Data></Cell>
+    <Cell ss:StyleID="s121" ss:Formula="=@badname"><Data ss:Type="Error">#NAME?</Data></Cell>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+   </Row>
+   <Row ss:AutoFitHeight="0">
+    <Cell ss:StyleID="s121"><Data ss:Type="String">Hidden row above</Data></Cell>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+   </Row>
+   <Row ss:AutoFitHeight="0">
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+   </Row>
+  </Table>
+  <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+   <PageSetup>
+    <Header x:Margin="0.72"/>
+    <Footer x:Margin="0.72"/>
+    <PageMargins x:Bottom="1.2" x:Left="0.72" x:Right="0.72" x:Top="1.2"/>
+   </PageSetup>
+   <Unsynced/>
+   <Print>
+    <ValidPrinterInfo/>
+    <HorizontalResolution>600</HorizontalResolution>
+    <VerticalResolution>600</VerticalResolution>
+   </Print>
+   <Selected/>
+   <TopRowVisible>3</TopRowVisible>
+   <Panes>
+    <Pane>
+     <Number>3</Number>
+     <ActiveRow>18</ActiveRow>
+     <ActiveCol>10</ActiveCol>
+    </Pane>
+   </Panes>
+   <ProtectObjects>False</ProtectObjects>
+   <ProtectScenarios>False</ProtectScenarios>
+   <AllowFormatCells/>
+   <AllowSizeCols/>
+   <AllowSizeRows/>
+   <AllowInsertCols/>
+   <AllowInsertRows/>
+   <AllowInsertHyperlinks/>
+   <AllowDeleteCols/>
+   <AllowDeleteRows/>
+   <AllowSort/>
+   <AllowFilter/>
+   <AllowUsePivotTables/>
+  </WorksheetOptions>
+ </Worksheet>
+ <Worksheet ss:Name="Report Data">
+  <Table ss:ExpandedColumnCount="11" ss:ExpandedRowCount="16" x:FullColumns="1"
+   x:FullRows="1" ss:DefaultRowHeight="14.55">
+   <Column ss:AutoFitWidth="0" ss:Width="56.4" ss:Span="2"/>
+   <Column ss:Index="4" ss:AutoFitWidth="0" ss:Width="78.599999999999994"/>
+   <Column ss:AutoFitWidth="0" ss:Width="58.2"/>
+   <Column ss:AutoFitWidth="0" ss:Width="27.6"/>
+   <Column ss:AutoFitWidth="0" ss:Width="78.599999999999994"/>
+   <Column ss:AutoFitWidth="0" ss:Width="68.399999999999991"/>
+   <Column ss:AutoFitWidth="0" ss:Width="48.6"/>
+   <Column ss:Hidden="1" ss:AutoFitWidth="0" ss:Width="48.6"/>
+   <Column ss:AutoFitWidth="0" ss:Width="48.6"/>
+   <Row ss:AutoFitHeight="0" ss:Height="31.5">
+    <Cell ss:StyleID="s141"/>
+    <Cell ss:StyleID="s141"/>
+    <Cell ss:StyleID="s141"/>
+    <Cell ss:StyleID="s141"/>
+    <Cell ss:StyleID="s141"/>
+    <Cell ss:Index="7" ss:StyleID="s141"/>
+    <Cell ss:StyleID="s141"/>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="31.5">
+    <Cell ss:StyleID="s141"><Data ss:Type="String">Heading 1</Data></Cell>
+    <Cell ss:StyleID="s141"><Data ss:Type="String">Heading 2</Data></Cell>
+    <Cell ss:StyleID="s141"><Data ss:Type="String">Third Heading</Data></Cell>
+    <Cell ss:StyleID="s141"><Data ss:Type="String">Date Heading</Data></Cell>
+    <Cell ss:StyleID="s141"><Data ss:Type="String">Time Heading</Data></Cell>
+    <Cell ss:Index="7" ss:StyleID="s141"><Data ss:Type="String">Adjusted Date</Data></Cell>
+    <Cell ss:StyleID="s141"><Data ss:Type="String">Adjusted Number</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell><Data ss:Type="String">ABC</Data></Cell>
+    <Cell><Data ss:Type="Number">1</Data></Cell>
+    <Cell ss:StyleID="s142"><Data ss:Type="Number">1.1100000000000001</Data></Cell>
+    <Cell ss:StyleID="s143"><Data ss:Type="DateTime">2001-01-01T00:00:00.000</Data></Cell>
+    <Cell ss:StyleID="s144"><Data ss:Type="DateTime">1899-12-31T01:00:00.000</Data></Cell>
+    <Cell ss:Index="7" ss:StyleID="s143" ss:Formula="=RC[-3]-RC[-5]"><Data
+      ss:Type="DateTime">2000-12-31T00:00:00.000</Data></Cell>
+    <Cell ss:StyleID="s142" ss:Formula="=RC[-6]*RC[-5]"><Data ss:Type="Number">1.1100000000000001</Data></Cell>
+    <Cell ss:Index="10"><Data ss:Type="String">A</Data></Cell>
+    <Cell ss:Formula="=RC[-9]&amp;RC[-1]"><Data ss:Type="String">1A</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell><Data ss:Type="String">BCD</Data></Cell>
+    <Cell><Data ss:Type="Number">2</Data></Cell>
+    <Cell ss:StyleID="s142"><Data ss:Type="Number">2.2200000000000002</Data></Cell>
+    <Cell ss:StyleID="s143"><Data ss:Type="DateTime">2002-02-02T00:00:00.000</Data></Cell>
+    <Cell ss:StyleID="s144"><Data ss:Type="DateTime">1899-12-31T02:00:00.000</Data></Cell>
+    <Cell ss:Index="7" ss:StyleID="s143" ss:Formula="=RC[-3]-RC[-5]"><Data
+      ss:Type="DateTime">2002-01-31T00:00:00.000</Data></Cell>
+    <Cell ss:StyleID="s142" ss:Formula="=RC[-6]*RC[-5]"><Data ss:Type="Number">4.4400000000000004</Data></Cell>
+    <Cell ss:Index="10"><Data ss:Type="String">B</Data></Cell>
+    <Cell ss:Formula="=RC[-9]&amp;RC[-1]"><Data ss:Type="String">2B</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell><Data ss:Type="String">CDE</Data></Cell>
+    <Cell><Data ss:Type="Number">3</Data></Cell>
+    <Cell ss:StyleID="s142"><Data ss:Type="Number">3.33</Data></Cell>
+    <Cell ss:StyleID="s143"><Data ss:Type="DateTime">2003-03-03T00:00:00.000</Data></Cell>
+    <Cell ss:StyleID="s144"><Data ss:Type="DateTime">1899-12-31T03:00:00.000</Data></Cell>
+    <Cell ss:Index="7" ss:StyleID="s143" ss:Formula="=RC[-3]-RC[-5]"><Data
+      ss:Type="DateTime">2003-02-28T00:00:00.000</Data></Cell>
+    <Cell ss:StyleID="s142" ss:Formula="=RC[-6]*RC[-5]"><Data ss:Type="Number">9.99</Data></Cell>
+    <Cell ss:Index="10"><Data ss:Type="String">C</Data></Cell>
+    <Cell ss:Formula="=RC[-9]&amp;RC[-1]"><Data ss:Type="String">3C</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell><Data ss:Type="String">DEF</Data></Cell>
+    <Cell><Data ss:Type="Number">4</Data></Cell>
+    <Cell ss:StyleID="s142"><Data ss:Type="Number">4.4400000000000004</Data></Cell>
+    <Cell ss:StyleID="s143"><Data ss:Type="DateTime">2004-04-03T23:00:00.000</Data></Cell>
+    <Cell ss:StyleID="s144"><Data ss:Type="DateTime">1899-12-31T04:00:00.000</Data></Cell>
+    <Cell ss:Index="7" ss:StyleID="s143" ss:Formula="=RC[-3]-RC[-5]"><Data
+      ss:Type="DateTime">2004-03-30T23:00:00.000</Data></Cell>
+    <Cell ss:StyleID="s142" ss:Formula="=RC[-6]*RC[-5]"><Data ss:Type="Number">17.760000000000002</Data></Cell>
+    <Cell ss:Index="10"><Data ss:Type="String">D</Data></Cell>
+    <Cell ss:Formula="=RC[-9]&amp;RC[-1]"><Data ss:Type="String">4D</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell><Data ss:Type="String">EFG</Data></Cell>
+    <Cell><Data ss:Type="Number">5</Data></Cell>
+    <Cell ss:StyleID="s142"><Data ss:Type="Number">5.55</Data></Cell>
+    <Cell ss:StyleID="s143"><Data ss:Type="DateTime">2005-05-04T23:00:00.000</Data></Cell>
+    <Cell ss:StyleID="s144"><Data ss:Type="DateTime">1899-12-31T05:00:00.000</Data></Cell>
+    <Cell ss:Index="7" ss:StyleID="s143" ss:Formula="=RC[-3]-RC[-5]"><Data
+      ss:Type="DateTime">2005-04-29T23:00:00.000</Data></Cell>
+    <Cell ss:StyleID="s142" ss:Formula="=RC[-6]*RC[-5]"><Data ss:Type="Number">27.75</Data></Cell>
+    <Cell ss:Index="10"><Data ss:Type="String">E</Data></Cell>
+    <Cell ss:Formula="=RC[-9]&amp;RC[-1]"><Data ss:Type="String">5E</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell><Data ss:Type="String">FGH</Data></Cell>
+    <Cell><Data ss:Type="Number">6</Data></Cell>
+    <Cell ss:StyleID="s142"><Data ss:Type="Number">6.66</Data></Cell>
+    <Cell ss:StyleID="s143"><Data ss:Type="DateTime">2006-06-05T23:00:00.000</Data></Cell>
+    <Cell ss:StyleID="s144"><Data ss:Type="DateTime">1899-12-31T06:00:00.000</Data></Cell>
+    <Cell ss:Index="7" ss:StyleID="s143" ss:Formula="=RC[-3]-RC[-5]"><Data
+      ss:Type="DateTime">2006-05-30T23:00:00.000</Data></Cell>
+    <Cell ss:StyleID="s142" ss:Formula="=RC[-6]*RC[-5]"><Data ss:Type="Number">39.96</Data></Cell>
+    <Cell ss:Index="10"><Data ss:Type="String">F</Data></Cell>
+    <Cell ss:Formula="=RC[-9]&amp;RC[-1]"><Data ss:Type="String">6F</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell><Data ss:Type="String">GHI</Data></Cell>
+    <Cell><Data ss:Type="Number">7</Data></Cell>
+    <Cell ss:StyleID="s142"><Data ss:Type="Number">7.77</Data></Cell>
+    <Cell ss:StyleID="s143"><Data ss:Type="DateTime">2007-07-06T23:00:00.000</Data></Cell>
+    <Cell ss:StyleID="s144"><Data ss:Type="DateTime">1899-12-31T07:00:00.000</Data></Cell>
+    <Cell ss:Index="7" ss:StyleID="s143" ss:Formula="=RC[-3]-RC[-5]"><Data
+      ss:Type="DateTime">2007-06-29T23:00:00.000</Data></Cell>
+    <Cell ss:StyleID="s142" ss:Formula="=RC[-6]*RC[-5]"><Data ss:Type="Number">54.39</Data></Cell>
+    <Cell ss:Index="10"><Data ss:Type="String">G</Data></Cell>
+    <Cell ss:Formula="=RC[-9]&amp;RC[-1]"><Data ss:Type="String">7G</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell><Data ss:Type="String">HIJ</Data></Cell>
+    <Cell><Data ss:Type="Number">8</Data></Cell>
+    <Cell ss:StyleID="s142"><Data ss:Type="Number">8.8800000000000008</Data></Cell>
+    <Cell ss:StyleID="s143"><Data ss:Type="DateTime">2008-08-07T23:00:00.000</Data></Cell>
+    <Cell ss:StyleID="s144"><Data ss:Type="DateTime">1899-12-31T08:00:00.000</Data></Cell>
+    <Cell ss:Index="7" ss:StyleID="s143" ss:Formula="=RC[-3]-RC[-5]"><Data
+      ss:Type="DateTime">2008-07-30T23:00:00.000</Data></Cell>
+    <Cell ss:StyleID="s142" ss:Formula="=RC[-6]*RC[-5]"><Data ss:Type="Number">71.040000000000006</Data></Cell>
+    <Cell ss:Index="10"><Data ss:Type="String">H</Data></Cell>
+    <Cell ss:Formula="=RC[-9]&amp;RC[-1]"><Data ss:Type="String">8H</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell><Data ss:Type="String">IJK</Data></Cell>
+    <Cell><Data ss:Type="Number">9</Data></Cell>
+    <Cell ss:StyleID="s142"><Data ss:Type="Number">9.99</Data></Cell>
+    <Cell ss:StyleID="s143"><Data ss:Type="DateTime">2009-09-08T23:00:00.000</Data></Cell>
+    <Cell ss:StyleID="s144"><Data ss:Type="DateTime">1899-12-31T09:00:00.000</Data></Cell>
+    <Cell ss:Index="7" ss:StyleID="s143" ss:Formula="=RC[-3]-RC[-5]"><Data
+      ss:Type="DateTime">2009-08-30T23:00:00.000</Data></Cell>
+    <Cell ss:StyleID="s142" ss:Formula="=RC[-6]*RC[-5]"><Data ss:Type="Number">89.91</Data></Cell>
+    <Cell ss:Index="10"><Data ss:Type="String">I</Data></Cell>
+    <Cell ss:Formula="=RC[-9]&amp;RC[-1]"><Data ss:Type="String">9I</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell><Data ss:Type="String">JKL</Data></Cell>
+    <Cell><Data ss:Type="Number">10</Data></Cell>
+    <Cell ss:StyleID="s142"><Data ss:Type="Number">11.1</Data></Cell>
+    <Cell ss:StyleID="s143"><Data ss:Type="DateTime">2010-10-09T23:00:00.000</Data></Cell>
+    <Cell ss:StyleID="s144"><Data ss:Type="DateTime">1899-12-31T10:00:00.000</Data></Cell>
+    <Cell ss:Index="7" ss:StyleID="s143" ss:Formula="=RC[-3]-RC[-5]"><Data
+      ss:Type="DateTime">2010-09-29T23:00:00.000</Data></Cell>
+    <Cell ss:StyleID="s142" ss:Formula="=RC[-6]*RC[-5]"><Data ss:Type="Number">111</Data></Cell>
+    <Cell ss:Index="10"><Data ss:Type="String">J</Data></Cell>
+    <Cell ss:Formula="=RC[-9]&amp;RC[-1]"><Data ss:Type="String">10J</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell><Data ss:Type="String">KLM</Data></Cell>
+    <Cell><Data ss:Type="Number">11</Data></Cell>
+    <Cell ss:StyleID="s142"><Data ss:Type="Number">12.21</Data></Cell>
+    <Cell ss:StyleID="s143"><Data ss:Type="DateTime">2011-11-11T00:00:00.000</Data></Cell>
+    <Cell ss:StyleID="s144"><Data ss:Type="DateTime">1899-12-31T11:00:00.000</Data></Cell>
+    <Cell ss:Index="7" ss:StyleID="s143" ss:Formula="=RC[-3]-RC[-5]"><Data
+      ss:Type="DateTime">2011-10-31T00:00:00.000</Data></Cell>
+    <Cell ss:StyleID="s142" ss:Formula="=RC[-6]*RC[-5]"><Data ss:Type="Number">134.31</Data></Cell>
+    <Cell ss:Index="10"><Data ss:Type="String">K</Data></Cell>
+    <Cell ss:Formula="=RC[-9]&amp;RC[-1]"><Data ss:Type="String">11K</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell><Data ss:Type="String">LMN</Data></Cell>
+    <Cell><Data ss:Type="Number">12</Data></Cell>
+    <Cell ss:StyleID="s142"><Data ss:Type="Number">13.32</Data></Cell>
+    <Cell ss:StyleID="s143"><Data ss:Type="DateTime">2012-12-12T00:00:00.000</Data></Cell>
+    <Cell ss:StyleID="s144"><Data ss:Type="DateTime">1900-01-12T00:00:00.000</Data></Cell>
+    <Cell ss:Index="7" ss:StyleID="s143" ss:Formula="=RC[-3]-RC[-5]"><Data
+      ss:Type="DateTime">2012-11-30T00:00:00.000</Data></Cell>
+    <Cell ss:StyleID="s142" ss:Formula="=RC[-6]*RC[-5]"><Data ss:Type="Number">159.84</Data></Cell>
+    <Cell ss:Index="10"><Data ss:Type="String">L</Data></Cell>
+    <Cell ss:Formula="=RC[-9]&amp;RC[-1]"><Data ss:Type="String">12L</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="15">
+    <Cell><Data ss:Type="String">ZYX</Data></Cell>
+    <Cell><Data ss:Type="Number">-1</Data></Cell>
+    <Cell ss:StyleID="s142"><Data ss:Type="Number">-1.1100000000000001</Data></Cell>
+    <Cell ss:StyleID="s143"><Data ss:Type="DateTime">1999-12-01T00:00:00.000</Data></Cell>
+    <Cell ss:StyleID="s144"><Data ss:Type="DateTime">1899-12-31T23:00:00.000</Data></Cell>
+    <Cell ss:Index="7" ss:StyleID="s143" ss:Formula="=RC[-3]-RC[-5]"><Data
+      ss:Type="DateTime">1999-12-02T00:00:00.000</Data></Cell>
+    <Cell ss:StyleID="s142" ss:Formula="=RC[-6]*RC[-5]"><Data ss:Type="Number">1.1100000000000001</Data></Cell>
+    <Cell ss:Index="10"><Data ss:Type="String">M</Data></Cell>
+    <Cell ss:Formula="=RC[-9]&amp;RC[-1]"><Data ss:Type="String">-1M</Data></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0">
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+    <Cell ss:StyleID="s121"/>
+   </Row>
+  </Table>
+  <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+   <PageSetup>
+    <Header x:Margin="0.72"/>
+    <Footer x:Margin="0.72"/>
+    <PageMargins x:Bottom="1.2" x:Left="0.72" x:Right="0.72" x:Top="1.2"/>
+   </PageSetup>
+   <Unsynced/>
+   <Print>
+    <ValidPrinterInfo/>
+    <NoOrientation/>
+    <HorizontalResolution>600</HorizontalResolution>
+    <VerticalResolution>600</VerticalResolution>
+   </Print>
+   <Panes>
+    <Pane>
+     <Number>3</Number>
+     <ActiveCol>8</ActiveCol>
+     <RangeSelection>R1C9:R15C11</RangeSelection>
+    </Pane>
+   </Panes>
+   <ProtectObjects>False</ProtectObjects>
+   <ProtectScenarios>False</ProtectScenarios>
+   <AllowFormatCells/>
+   <AllowSizeCols/>
+   <AllowSizeRows/>
+   <AllowInsertCols/>
+   <AllowInsertRows/>
+   <AllowInsertHyperlinks/>
+   <AllowDeleteCols/>
+   <AllowDeleteRows/>
+   <AllowSort/>
+   <AllowFilter/>
+   <AllowUsePivotTables/>
+  </WorksheetOptions>
+ </Worksheet>
+</Workbook>
diff --git a/src/PhpSpreadsheet/Reader/Xml.php b/src/PhpSpreadsheet/Reader/Xml.php
index 6a526d02..e4d251e2 100644
--- a/src/PhpSpreadsheet/Reader/Xml.php
+++ b/src/PhpSpreadsheet/Reader/Xml.php
@@ -17,6 +17,8 @@ use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Style\Alignment;
 use PhpOffice\PhpSpreadsheet\Style\Border;
+use PhpOffice\PhpSpreadsheet\Style\Borders;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
 use PhpOffice\PhpSpreadsheet\Style\Font;
 use SimpleXMLElement;
 
@@ -32,13 +34,6 @@ class Xml extends BaseReader
      */
     protected $styles = [];
 
-    /**
-     * Character set used in the file.
-     *
-     * @var string
-     */
-    protected $charSet = 'UTF-8';
-
     /**
      * Create a new Excel2003XML Reader instance.
      */
@@ -48,6 +43,56 @@ class Xml extends BaseReader
         $this->securityScanner = XmlScanner::getInstance($this);
     }
 
+    private $fileContents = '';
+
+    private static $mappings = [
+        'borderStyle' => [
+            '1continuous' => Border::BORDER_THIN,
+            '1dash' => Border::BORDER_DASHED,
+            '1dashdot' => Border::BORDER_DASHDOT,
+            '1dashdotdot' => Border::BORDER_DASHDOTDOT,
+            '1dot' => Border::BORDER_DOTTED,
+            '1double' => Border::BORDER_DOUBLE,
+            '2continuous' => Border::BORDER_MEDIUM,
+            '2dash' => Border::BORDER_MEDIUMDASHED,
+            '2dashdot' => Border::BORDER_MEDIUMDASHDOT,
+            '2dashdotdot' => Border::BORDER_MEDIUMDASHDOTDOT,
+            '2dot' => Border::BORDER_DOTTED,
+            '2double' => Border::BORDER_DOUBLE,
+            '3continuous' => Border::BORDER_THICK,
+            '3dash' => Border::BORDER_MEDIUMDASHED,
+            '3dashdot' => Border::BORDER_MEDIUMDASHDOT,
+            '3dashdotdot' => Border::BORDER_MEDIUMDASHDOTDOT,
+            '3dot' => Border::BORDER_DOTTED,
+            '3double' => Border::BORDER_DOUBLE,
+        ],
+        'fillType' => [
+            'solid' => Fill::FILL_SOLID,
+            'gray75' => Fill::FILL_PATTERN_DARKGRAY,
+            'gray50' => Fill::FILL_PATTERN_MEDIUMGRAY,
+            'gray25' => Fill::FILL_PATTERN_LIGHTGRAY,
+            'gray125' => Fill::FILL_PATTERN_GRAY125,
+            'gray0625' => Fill::FILL_PATTERN_GRAY0625,
+            'horzstripe' => Fill::FILL_PATTERN_DARKHORIZONTAL, // horizontal stripe
+            'vertstripe' => Fill::FILL_PATTERN_DARKVERTICAL, // vertical stripe
+            'reversediagstripe' => Fill::FILL_PATTERN_DARKUP, // reverse diagonal stripe
+            'diagstripe' => Fill::FILL_PATTERN_DARKDOWN, // diagonal stripe
+            'diagcross' => Fill::FILL_PATTERN_DARKGRID, // diagoanl crosshatch
+            'thickdiagcross' => Fill::FILL_PATTERN_DARKTRELLIS, // thick diagonal crosshatch
+            'thinhorzstripe' => Fill::FILL_PATTERN_LIGHTHORIZONTAL,
+            'thinvertstripe' => Fill::FILL_PATTERN_LIGHTVERTICAL,
+            'thinreversediagstripe' => Fill::FILL_PATTERN_LIGHTUP,
+            'thindiagstripe' => Fill::FILL_PATTERN_LIGHTDOWN,
+            'thinhorzcross' => Fill::FILL_PATTERN_LIGHTGRID, // thin horizontal crosshatch
+            'thindiagcross' => Fill::FILL_PATTERN_LIGHTTRELLIS, // thin diagonal crosshatch
+        ],
+    ];
+
+    public static function xmlMappings(): array
+    {
+        return self::$mappings;
+    }
+
     /**
      * Can the current IReader read the file?
      *
@@ -73,13 +118,10 @@ class Xml extends BaseReader
         ];
 
         // Open file
-        $this->openFile($pFilename);
-        $fileHandle = $this->fileHandle;
+        $data = file_get_contents($pFilename);
 
-        // Read sample data (first 2 KB will do)
-        $data = fread($fileHandle, 2048);
-        fclose($fileHandle);
-        $data = str_replace("'", '"', $data); // fix headers with single quote
+        // Why?
+        //$data = str_replace("'", '"', $data); // fix headers with single quote
 
         $valid = true;
         foreach ($signature as $match) {
@@ -92,9 +134,14 @@ class Xml extends BaseReader
         }
 
         //    Retrieve charset encoding
-        if (preg_match('/<?xml.*encoding=[\'"](.*?)[\'"].*?>/um', $data, $matches)) {
-            $this->charSet = strtoupper($matches[1]);
+        if (preg_match('/<?xml.*encoding=[\'"](.*?)[\'"].*?>/m', $data, $matches)) {
+            $charSet = strtoupper($matches[1]);
+            if (1 == preg_match('/^ISO-8859-\d[\dL]?$/i', $charSet)) {
+                $data = StringHelper::convertEncoding($data, 'UTF-8', $charSet);
+                $data = preg_replace('/(<?xml.*encoding=[\'"]).*?([\'"].*?>)/um', '$1' . 'UTF-8' . '$2', $data, 1);
+            }
         }
+        $this->fileContents = $data;
 
         return $valid;
     }
@@ -110,13 +157,14 @@ class Xml extends BaseReader
     {
         try {
             $xml = simplexml_load_string(
-                $this->securityScanner->scan(file_get_contents($pFilename)),
+                $this->securityScanner->scan($this->fileContents ?: file_get_contents($pFilename)),
                 'SimpleXMLElement',
                 Settings::getLibXmlLoaderOptions()
             );
         } catch (\Exception $e) {
             throw new Exception('Cannot load invalid XML file: ' . $pFilename, 0, $e);
         }
+        $this->fileContents = '';
 
         return $xml;
     }
@@ -144,7 +192,7 @@ class Xml extends BaseReader
         $xml_ss = $xml->children($namespaces['ss']);
         foreach ($xml_ss->Worksheet as $worksheet) {
             $worksheet_ss = $worksheet->attributes($namespaces['ss']);
-            $worksheetNames[] = self::convertStringEncoding((string) $worksheet_ss['Name'], $this->charSet);
+            $worksheetNames[] = (string) $worksheet_ss['Name'];
         }
 
         return $worksheetNames;
@@ -160,6 +208,9 @@ class Xml extends BaseReader
     public function listWorksheetInfo($pFilename)
     {
         File::assertFile($pFilename);
+        if (!$this->canRead($pFilename)) {
+            throw new Exception($pFilename . ' is an Invalid Spreadsheet file.');
+        }
 
         $worksheetInfo = [];
 
@@ -179,10 +230,9 @@ class Xml extends BaseReader
             $tmpInfo['totalRows'] = 0;
             $tmpInfo['totalColumns'] = 0;
 
+            $tmpInfo['worksheetName'] = "Worksheet_{$worksheetID}";
             if (isset($worksheet_ss['Name'])) {
                 $tmpInfo['worksheetName'] = (string) $worksheet_ss['Name'];
-            } else {
-                $tmpInfo['worksheetName'] = "Worksheet_{$worksheetID}";
             }
 
             if (isset($worksheet->Table->Row)) {
@@ -238,53 +288,23 @@ class Xml extends BaseReader
 
     private static function identifyFixedStyleValue($styleList, &$styleAttributeValue)
     {
+        $returnValue = false;
         $styleAttributeValue = strtolower($styleAttributeValue);
         foreach ($styleList as $style) {
             if ($styleAttributeValue == strtolower($style)) {
                 $styleAttributeValue = $style;
+                $returnValue = true;
 
-                return true;
+                break;
             }
         }
 
-        return false;
-    }
-
-    /**
-     * pixel units to excel width units(units of 1/256th of a character width).
-     *
-     * @param float $pxs
-     *
-     * @return float
-     */
-    protected static function pixel2WidthUnits($pxs)
-    {
-        $UNIT_OFFSET_MAP = [0, 36, 73, 109, 146, 182, 219];
-
-        $widthUnits = 256 * ($pxs / 7);
-        $widthUnits += $UNIT_OFFSET_MAP[($pxs % 7)];
-
-        return $widthUnits;
-    }
-
-    /**
-     * excel width units(units of 1/256th of a character width) to pixel units.
-     *
-     * @param float $widthUnits
-     *
-     * @return float
-     */
-    protected static function widthUnits2Pixel($widthUnits)
-    {
-        $pixels = ($widthUnits / 256) * 7;
-        $offsetWidthUnits = $widthUnits % 256;
-
-        return $pixels + round($offsetWidthUnits / (256 / 7));
+        return $returnValue;
     }
 
     protected static function hex2str($hex)
     {
-        return chr(hexdec($hex[1]));
+        return mb_chr((int) hexdec($hex[1]), 'UTF-8');
     }
 
     /**
@@ -308,51 +328,52 @@ class Xml extends BaseReader
         $docProps = $spreadsheet->getProperties();
         if (isset($xml->DocumentProperties[0])) {
             foreach ($xml->DocumentProperties[0] as $propertyName => $propertyValue) {
+                $stringValue = (string) $propertyValue;
                 switch ($propertyName) {
                     case 'Title':
-                        $docProps->setTitle(self::convertStringEncoding($propertyValue, $this->charSet));
+                        $docProps->setTitle($stringValue);
 
                         break;
                     case 'Subject':
-                        $docProps->setSubject(self::convertStringEncoding($propertyValue, $this->charSet));
+                        $docProps->setSubject($stringValue);
 
                         break;
                     case 'Author':
-                        $docProps->setCreator(self::convertStringEncoding($propertyValue, $this->charSet));
+                        $docProps->setCreator($stringValue);
 
                         break;
                     case 'Created':
-                        $creationDate = strtotime($propertyValue);
+                        $creationDate = strtotime($stringValue);
                         $docProps->setCreated($creationDate);
 
                         break;
                     case 'LastAuthor':
-                        $docProps->setLastModifiedBy(self::convertStringEncoding($propertyValue, $this->charSet));
+                        $docProps->setLastModifiedBy($stringValue);
 
                         break;
                     case 'LastSaved':
-                        $lastSaveDate = strtotime($propertyValue);
+                        $lastSaveDate = strtotime($stringValue);
                         $docProps->setModified($lastSaveDate);
 
                         break;
                     case 'Company':
-                        $docProps->setCompany(self::convertStringEncoding($propertyValue, $this->charSet));
+                        $docProps->setCompany($stringValue);
 
                         break;
                     case 'Category':
-                        $docProps->setCategory(self::convertStringEncoding($propertyValue, $this->charSet));
+                        $docProps->setCategory($stringValue);
 
                         break;
                     case 'Manager':
-                        $docProps->setManager(self::convertStringEncoding($propertyValue, $this->charSet));
+                        $docProps->setManager($stringValue);
 
                         break;
                     case 'Keywords':
-                        $docProps->setKeywords(self::convertStringEncoding($propertyValue, $this->charSet));
+                        $docProps->setKeywords($stringValue);
 
                         break;
                     case 'Description':
-                        $docProps->setDescription(self::convertStringEncoding($propertyValue, $this->charSet));
+                        $docProps->setDescription($stringValue);
 
                         break;
                 }
@@ -361,7 +382,7 @@ class Xml extends BaseReader
         if (isset($xml->CustomDocumentProperties)) {
             foreach ($xml->CustomDocumentProperties[0] as $propertyName => $propertyValue) {
                 $propertyAttributes = $propertyValue->attributes($namespaces['dt']);
-                $propertyName = preg_replace_callback('/_x([0-9a-z]{4})_/', ['self', 'hex2str'], $propertyName);
+                $propertyName = preg_replace_callback('/_x([0-9a-f]{4})_/i', ['self', 'hex2str'], $propertyName);
                 $propertyType = Properties::PROPERTY_TYPE_UNKNOWN;
                 switch ((string) $propertyAttributes) {
                     case 'string':
@@ -413,7 +434,7 @@ class Xml extends BaseReader
             $spreadsheet->createSheet();
             $spreadsheet->setActiveSheetIndex($worksheetID);
             if (isset($worksheet_ss['Name'])) {
-                $worksheetName = self::convertStringEncoding((string) $worksheet_ss['Name'], $this->charSet);
+                $worksheetName = (string) $worksheet_ss['Name'];
                 //    Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in
                 //        formula cells... during the load, all formulae should be correct, and we're simply bringing
                 //        the worksheet name in line with the formula, not the reverse
@@ -476,7 +497,7 @@ class Xml extends BaseReader
                         }
 
                         if (isset($cell_ss['HRef'])) {
-                            $spreadsheet->getActiveSheet()->getCell($cellRange)->getHyperlink()->setUrl($cell_ss['HRef']);
+                            $spreadsheet->getActiveSheet()->getCell($cellRange)->getHyperlink()->setUrl((string) $cell_ss['HRef']);
                         }
 
                         if ((isset($cell_ss['MergeAcross'])) || (isset($cell_ss['MergeDown']))) {
@@ -493,14 +514,15 @@ class Xml extends BaseReader
                             $spreadsheet->getActiveSheet()->mergeCells($cellRange);
                         }
 
-                        $cellIsSet = $hasCalculatedValue = false;
+                        $hasCalculatedValue = false;
                         $cellDataFormula = '';
                         if (isset($cell_ss['Formula'])) {
                             $cellDataFormula = $cell_ss['Formula'];
                             $hasCalculatedValue = true;
                         }
                         if (isset($cell->Data)) {
-                            $cellValue = $cellData = $cell->Data;
+                            $cellData = $cell->Data;
+                            $cellValue = (string) $cellData;
                             $type = DataType::TYPE_NULL;
                             $cellData_ss = $cellData->attributes($namespaces['ss']);
                             if (isset($cellData_ss['Type'])) {
@@ -516,7 +538,6 @@ class Xml extends BaseReader
                                     const TYPE_ERROR        = 'e';
                                     */
                                     case 'String':
-                                        $cellValue = self::convertStringEncoding($cellValue, $this->charSet);
                                         $type = DataType::TYPE_STRING;
 
                                         break;
@@ -540,6 +561,7 @@ class Xml extends BaseReader
                                         break;
                                     case 'Error':
                                         $type = DataType::TYPE_ERROR;
+                                        $hasCalculatedValue = false;
 
                                         break;
                                 }
@@ -555,7 +577,7 @@ class Xml extends BaseReader
                             if ($hasCalculatedValue) {
                                 $spreadsheet->getActiveSheet()->getCell($columnID . $rowID)->setCalculatedValue($cellValue);
                             }
-                            $cellIsSet = $rowHasData = true;
+                            $rowHasData = true;
                         }
 
                         if (isset($cell->Comment)) {
@@ -566,15 +588,15 @@ class Xml extends BaseReader
                             }
                             $node = $cell->Comment->Data->asXML();
                             $annotation = strip_tags($node);
-                            $spreadsheet->getActiveSheet()->getComment($columnID . $rowID)->setAuthor(self::convertStringEncoding($author, $this->charSet))->setText($this->parseRichText($annotation));
+                            $spreadsheet->getActiveSheet()->getComment($columnID . $rowID)->setAuthor($author)->setText($this->parseRichText($annotation));
                         }
 
-                        if (($cellIsSet) && (isset($cell_ss['StyleID']))) {
+                        if (isset($cell_ss['StyleID'])) {
                             $style = (string) $cell_ss['StyleID'];
                             if ((isset($this->styles[$style])) && (!empty($this->styles[$style]))) {
-                                if (!$spreadsheet->getActiveSheet()->cellExists($columnID . $rowID)) {
-                                    $spreadsheet->getActiveSheet()->getCell($columnID . $rowID)->setValue(null);
-                                }
+                                //if (!$spreadsheet->getActiveSheet()->cellExists($columnID . $rowID)) {
+                                //    $spreadsheet->getActiveSheet()->getCell($columnID . $rowID)->setValue(null);
+                                //}
                                 $spreadsheet->getActiveSheet()->getStyle($cellRange)->applyFromArray($this->styles[$style]);
                             }
                         }
@@ -622,20 +644,11 @@ class Xml extends BaseReader
         return $spreadsheet;
     }
 
-    protected static function convertStringEncoding($string, $charset)
-    {
-        if ($charset != 'UTF-8') {
-            return StringHelper::convertEncoding($string, 'UTF-8', $charset);
-        }
-
-        return $string;
-    }
-
     protected function parseRichText($is)
     {
         $value = new RichText();
 
-        $value->createText(self::convertStringEncoding($is, $this->charSet));
+        $value->createText($is);
 
         return $value;
     }
@@ -716,29 +729,41 @@ class Xml extends BaseReader
                 case 'WrapText':
                     $this->styles[$styleID]['alignment']['wrapText'] = true;
 
+                    break;
+                case 'Rotate':
+                    $this->styles[$styleID]['alignment']['textRotation'] = $styleAttributeValue;
+
                     break;
             }
         }
     }
 
+    private static $borderPositions = ['top', 'left', 'bottom', 'right'];
+
     /**
      * @param $styleID
      */
     private function parseStyleBorders($styleID, SimpleXMLElement $styleData, array $namespaces): void
     {
+        $diagonalDirection = '';
+        $borderPosition = '';
         foreach ($styleData->Border as $borderStyle) {
             $borderAttributes = $borderStyle->attributes($namespaces['ss']);
             $thisBorder = [];
+            $style = (string) $borderAttributes->Weight;
+            $style .= strtolower((string) $borderAttributes->LineStyle);
+            $thisBorder['borderStyle'] = self::$mappings['borderStyle'][$style] ?? Border::BORDER_NONE;
             foreach ($borderAttributes as $borderStyleKey => $borderStyleValue) {
                 switch ($borderStyleKey) {
-                    case 'LineStyle':
-                        $thisBorder['borderStyle'] = Border::BORDER_MEDIUM;
-
-                        break;
-                    case 'Weight':
-                        break;
                     case 'Position':
-                        $borderPosition = strtolower($borderStyleValue);
+                        $borderStyleValue = strtolower((string) $borderStyleValue);
+                        if (in_array($borderStyleValue, self::$borderPositions)) {
+                            $borderPosition = $borderStyleValue;
+                        } elseif ($borderStyleValue == 'diagonalleft') {
+                            $diagonalDirection = $diagonalDirection ? Borders::DIAGONAL_BOTH : Borders::DIAGONAL_DOWN;
+                        } elseif ($borderStyleValue == 'diagonalright') {
+                            $diagonalDirection = $diagonalDirection ? Borders::DIAGONAL_BOTH : Borders::DIAGONAL_UP;
+                        }
 
                         break;
                     case 'Color':
@@ -748,27 +773,45 @@ class Xml extends BaseReader
                         break;
                 }
             }
-            if (!empty($thisBorder)) {
-                if (($borderPosition == 'left') || ($borderPosition == 'right') || ($borderPosition == 'top') || ($borderPosition == 'bottom')) {
-                    $this->styles[$styleID]['borders'][$borderPosition] = $thisBorder;
-                }
+            if ($borderPosition) {
+                $this->styles[$styleID]['borders'][$borderPosition] = $thisBorder;
+            } elseif ($diagonalDirection) {
+                $this->styles[$styleID]['borders']['diagonalDirection'] = $diagonalDirection;
+                $this->styles[$styleID]['borders']['diagonal'] = $thisBorder;
             }
         }
     }
 
+    private static $underlineStyles = [
+        Font::UNDERLINE_NONE,
+        Font::UNDERLINE_DOUBLE,
+        Font::UNDERLINE_DOUBLEACCOUNTING,
+        Font::UNDERLINE_SINGLE,
+        Font::UNDERLINE_SINGLEACCOUNTING,
+    ];
+
+    private function parseStyleFontUnderline(string $styleID, string $styleAttributeValue): void
+    {
+        if (self::identifyFixedStyleValue(self::$underlineStyles, $styleAttributeValue)) {
+            $this->styles[$styleID]['font']['underline'] = $styleAttributeValue;
+        }
+    }
+
+    private function parseStyleFontVerticalAlign(string $styleID, string $styleAttributeValue): void
+    {
+        if ($styleAttributeValue == 'Superscript') {
+            $this->styles[$styleID]['font']['superscript'] = true;
+        }
+        if ($styleAttributeValue == 'Subscript') {
+            $this->styles[$styleID]['font']['subscript'] = true;
+        }
+    }
+
     /**
      * @param $styleID
      */
-    private function parseStyleFont($styleID, SimpleXMLElement $styleAttributes): void
+    private function parseStyleFont(string $styleID, SimpleXMLElement $styleAttributes): void
     {
-        $underlineStyles = [
-            Font::UNDERLINE_NONE,
-            Font::UNDERLINE_DOUBLE,
-            Font::UNDERLINE_DOUBLEACCOUNTING,
-            Font::UNDERLINE_SINGLE,
-            Font::UNDERLINE_SINGLEACCOUNTING,
-        ];
-
         foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
             $styleAttributeValue = (string) $styleAttributeValue;
             switch ($styleAttributeKey) {
@@ -793,9 +836,11 @@ class Xml extends BaseReader
 
                     break;
                 case 'Underline':
-                    if (self::identifyFixedStyleValue($underlineStyles, $styleAttributeValue)) {
-                        $this->styles[$styleID]['font']['underline'] = $styleAttributeValue;
-                    }
+                    $this->parseStyleFontUnderline($styleID, $styleAttributeValue);
+
+                    break;
+                case 'VerticalAlign':
+                    $this->parseStyleFontVerticalAlign($styleID, $styleAttributeValue);
 
                     break;
             }
@@ -810,11 +855,17 @@ class Xml extends BaseReader
         foreach ($styleAttributes as $styleAttributeKey => $styleAttributeValue) {
             switch ($styleAttributeKey) {
                 case 'Color':
-                    $this->styles[$styleID]['fill']['color']['rgb'] = substr($styleAttributeValue, 1);
+                    $this->styles[$styleID]['fill']['endColor']['rgb'] = substr($styleAttributeValue, 1);
+                    $this->styles[$styleID]['fill']['startColor']['rgb'] = substr($styleAttributeValue, 1);
+
+                    break;
+                case 'PatternColor':
+                    $this->styles[$styleID]['fill']['startColor']['rgb'] = substr($styleAttributeValue, 1);
 
                     break;
                 case 'Pattern':
-                    $this->styles[$styleID]['fill']['fillType'] = strtolower($styleAttributeValue);
+                    $lcStyleAttributeValue = strtolower((string) $styleAttributeValue);
+                    $this->styles[$styleID]['fill']['fillType'] = self::$mappings['fillType'][$lcStyleAttributeValue] ?? Fill::FILL_NONE;
 
                     break;
             }
diff --git a/tests/PhpSpreadsheetTests/IOFactoryTest.php b/tests/PhpSpreadsheetTests/IOFactoryTest.php
index 906375bd..f9512a34 100644
--- a/tests/PhpSpreadsheetTests/IOFactoryTest.php
+++ b/tests/PhpSpreadsheetTests/IOFactoryTest.php
@@ -127,7 +127,9 @@ class IOFactoryTest extends TestCase
             ['samples/templates/30template.xls', 'Xls', Reader\Xls::class],
             ['samples/templates/OOCalcTest.ods', 'Ods', Reader\Ods::class],
             ['samples/templates/SylkTest.slk', 'Slk', Reader\Slk::class],
-            ['samples/templates/Excel2003XMLTest.xml', 'Xml', Reader\Xml::class],
+            ['samples/templates/excel2003.xml', 'Xml', Reader\Xml::class],
+            // Following not readable by Excel.
+            //['samples/templates/Excel2003XMLTest.xml', 'Xml', Reader\Xml::class],
             ['samples/templates/46readHtml.html', 'Html', Reader\Html::class],
         ];
     }
diff --git a/tests/PhpSpreadsheetTests/Reader/CsvTest.php b/tests/PhpSpreadsheetTests/Reader/CsvTest.php
index e11e0ff7..797f3f1d 100644
--- a/tests/PhpSpreadsheetTests/Reader/CsvTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/CsvTest.php
@@ -105,7 +105,7 @@ class CsvTest extends TestCase
     {
         return [
             [false, 'tests/data/Reader/Ods/data.ods'],
-            [false, 'tests/data/Reader/Xml/WithoutStyle.xml'],
+            [false, 'samples/templates/excel2003.xml'],
             [true, 'tests/data/Reader/CSV/enclosure.csv'],
             [true, 'tests/data/Reader/CSV/semicolon_separated.csv'],
             [true, 'tests/data/Reader/CSV/contains_html.csv'],
diff --git a/tests/PhpSpreadsheetTests/Reader/Xml/XmlFilter.php b/tests/PhpSpreadsheetTests/Reader/Xml/XmlFilter.php
new file mode 100644
index 00000000..1a20bb21
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Reader/Xml/XmlFilter.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xml;
+
+use PhpOffice\PhpSpreadsheet\Reader\IReadFilter;
+
+/**  Define a Read Filter class implementing IReadFilter  */
+class XmlFilter implements IReadFilter
+{
+    public function readCell($column, $row, $worksheetName = '')
+    {
+        return $row !== 4;
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Reader/Xml/XmlInfoTest.php b/tests/PhpSpreadsheetTests/Reader/Xml/XmlInfoTest.php
new file mode 100644
index 00000000..1abbbcf9
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Reader/Xml/XmlInfoTest.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xml;
+
+use PhpOffice\PhpSpreadsheet\Reader\Exception as ReaderException;
+use PhpOffice\PhpSpreadsheet\Reader\Xml;
+use PHPUnit\Framework\TestCase;
+
+class XmlInfoTest extends TestCase
+{
+    public function testListNames(): void
+    {
+        $filename = __DIR__
+            . '/../../../..'
+            . '/samples/templates/excel2003.xml';
+        $reader = new Xml();
+        $names = $reader->listWorksheetNames($filename);
+        self::assertCount(2, $names);
+        self::assertEquals('Sample Data', $names[0]);
+        self::assertEquals('Report Data', $names[1]);
+    }
+
+    public function testListNamesInvalidFile(): void
+    {
+        $this->expectException(ReaderException::class);
+        $filename = __FILE__;
+        $reader = new Xml();
+        $names = $reader->listWorksheetNames($filename);
+        self::assertNotEquals($names, $names);
+    }
+
+    public function testListInfo(): void
+    {
+        $filename = __DIR__
+            . '/../../../..'
+            . '/samples/templates/excel2003.xml';
+        $reader = new Xml();
+        $info = $reader->listWorksheetInfo($filename);
+        $expected = [
+            [
+                'worksheetName' => 'Sample Data',
+                'lastColumnLetter' => 'J',
+                'lastColumnIndex' => 9,
+                'totalRows' => 31,
+                'totalColumns' => 10,
+            ],
+            [
+                'worksheetName' => 'Report Data',
+                'lastColumnLetter' => 'I',
+                'lastColumnIndex' => 8,
+                'totalRows' => 15,
+                'totalColumns' => 9,
+            ],
+        ];
+        self::assertEquals($expected, $info);
+    }
+
+    public function testListInfoInvalidFile(): void
+    {
+        $this->expectException(ReaderException::class);
+        $filename = __FILE__;
+        $reader = new Xml();
+        $info = $reader->listWorksheetInfo($filename);
+        self::assertNotEquals($info, $info);
+    }
+
+    public function testLoadInvalidFile(): void
+    {
+        $this->expectException(ReaderException::class);
+        $filename = __FILE__;
+        $reader = new Xml();
+        $spreadsheet = $reader->load($filename);
+        self::assertNotEquals($spreadsheet, $spreadsheet);
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Reader/Xml/XmlLoadTest.php b/tests/PhpSpreadsheetTests/Reader/Xml/XmlLoadTest.php
new file mode 100644
index 00000000..03f977f5
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Reader/Xml/XmlLoadTest.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xml;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xml;
+use PHPUnit\Framework\TestCase;
+
+class XmlLoadTest extends TestCase
+{
+    public function testLoad(): void
+    {
+        $filename = __DIR__
+            . '/../../../..'
+            . '/samples/templates/excel2003.xml';
+        $reader = new Xml();
+        $spreadsheet = $reader->load($filename);
+        self::assertEquals(2, $spreadsheet->getSheetCount());
+
+        $sheet = $spreadsheet->getSheet(1);
+        self::assertEquals('Report Data', $sheet->getTitle());
+        self::assertEquals('BCD', $sheet->getCell('A4')->getValue());
+        $props = $spreadsheet->getProperties();
+        self::assertEquals('Mark Baker', $props->getCreator());
+        self::assertEquals('AbCd1234', $props->getCustomPropertyValue('my_API_Token'));
+        self::assertEquals('2', $props->getCustomPropertyValue('myאInt'));
+
+        $sheet = $spreadsheet->getSheet(0);
+        self::assertEquals('Sample Data', $sheet->getTitle());
+        self::assertEquals('Test String 1', $sheet->getCell('A1')->getValue());
+        self::assertEquals('Test with (") in string', $sheet->getCell('A4')->getValue());
+
+        self::assertEquals(22269, $sheet->getCell('A10')->getValue());
+        self::assertEquals('dd/mm/yyyy', $sheet->getCell('A10')->getStyle()->getNumberFormat()->getFormatCode());
+        self::assertEquals('19/12/1960', $sheet->getCell('A10')->getFormattedValue());
+        self::assertEquals(1.5, $sheet->getCell('A11')->getValue());
+        self::assertEquals('# ?0/??0', $sheet->getCell('A11')->getStyle()->getNumberFormat()->getFormatCode());
+        // Same pattern, same value, different display in Gnumeric vs Excel
+        //self::assertEquals('1 1/2', $sheet->getCell('A11')->getFormattedValue());
+
+        self::assertEquals('=B1+C1', $sheet->getCell('H1')->getValue());
+        self::assertEquals('=E2&F2', $sheet->getCell('J2')->getValue());
+        self::assertEquals('=SUM(C1:C4)', $sheet->getCell('I5')->getValue());
+
+        // property not yet supported
+        //self::assertFalse($sheet->getRowDimension(30)->getVisible());
+        $hyperlink = $sheet->getCell('A21');
+        self::assertEquals('PhpSpreadsheet', $hyperlink->getValue());
+        self::assertEquals('https://github.com/PHPOffice/PhpSpreadsheet', $hyperlink->getHyperlink()->getUrl());
+    }
+
+    public function testLoadFilter(): void
+    {
+        $filename = __DIR__
+            . '/../../../..'
+            . '/samples/templates/excel2003.xml';
+        $reader = new Xml();
+        $filter = new XmlFilter();
+        $reader->setReadFilter($filter);
+        $spreadsheet = $reader->load($filename);
+        self::assertEquals(2, $spreadsheet->getSheetCount());
+        $sheet = $spreadsheet->getSheet(1);
+        self::assertEquals('Report Data', $sheet->getTitle());
+        self::assertEquals('', $sheet->getCell('A4')->getValue());
+        $props = $spreadsheet->getProperties();
+        self::assertEquals('Mark Baker', $props->getCreator());
+    }
+
+    public function testLoadSelectedSheets(): void
+    {
+        $filename = __DIR__
+            . '/../../../..'
+            . '/samples/templates/excel2003.xml';
+        $reader = new Xml();
+        $reader->setLoadSheetsOnly(['Unknown Sheet', 'Report Data']);
+        $spreadsheet = $reader->load($filename);
+        self::assertEquals(1, $spreadsheet->getSheetCount());
+        $sheet = $spreadsheet->getSheet(0);
+        self::assertEquals('Report Data', $sheet->getTitle());
+        self::assertEquals('Third Heading', $sheet->getCell('C2')->getValue());
+    }
+
+    public function testLoadUnusableSample(): void
+    {
+        // Sample spreadsheet is not readable by Excel.
+        // But PhpSpreadsheet can load it except for coverage test.
+        //global $argv;
+        //if (in_array('--coverage-clover', $argv)) {
+        //    self::markTestSkipped('Mysterious Travis coverage failure IOFactoryTest');
+        //}
+        $filename = __DIR__
+            . '/../../../..'
+            //. '/samples/templates/Excel2003XMLTest.xml';
+            . '/samples/templates/excel2003.short.bad.xml';
+        $reader = new Xml();
+        $spreadsheet = $reader->load($filename);
+        self::assertEquals(1, $spreadsheet->getSheetCount());
+        $sheet = $spreadsheet->getSheet(0);
+        self::assertEquals('Sample Data', $sheet->getTitle());
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Reader/Xml/XmlStyleCoverageTest.php b/tests/PhpSpreadsheetTests/Reader/Xml/XmlStyleCoverageTest.php
new file mode 100644
index 00000000..970b3bc5
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Reader/Xml/XmlStyleCoverageTest.php
@@ -0,0 +1,113 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xml;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xml;
+use PhpOffice\PhpSpreadsheet\Style\Border;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+use PHPUnit\Framework\TestCase;
+
+class XmlStyleCoverageTest extends TestCase
+{
+    /**
+     * @dataProvider providerBorderStyle
+     */
+    public function testBorderStyle(string $style, string $expectedResult): void
+    {
+        $styles = Xml::XmlMappings();
+        $borders = $styles['borderStyle'];
+        self::assertEquals($expectedResult, $borders[$style]);
+    }
+
+    public function testBorderStyleCoverage(): void
+    {
+        $styles = Xml::XmlMappings();
+        $expected = $styles['borderStyle'];
+        $covered = [];
+        foreach ($expected as $key => $val) {
+            $covered[$key] = 0;
+        }
+        $tests = $this->providerBorderStyle();
+        foreach ($tests as $test) {
+            $covered[$test[0]] = 1;
+        }
+        foreach ($covered as $key => $val) {
+            self::assertEquals(1, $val, "Borderstyle $key not tested");
+        }
+    }
+
+    /**
+     * @dataProvider providerfillType
+     */
+    public function testFillType(string $style, string $expectedResult): void
+    {
+        $styles = Xml::xmlMappings();
+        $borders = $styles['fillType'];
+        self::assertEquals($expectedResult, $borders[$style]);
+    }
+
+    public function testFillTypeCoverage(): void
+    {
+        $styles = Xml::XmlMappings();
+        $expected = $styles['fillType'];
+        $covered = [];
+        foreach ($expected as $key => $val) {
+            $covered[$key] = 0;
+        }
+        $tests = $this->providerfillType();
+        foreach ($tests as $test) {
+            $covered[$test[0]] = 1;
+        }
+        foreach ($covered as $key => $val) {
+            self::assertEquals(1, $val, "fillType $key not tested");
+        }
+    }
+
+    public function providerBorderStyle(): array
+    {
+        return [
+            ['1continuous', Border::BORDER_THIN],
+            ['1dash', Border::BORDER_DASHED],
+            ['1dashdot', Border::BORDER_DASHDOT],
+            ['1dashdotdot', Border::BORDER_DASHDOTDOT],
+            ['1dot', Border::BORDER_DOTTED],
+            ['1double', Border::BORDER_DOUBLE],
+            ['2continuous', Border::BORDER_MEDIUM],
+            ['2dash', Border::BORDER_MEDIUMDASHED],
+            ['2dashdot', Border::BORDER_MEDIUMDASHDOT],
+            ['2dashdotdot', Border::BORDER_MEDIUMDASHDOTDOT],
+            ['2dot', Border::BORDER_DOTTED],
+            ['2double', Border::BORDER_DOUBLE],
+            ['3continuous', Border::BORDER_THICK],
+            ['3dash', Border::BORDER_MEDIUMDASHED],
+            ['3dashdot', Border::BORDER_MEDIUMDASHDOT],
+            ['3dashdotdot', Border::BORDER_MEDIUMDASHDOTDOT],
+            ['3dot', Border::BORDER_DOTTED],
+            ['3double', Border::BORDER_DOUBLE],
+        ];
+    }
+
+    public function providerFillType(): array
+    {
+        return [
+            ['solid', Fill::FILL_SOLID],
+            ['gray75', Fill::FILL_PATTERN_DARKGRAY],
+            ['gray50', Fill::FILL_PATTERN_MEDIUMGRAY],
+            ['gray25', Fill::FILL_PATTERN_LIGHTGRAY],
+            ['gray125', Fill::FILL_PATTERN_GRAY125],
+            ['gray0625', Fill::FILL_PATTERN_GRAY0625],
+            ['horzstripe', Fill::FILL_PATTERN_DARKHORIZONTAL],
+            ['vertstripe', Fill::FILL_PATTERN_DARKVERTICAL],
+            ['reversediagstripe', Fill::FILL_PATTERN_DARKUP],
+            ['diagstripe', Fill::FILL_PATTERN_DARKDOWN],
+            ['diagcross', Fill::FILL_PATTERN_DARKGRID],
+            ['thickdiagcross', Fill::FILL_PATTERN_DARKTRELLIS],
+            ['thinhorzstripe', Fill::FILL_PATTERN_LIGHTHORIZONTAL],
+            ['thinvertstripe', Fill::FILL_PATTERN_LIGHTVERTICAL],
+            ['thinreversediagstripe', Fill::FILL_PATTERN_LIGHTUP],
+            ['thindiagstripe', Fill::FILL_PATTERN_LIGHTDOWN],
+            ['thinhorzcross', Fill::FILL_PATTERN_LIGHTGRID],
+            ['thindiagcross', Fill::FILL_PATTERN_LIGHTTRELLIS],
+        ];
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Reader/Xml/XmlStylesTest.php b/tests/PhpSpreadsheetTests/Reader/Xml/XmlStylesTest.php
new file mode 100644
index 00000000..af5bfbc3
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Reader/Xml/XmlStylesTest.php
@@ -0,0 +1,135 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xml;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xml;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PhpOffice\PhpSpreadsheet\Style\Border;
+use PhpOffice\PhpSpreadsheet\Style\Borders;
+use PhpOffice\PhpSpreadsheet\Style\Color;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+use PhpOffice\PhpSpreadsheet\Style\Font;
+use PHPUnit\Framework\TestCase;
+
+class XmlStylesTest extends TestCase
+{
+    public function testBorders(): void
+    {
+        $filename = __DIR__
+            . '/../../../..'
+            . '/samples/templates/excel2003.xml';
+        $reader = new Xml();
+        $spreadsheet = $reader->load($filename);
+
+        $sheet = $spreadsheet->getSheet(0);
+        self::assertEquals(Border::BORDER_MEDIUM, $sheet->getCell('C10')->getStyle()->getBorders()->getTop()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C10')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C10')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C10')->getStyle()->getBorders()->getLeft()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C12')->getStyle()->getBorders()->getTop()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C12')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertEquals(Border::BORDER_MEDIUM, $sheet->getCell('C12')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C12')->getStyle()->getBorders()->getLeft()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C14')->getStyle()->getBorders()->getTop()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C14')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C14')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+        self::assertEquals(Border::BORDER_MEDIUM, $sheet->getCell('C14')->getStyle()->getBorders()->getLeft()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C16')->getStyle()->getBorders()->getTop()->getBorderStyle());
+        self::assertEquals(Border::BORDER_MEDIUM, $sheet->getCell('C16')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C16')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C16')->getStyle()->getBorders()->getLeft()->getBorderStyle());
+        self::assertEquals(Border::BORDER_THICK, $sheet->getCell('C18')->getStyle()->getBorders()->getTop()->getBorderStyle());
+        self::assertEquals(Color::COLOR_RED, $sheet->getCell('C18')->getStyle()->getBorders()->getTop()->getColor()->getARGB());
+        self::assertEquals(Border::BORDER_THICK, $sheet->getCell('C18')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertEquals(Color::COLOR_YELLOW, $sheet->getCell('C18')->getStyle()->getBorders()->getRight()->getColor()->getARGB());
+        self::assertEquals(Border::BORDER_THICK, $sheet->getCell('C18')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C18')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+        self::assertEquals(Border::BORDER_NONE, $sheet->getCell('C18')->getStyle()->getBorders()->getLeft()->getBorderStyle());
+
+        self::assertEquals(Borders::DIAGONAL_BOTH, $sheet->getCell('E18')->getStyle()->getBorders()->getDiagonalDirection());
+        self::assertEquals(Borders::DIAGONAL_DOWN, $sheet->getCell('I18')->getStyle()->getBorders()->getDiagonalDirection());
+        self::assertEquals(Borders::DIAGONAL_UP, $sheet->getCell('J18')->getStyle()->getBorders()->getDiagonalDirection());
+    }
+
+    public function testFont(): void
+    {
+        $filename = __DIR__
+            . '/../../../..'
+            . '/samples/templates/excel2003.xml';
+        $reader = new Xml();
+        $spreadsheet = $reader->load($filename);
+
+        $sheet = $spreadsheet->getSheet(0);
+        self::assertEquals('FFFF0000', $sheet->getCell('A1')->getStyle()->getFont()->getColor()->getARGB());
+        self::assertEquals(Font::UNDERLINE_SINGLE, $sheet->getCell('A3')->getStyle()->getFont()->getUnderline());
+
+        self::assertTrue($sheet->getCell('E1')->getStyle()->getFont()->getBold());
+        self::assertTrue($sheet->getCell('E1')->getStyle()->getFont()->getItalic());
+
+        self::assertFalse($sheet->getCell('E2')->getStyle()->getFont()->getBold());
+        self::assertFalse($sheet->getCell('E2')->getStyle()->getFont()->getItalic());
+        self::assertEquals(Font::UNDERLINE_NONE, $sheet->getCell('E2')->getStyle()->getFont()->getUnderline());
+        self::assertTrue($sheet->getCell('E3')->getStyle()->getFont()->getBold());
+        self::assertFalse($sheet->getCell('E3')->getStyle()->getFont()->getItalic());
+        self::assertEquals(Font::UNDERLINE_NONE, $sheet->getCell('E3')->getStyle()->getFont()->getUnderline());
+        self::assertFalse($sheet->getCell('E4')->getStyle()->getFont()->getBold());
+        self::assertTrue($sheet->getCell('E4')->getStyle()->getFont()->getItalic());
+        self::assertEquals(Font::UNDERLINE_NONE, $sheet->getCell('E4')->getStyle()->getFont()->getUnderline());
+
+        self::assertTrue($sheet->getCell('F1')->getStyle()->getFont()->getBold());
+        self::assertFalse($sheet->getCell('F1')->getStyle()->getFont()->getItalic());
+        self::assertEquals(Font::UNDERLINE_NONE, $sheet->getCell('F1')->getStyle()->getFont()->getUnderline());
+        self::assertFalse($sheet->getCell('F2')->getStyle()->getFont()->getBold());
+        self::assertFalse($sheet->getCell('F2')->getStyle()->getFont()->getItalic());
+        self::assertEquals(Font::UNDERLINE_NONE, $sheet->getCell('F2')->getStyle()->getFont()->getUnderline());
+        self::assertTrue($sheet->getCell('F3')->getStyle()->getFont()->getBold());
+        self::assertTrue($sheet->getCell('F3')->getStyle()->getFont()->getItalic());
+        self::assertEquals(Font::UNDERLINE_NONE, $sheet->getCell('F3')->getStyle()->getFont()->getUnderline());
+        self::assertFalse($sheet->getCell('F4')->getStyle()->getFont()->getBold());
+        self::assertFalse($sheet->getCell('F4')->getStyle()->getFont()->getItalic());
+        self::assertEquals(Font::UNDERLINE_NONE, $sheet->getCell('F4')->getStyle()->getFont()->getUnderline());
+
+        self::assertEquals(45, $sheet->getCell('E22')->getStyle()->getAlignment()->getTextRotation());
+        self::assertEquals(-90, $sheet->getCell('G22')->getStyle()->getAlignment()->getTextRotation());
+        self::assertEquals(Border::BORDER_DOUBLE, $sheet->getCell('N13')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+
+        self::assertEquals(Font::UNDERLINE_DOUBLE, $sheet->getCell('A24')->getStyle()->getFont()->getUnderline());
+        self::assertTrue($sheet->getCell('B23')->getStyle()->getFont()->getSubScript());
+        self::assertTrue($sheet->getCell('B24')->getStyle()->getFont()->getSuperScript());
+    }
+
+    public function testFill(): void
+    {
+        $filename = __DIR__
+            . '/../../../..'
+            . '/samples/templates/excel2003.xml';
+        $reader = new Xml();
+        $spreadsheet = $reader->load($filename);
+
+        $sheet = $spreadsheet->getSheet(0);
+        self::assertEquals(Fill::FILL_PATTERN_DARKHORIZONTAL, $sheet->getCell('K19')->getStyle()->getFill()->getFillType());
+        self::assertEquals('FF00CCFF', $sheet->getCell('K19')->getStyle()->getFill()->getEndColor()->getARGB());
+        self::assertEquals(Color::COLOR_BLUE, $sheet->getCell('K19')->getStyle()->getFill()->getStartColor()->getARGB());
+        self::assertEquals(Fill::FILL_PATTERN_GRAY0625, $sheet->getCell('L19')->getStyle()->getFill()->getFillType());
+        self::assertEquals(Color::COLOR_RED, $sheet->getCell('L19')->getStyle()->getFill()->getEndColor()->getARGB());
+        self::assertEquals(Color::COLOR_YELLOW, $sheet->getCell('L19')->getStyle()->getFill()->getStartColor()->getARGB());
+        self::assertEquals(Fill::FILL_SOLID, $sheet->getCell('K3')->getStyle()->getFill()->getFillType());
+        self::assertEquals(Color::COLOR_RED, $sheet->getCell('K3')->getStyle()->getFill()->getEndColor()->getARGB());
+    }
+
+    public function testAlignment(): void
+    {
+        $filename = __DIR__
+            . '/../../../..'
+            . '/samples/templates/excel2003.xml';
+        $reader = new Xml();
+        $spreadsheet = $reader->load($filename);
+
+        $sheet = $spreadsheet->getSheet(0);
+        self::assertEquals(45, $sheet->getCell('E22')->getStyle()->getAlignment()->getTextRotation());
+        self::assertEquals(-90, $sheet->getCell('G22')->getStyle()->getAlignment()->getTextRotation());
+        self::assertEquals(Alignment::HORIZONTAL_CENTER, $sheet->getCell('N2')->getStyle()->getAlignment()->getHorizontal());
+        self::assertEquals(Alignment::HORIZONTAL_RIGHT, $sheet->getCell('N3')->getStyle()->getAlignment()->getHorizontal());
+        self::assertEquals(Alignment::VERTICAL_TOP, $sheet->getCell('K19')->getStyle()->getAlignment()->getVertical());
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Reader/XmlTest.php b/tests/PhpSpreadsheetTests/Reader/Xml/XmlTest.php
similarity index 70%
rename from tests/PhpSpreadsheetTests/Reader/XmlTest.php
rename to tests/PhpSpreadsheetTests/Reader/Xml/XmlTest.php
index a8de8774..2b66c7b4 100644
--- a/tests/PhpSpreadsheetTests/Reader/XmlTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Xml/XmlTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace PhpOffice\PhpSpreadsheetTests\Reader;
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xml;
 
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
 use PhpOffice\PhpSpreadsheet\Reader\Xml;
@@ -34,23 +34,17 @@ class XmlTest extends TestCase
     /**
      * Check if it can read XML Hyperlink correctly.
      */
-    public function testReadHyperlinks(): void
+    public function testHyperlinksAltCharset(): void
     {
         $reader = new Xml();
-        $spreadsheet = $reader->load('samples/templates/Excel2003XMLTest.xml');
+        $spreadsheet = $reader->load('tests/data/Reader/Xml/excel2003.iso8859-1.xml');
         $firstSheet = $spreadsheet->getSheet(0);
+        self::assertSame('Voilà', $spreadsheet->getActiveSheet()->getCell('A1')->getValue());
 
-        $hyperlink = $firstSheet->getCell('L1');
+        $hyperlink = $firstSheet->getCell('A2');
 
         self::assertEquals(DataType::TYPE_STRING, $hyperlink->getDataType());
         self::assertEquals('PhpSpreadsheet', $hyperlink->getValue());
         self::assertEquals('https://phpspreadsheet.readthedocs.io', $hyperlink->getHyperlink()->getUrl());
     }
-
-    public function testReadWithoutStyle(): void
-    {
-        $reader = new Xml();
-        $spreadsheet = $reader->load('tests/data/Reader/Xml/WithoutStyle.xml');
-        self::assertSame('Test String 1', $spreadsheet->getActiveSheet()->getCell('A1')->getValue());
-    }
 }
diff --git a/tests/data/Reader/Xml/excel2003.iso8859-1.xml b/tests/data/Reader/Xml/excel2003.iso8859-1.xml
new file mode 100644
index 00000000..f63eb075
--- /dev/null
+++ b/tests/data/Reader/Xml/excel2003.iso8859-1.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<?mso-application progid="Excel.Sheet"?>
+<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:o="urn:schemas-microsoft-com:office:office"
+ xmlns:x="urn:schemas-microsoft-com:office:excel"
+ xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:html="http://www.w3.org/TR/REC-html40">
+ <DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+  <Author>Owen Leibman</Author>
+  <LastAuthor>Owen Leibman</LastAuthor>
+  <Created>2020-06-20T18:12:18Z</Created>
+  <Version>16.00</Version>
+ </DocumentProperties>
+ <OfficeDocumentSettings xmlns="urn:schemas-microsoft-com:office:office">
+  <AllowPNG/>
+ </OfficeDocumentSettings>
+ <ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+  <WindowHeight>8964</WindowHeight>
+  <WindowWidth>23040</WindowWidth>
+  <WindowTopX>32767</WindowTopX>
+  <WindowTopY>32767</WindowTopY>
+  <ProtectStructure>False</ProtectStructure>
+  <ProtectWindows>False</ProtectWindows>
+ </ExcelWorkbook>
+ <Styles>
+  <Style ss:ID="Default" ss:Name="Normal">
+   <Alignment ss:Vertical="Bottom"/>
+   <Borders/>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"/>
+   <Interior/>
+   <NumberFormat/>
+   <Protection/>
+  </Style>
+  <Style ss:ID="s62" ss:Name="Hyperlink">
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#0563C1"
+    ss:Underline="Single"/>
+  </Style>
+ </Styles>
+ <Worksheet ss:Name="Sheet1">
+  <Table ss:ExpandedColumnCount="1" ss:ExpandedRowCount="2" x:FullColumns="1"
+   x:FullRows="1" ss:DefaultRowHeight="14.4">
+   <Row>
+    <Cell><Data ss:Type="String">Voil�</Data></Cell>
+   </Row>
+   <Row>
+    <Cell ss:StyleID="s62" ss:HRef="https://phpspreadsheet.readthedocs.io"><Data
+      ss:Type="String">PhpSpreadsheet</Data></Cell>
+   </Row>
+  </Table>
+  <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+   <PageSetup>
+    <Header x:Margin="0.3"/>
+    <Footer x:Margin="0.3"/>
+    <PageMargins x:Bottom="0.75" x:Left="0.7" x:Right="0.7" x:Top="0.75"/>
+   </PageSetup>
+   <Selected/>
+   <Panes>
+    <Pane>
+     <Number>3</Number>
+     <ActiveRow>2</ActiveRow>
+    </Pane>
+   </Panes>
+   <ProtectObjects>False</ProtectObjects>
+   <ProtectScenarios>False</ProtectScenarios>
+  </WorksheetOptions>
+ </Worksheet>
+</Workbook>

From da7adcda806a87c722633b2a83aa85549cec7fe9 Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Sun, 11 Oct 2020 22:11:20 +0900
Subject: [PATCH 145/153] Update CHANGELOG

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd9e8fd4..37233d70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
     - **Xlsx** (Previously only simple named ranges were supported)
     - **Xls** (Previously neither named ranges nor formulae were supported) - Still not supported, but some parser issues resolved that previously failed to differentiate between a defined name and a function name
     - **Ods** (Previously neither named ranges nor formulae were supported)
+- Support for PHP 8.0
 
 ### Changed
 
@@ -37,6 +38,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Named formula implementation, and improved handling of Defined Names generally [#1535](https://github.com/PHPOffice/PhpSpreadsheet/pull/1535)
 - fix resolution of relative named range values in the calculation engine; previously all named range values had been treated as absolute.
 - Drop $this->spreadSheet null check from Xlsx Writer [#1646](https://github.com/phpoffice/phpspreadsheet/pull/1646)
+- Improving Coverage for Excel2003 XML Reader [#1557](https://github.com/phpoffice/phpspreadsheet/pull/1557)
 
 ### Deprecated
 
@@ -582,4 +584,4 @@ For a comprehensive list of all class changes, and a semi-automated migration pa
 
 ## Previous versions of PHPExcel
 
-The changelog for the project when it was called PHPExcel is [still available](./CHANGELOG.PHPExcel.md).
\ No newline at end of file
+The changelog for the project when it was called PHPExcel is [still available](./CHANGELOG.PHPExcel.md).

From a8e8068b31b8119e1daa5b1eb5715a3a8ea8305f Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Sun, 11 Oct 2020 22:20:59 +0900
Subject: [PATCH 146/153] 1.15.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37233d70..2a43bae4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com)
 and this project adheres to [Semantic Versioning](https://semver.org).
 
-## Unreleased - TBD
+## 1.15.0 - 2020-10-11
 
 ### Added
 

From 6da3f30def1dfe6c7e76f2640024f0677c379604 Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Sun, 11 Oct 2020 22:32:04 +0900
Subject: [PATCH 147/153] Remove coverage from Travis

Coverage data were not correctly uploaded for a long time now, and it
now is uploaded via GitHub Actions
---
 .travis.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 28a9af0d..6eb59290 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,12 +32,3 @@ jobs:
       script:
         - ./vendor/bin/php-cs-fixer fix --diff --verbose --dry-run
         - ./vendor/bin/phpcs
-
-    - stage: Coverage
-      php: 7.4
-      script:
-        - pecl install pcov
-        - ./vendor/bin/phpunit --coverage-clover coverage-clover.xml
-      after_script:
-        - wget https://scrutinizer-ci.com/ocular.phar
-        - php ocular.phar code-coverage:upload --format=php-clover tests/coverage-clover.xml

From 1cda8110176853625d674a210f52fc1d3970c675 Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Mon, 12 Oct 2020 08:06:57 +0900
Subject: [PATCH 148/153] Prepare for next version

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a43bae4..2a3678bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,28 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com)
 and this project adheres to [Semantic Versioning](https://semver.org).
 
+## Unreleased - TBD
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 1.15.0 - 2020-10-11
 
 ### Added

From 92389c78ebe60936e230f6c4efd6aab7947adbbe Mon Sep 17 00:00:00 2001
From: Mark Baker <mark@lange.demon.co.uk>
Date: Mon, 12 Oct 2020 13:22:32 +0200
Subject: [PATCH 149/153] Ensure that the list of shared formulae is maintained
 while chunk-reading Xlsx Files (#1680)

* Ensure that the list of shared formulae is maintained while chunk-reading Xlsx files
---
 CHANGELOG.md                       | 2 +-
 src/PhpSpreadsheet/Reader/Xlsx.php | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a3678bd..b3dd17a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,7 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Fixed
 
-- Nothing.
+- Ensure that the list of shared formulae is maintained when an xlsx file is chunked with readFilter[Issue #169](https://github.com/PHPOffice/PhpSpreadsheet/issues/1669).
 
 ## 1.15.0 - 2020-10-11
 
diff --git a/src/PhpSpreadsheet/Reader/Xlsx.php b/src/PhpSpreadsheet/Reader/Xlsx.php
index 73f91852..3a75edf6 100644
--- a/src/PhpSpreadsheet/Reader/Xlsx.php
+++ b/src/PhpSpreadsheet/Reader/Xlsx.php
@@ -661,6 +661,9 @@ class Xlsx extends BaseReader
                                             $coordinates = Coordinate::coordinateFromString($r);
 
                                             if (!$this->getReadFilter()->readCell($coordinates[0], (int) $coordinates[1], $docSheet->getTitle())) {
+                                                if (isset($c->f)) {
+                                                    $this->castToFormula($c, $r, $cellDataType, $value, $calculatedValue, $sharedFormulas, 'castToError');
+                                                }
                                                 ++$rowIndex;
 
                                                 continue;

From 96e843ceeed10c85317cb053f31b4986bd28e98c Mon Sep 17 00:00:00 2001
From: Jan-Simon Winkelmann <jwinkelmann@rapidsoft.de>
Date: Mon, 21 Sep 2020 18:16:17 +0200
Subject: [PATCH 150/153] Prevent notice during accessing "cached magnification
 factor" offset

Sheet View Settings Block should be 8-14 bytes long in BIFF8 Excel 97 according
to the open office file format documentation. However access to byte 10 and 12 is
not possible when record data is malformed, so getUInt2d throws notice.
---
 CHANGELOG.md                      |  1 +
 src/PhpSpreadsheet/Reader/Xls.php | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3dd17a4..a3f149df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 ### Fixed
 
 - Ensure that the list of shared formulae is maintained when an xlsx file is chunked with readFilter[Issue #169](https://github.com/PHPOffice/PhpSpreadsheet/issues/1669).
+- Fix for notice during accessing "cached magnification factor" offset [#1354](https://github.com/PHPOffice/PhpSpreadsheet/pull/1354)
 
 ## 1.15.0 - 2020-10-11
 
diff --git a/src/PhpSpreadsheet/Reader/Xls.php b/src/PhpSpreadsheet/Reader/Xls.php
index 81cc5b2e..b5c92d8d 100644
--- a/src/PhpSpreadsheet/Reader/Xls.php
+++ b/src/PhpSpreadsheet/Reader/Xls.php
@@ -4377,11 +4377,22 @@ class Xls extends BaseReader
             // offset: 10; size: 2; cached magnification factor in page break preview (in percent); 0 = Default (60%)
             // offset: 12; size: 2; cached magnification factor in normal view (in percent); 0 = Default (100%)
             // offset: 14; size: 4; not used
-            $zoomscaleInPageBreakPreview = self::getUInt2d($recordData, 10);
+            if (!isset($recordData[10])) {
+                $zoomscaleInPageBreakPreview = 0;
+            } else {
+                $zoomscaleInPageBreakPreview = self::getUInt2d($recordData, 10);
+            }
+
             if ($zoomscaleInPageBreakPreview === 0) {
                 $zoomscaleInPageBreakPreview = 60;
             }
-            $zoomscaleInNormalView = self::getUInt2d($recordData, 12);
+
+            if (!isset($recordData[12])) {
+                $zoomscaleInNormalView = 0;
+            } else {
+                $zoomscaleInNormalView = self::getUInt2d($recordData, 12);
+            }
+
             if ($zoomscaleInNormalView === 0) {
                 $zoomscaleInNormalView = 100;
             }

From cc209d0b43c9ef9cb7534746a1b2c22a4dd7f56d Mon Sep 17 00:00:00 2001
From: Adrien Crivelli <adrien.crivelli@gmail.com>
Date: Mon, 19 Oct 2020 09:31:34 +0900
Subject: [PATCH 151/153] Refresh lock files

---
 composer.lock | 842 ++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 616 insertions(+), 226 deletions(-)

diff --git a/composer.lock b/composer.lock
index 266608f2..9be3b1b9 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": "931b86c12c78e665f1766ea922f95e0b",
+    "content-hash": "955c4a84deddf2db043a5c2faabbb66f",
     "packages": [
         {
             "name": "maennchen/zipstream-php",
@@ -65,34 +65,40 @@
                 "stream",
                 "zip"
             ],
+            "funding": [
+                {
+                    "url": "https://opencollective.com/zipstream",
+                    "type": "open_collective"
+                }
+            ],
             "time": "2020-05-30T13:11:16+00:00"
         },
         {
             "name": "markbaker/complex",
-            "version": "1.4.8",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/MarkBaker/PHPComplex.git",
-                "reference": "8eaa40cceec7bf0518187530b2e63871be661b72"
+                "reference": "9999f1432fae467bc93c53f357105b4c31bb994c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/8eaa40cceec7bf0518187530b2e63871be661b72",
-                "reference": "8eaa40cceec7bf0518187530b2e63871be661b72",
+                "url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/9999f1432fae467bc93c53f357105b4c31bb994c",
+                "reference": "9999f1432fae467bc93c53f357105b4c31bb994c",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6.0|^7.0.0"
+                "php": "^7.2 || ^8.0"
             },
             "require-dev": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
                 "phpcompatibility/php-compatibility": "^9.0",
                 "phpdocumentor/phpdocumentor": "2.*",
-                "phploc/phploc": "2.*",
+                "phploc/phploc": "^4.0",
                 "phpmd/phpmd": "2.*",
-                "phpunit/phpunit": "^4.8.35|^5.4.0",
-                "sebastian/phpcpd": "2.*",
-                "squizlabs/php_codesniffer": "^3.4.0"
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.3",
+                "sebastian/phpcpd": "^4.0",
+                "squizlabs/php_codesniffer": "^3.4"
             },
             "type": "library",
             "autoload": {
@@ -160,33 +166,34 @@
                 "complex",
                 "mathematics"
             ],
-            "time": "2020-03-11T20:15:49+00:00"
+            "time": "2020-08-26T10:42:07+00:00"
         },
         {
             "name": "markbaker/matrix",
-            "version": "1.2.0",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/MarkBaker/PHPMatrix.git",
-                "reference": "5348c5a67e3b75cd209d70103f916a93b1f1ed21"
+                "reference": "9567d9c4c519fbe40de01dbd1e4469dbbb66f46a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/5348c5a67e3b75cd209d70103f916a93b1f1ed21",
-                "reference": "5348c5a67e3b75cd209d70103f916a93b1f1ed21",
+                "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/9567d9c4c519fbe40de01dbd1e4469dbbb66f46a",
+                "reference": "9567d9c4c519fbe40de01dbd1e4469dbbb66f46a",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6.0|^7.0.0"
+                "php": "^7.2 || ^8.0"
             },
             "require-dev": {
-                "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
-                "phpcompatibility/php-compatibility": "dev-master",
-                "phploc/phploc": "^4",
-                "phpmd/phpmd": "dev-master",
-                "phpunit/phpunit": "^5.7",
-                "sebastian/phpcpd": "^3.0",
-                "squizlabs/php_codesniffer": "^3.0@dev"
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
+                "phpcompatibility/php-compatibility": "^9.0",
+                "phpdocumentor/phpdocumentor": "2.*",
+                "phploc/phploc": "^4.0",
+                "phpmd/phpmd": "2.*",
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.3",
+                "sebastian/phpcpd": "^4.0",
+                "squizlabs/php_codesniffer": "^3.4"
             },
             "type": "library",
             "autoload": {
@@ -219,7 +226,7 @@
             "authors": [
                 {
                     "name": "Mark Baker",
-                    "email": "mark@lange.demon.co.uk"
+                    "email": "mark@demon-angel.eu"
                 }
             ],
             "description": "PHP Class for working with matrices",
@@ -229,7 +236,7 @@
                 "matrix",
                 "vector"
             ],
-            "time": "2019-10-06T11:29:25+00:00"
+            "time": "2020-08-28T17:11:00+00:00"
         },
         {
             "name": "myclabs/php-enum",
@@ -478,16 +485,16 @@
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.17.1",
+            "version": "v1.18.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "7110338d81ce1cbc3e273136e4574663627037a7"
+                "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7110338d81ce1cbc3e273136e4574663627037a7",
-                "reference": "7110338d81ce1cbc3e273136e4574663627037a7",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a6977d63bf9a0ad4c65cd352709e230876f9904a",
+                "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a",
                 "shasum": ""
             },
             "require": {
@@ -499,7 +506,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.17-dev"
+                    "dev-master": "1.18-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -537,22 +544,36 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-06-06T08:46:27+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-07-14T12:35:20+00:00"
         }
     ],
     "packages-dev": [
         {
             "name": "composer/semver",
-            "version": "1.5.1",
+            "version": "1.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/semver.git",
-                "reference": "c6bea70230ef4dd483e6bbcab6005f682ed3a8de"
+                "reference": "38276325bd896f90dfcfe30029aa5db40df387a7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/c6bea70230ef4dd483e6bbcab6005f682ed3a8de",
-                "reference": "c6bea70230ef4dd483e6bbcab6005f682ed3a8de",
+                "url": "https://api.github.com/repos/composer/semver/zipball/38276325bd896f90dfcfe30029aa5db40df387a7",
+                "reference": "38276325bd896f90dfcfe30029aa5db40df387a7",
                 "shasum": ""
             },
             "require": {
@@ -600,20 +621,34 @@
                 "validation",
                 "versioning"
             ],
-            "time": "2020-01-13T12:06:48+00:00"
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-09-27T13:13:07+00:00"
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "1.4.2",
+            "version": "1.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51"
+                "reference": "ebd27a9866ae8254e873866f795491f02418c5a5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51",
-                "reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ebd27a9866ae8254e873866f795491f02418c5a5",
+                "reference": "ebd27a9866ae8254e873866f795491f02418c5a5",
                 "shasum": ""
             },
             "require": {
@@ -644,20 +679,34 @@
                 "Xdebug",
                 "performance"
             ],
-            "time": "2020-06-04T11:16:35+00:00"
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-08-19T10:27:58+00:00"
         },
         {
             "name": "doctrine/annotations",
-            "version": "1.10.3",
+            "version": "1.10.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/annotations.git",
-                "reference": "5db60a4969eba0e0c197a19c077780aadbc43c5d"
+                "reference": "bfe91e31984e2ba76df1c1339681770401ec262f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/5db60a4969eba0e0c197a19c077780aadbc43c5d",
-                "reference": "5db60a4969eba0e0c197a19c077780aadbc43c5d",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/bfe91e31984e2ba76df1c1339681770401ec262f",
+                "reference": "bfe91e31984e2ba76df1c1339681770401ec262f",
                 "shasum": ""
             },
             "require": {
@@ -667,7 +716,8 @@
             },
             "require-dev": {
                 "doctrine/cache": "1.*",
-                "phpunit/phpunit": "^7.5"
+                "phpstan/phpstan": "^0.12.20",
+                "phpunit/phpunit": "^7.5 || ^9.1.5"
             },
             "type": "library",
             "extra": {
@@ -713,7 +763,7 @@
                 "docblock",
                 "parser"
             ],
-            "time": "2020-05-25T17:24:27+00:00"
+            "time": "2020-08-10T19:35:50+00:00"
         },
         {
             "name": "doctrine/instantiator",
@@ -769,6 +819,20 @@
                 "constructor",
                 "instantiate"
             ],
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-05-29T17:27:14+00:00"
         },
         {
@@ -831,37 +895,53 @@
                 "parser",
                 "php"
             ],
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-05-25T17:44:05+00:00"
         },
         {
             "name": "dompdf/dompdf",
-            "version": "v0.8.5",
+            "version": "v0.8.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dompdf/dompdf.git",
-                "reference": "6782abfc090b132134cd6cea0ec6d76f0fce2c56"
+                "reference": "db91d81866c69a42dad1d2926f61515a1e3f42c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dompdf/dompdf/zipball/6782abfc090b132134cd6cea0ec6d76f0fce2c56",
-                "reference": "6782abfc090b132134cd6cea0ec6d76f0fce2c56",
+                "url": "https://api.github.com/repos/dompdf/dompdf/zipball/db91d81866c69a42dad1d2926f61515a1e3f42c5",
+                "reference": "db91d81866c69a42dad1d2926f61515a1e3f42c5",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-mbstring": "*",
-                "phenx/php-font-lib": "^0.5.1",
+                "phenx/php-font-lib": "^0.5.2",
                 "phenx/php-svg-lib": "^0.3.3",
                 "php": "^7.1"
             },
             "require-dev": {
+                "mockery/mockery": "^1.3",
                 "phpunit/phpunit": "^7.5",
                 "squizlabs/php_codesniffer": "^3.5"
             },
             "suggest": {
                 "ext-gd": "Needed to process images",
                 "ext-gmagick": "Improves image processing performance",
-                "ext-imagick": "Improves image processing performance"
+                "ext-imagick": "Improves image processing performance",
+                "ext-zlib": "Needed for pdf stream compression"
             },
             "type": "library",
             "extra": {
@@ -897,7 +977,7 @@
             ],
             "description": "DOMPDF is a CSS 2.1 compliant HTML to PDF converter",
             "homepage": "https://github.com/dompdf/dompdf",
-            "time": "2020-02-20T03:52:51+00:00"
+            "time": "2020-08-30T22:54:22+00:00"
         },
         {
             "name": "friendsofphp/php-cs-fixer",
@@ -988,6 +1068,12 @@
                 }
             ],
             "description": "A tool to automatically fix PHP code style",
+            "funding": [
+                {
+                    "url": "https://github.com/keradus",
+                    "type": "github"
+                }
+            ],
             "time": "2020-06-27T23:57:46+00:00"
         },
         {
@@ -1033,16 +1119,16 @@
         },
         {
             "name": "mpdf/mpdf",
-            "version": "v8.0.6",
+            "version": "v8.0.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mpdf/mpdf.git",
-                "reference": "d27aa93513b915896fa7cb53901d3122e286f811"
+                "reference": "7daf07f15334ed59a276bd52131dcca48794cdbd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mpdf/mpdf/zipball/d27aa93513b915896fa7cb53901d3122e286f811",
-                "reference": "d27aa93513b915896fa7cb53901d3122e286f811",
+                "url": "https://api.github.com/repos/mpdf/mpdf/zipball/7daf07f15334ed59a276bd52131dcca48794cdbd",
+                "reference": "7daf07f15334ed59a276bd52131dcca48794cdbd",
                 "shasum": ""
             },
             "require": {
@@ -1098,24 +1184,30 @@
                 "php",
                 "utf-8"
             ],
-            "time": "2020-05-25T09:08:39+00:00"
+            "funding": [
+                {
+                    "url": "https://www.paypal.me/mpdf",
+                    "type": "custom"
+                }
+            ],
+            "time": "2020-07-15T09:48:00+00:00"
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.9.5",
+            "version": "1.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef"
+                "reference": "969b211f9a51aa1f6c01d1d2aef56d3bd91598e5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/b2c28789e80a97badd14145fda39b545d83ca3ef",
-                "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/969b211f9a51aa1f6c01d1d2aef56d3bd91598e5",
+                "reference": "969b211f9a51aa1f6c01d1d2aef56d3bd91598e5",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": "^7.1 || ^8.0"
             },
             "replace": {
                 "myclabs/deep-copy": "self.version"
@@ -1146,7 +1238,13 @@
                 "object",
                 "object graph"
             ],
-            "time": "2020-01-17T21:11:47+00:00"
+            "funding": [
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-06-29T13:22:24+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -1374,23 +1472,23 @@
         },
         {
             "name": "php-cs-fixer/diff",
-            "version": "v1.3.0",
+            "version": "v1.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/diff.git",
-                "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756"
+                "reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/78bb099e9c16361126c86ce82ec4405ebab8e756",
-                "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/dbd31aeb251639ac0b9e7e29405c1441907f5759",
+                "reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0"
+                "php": "^5.6 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+                "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0",
                 "symfony/process": "^3.3"
             },
             "type": "library",
@@ -1404,14 +1502,14 @@
                 "BSD-3-Clause"
             ],
             "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
                 {
                     "name": "Sebastian Bergmann",
                     "email": "sebastian@phpunit.de"
                 },
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
                 {
                     "name": "SpacePossum"
                 }
@@ -1421,7 +1519,7 @@
             "keywords": [
                 "diff"
             ],
-            "time": "2018-02-15T16:58:55+00:00"
+            "time": "2020-10-14T08:39:05+00:00"
         },
         {
             "name": "phpcompatibility/php-compatibility",
@@ -1532,28 +1630,27 @@
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "5.1.0",
+            "version": "5.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e"
+                "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e",
-                "reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556",
+                "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556",
                 "shasum": ""
             },
             "require": {
-                "ext-filter": "^7.1",
-                "php": "^7.2",
-                "phpdocumentor/reflection-common": "^2.0",
-                "phpdocumentor/type-resolver": "^1.0",
-                "webmozart/assert": "^1"
+                "ext-filter": "*",
+                "php": "^7.2 || ^8.0",
+                "phpdocumentor/reflection-common": "^2.2",
+                "phpdocumentor/type-resolver": "^1.3",
+                "webmozart/assert": "^1.9.1"
             },
             "require-dev": {
-                "doctrine/instantiator": "^1",
-                "mockery/mockery": "^1"
+                "mockery/mockery": "~1.3.2"
             },
             "type": "library",
             "extra": {
@@ -1581,20 +1678,20 @@
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2020-02-22T12:28:44+00:00"
+            "time": "2020-09-03T19:13:55+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.3.0",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "e878a14a65245fbe78f8080eba03b47c3b705651"
+                "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e878a14a65245fbe78f8080eba03b47c3b705651",
-                "reference": "e878a14a65245fbe78f8080eba03b47c3b705651",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
+                "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
                 "shasum": ""
             },
             "require": {
@@ -1626,37 +1723,37 @@
                 }
             ],
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
-            "time": "2020-06-27T10:12:23+00:00"
+            "time": "2020-09-17T18:55:26+00:00"
         },
         {
             "name": "phpspec/prophecy",
-            "version": "v1.10.3",
+            "version": "1.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "451c3cd1418cf640de218914901e51b064abb093"
+                "reference": "8ce87516be71aae9b956f81906aaf0338e0d8a2d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093",
-                "reference": "451c3cd1418cf640de218914901e51b064abb093",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/8ce87516be71aae9b956f81906aaf0338e0d8a2d",
+                "reference": "8ce87516be71aae9b956f81906aaf0338e0d8a2d",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0",
-                "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0",
-                "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0"
+                "doctrine/instantiator": "^1.2",
+                "php": "^7.2 || ~8.0, <8.1",
+                "phpdocumentor/reflection-docblock": "^5.2",
+                "sebastian/comparator": "^3.0 || ^4.0",
+                "sebastian/recursion-context": "^3.0 || ^4.0"
             },
             "require-dev": {
-                "phpspec/phpspec": "^2.5 || ^3.2",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
+                "phpspec/phpspec": "^6.0",
+                "phpunit/phpunit": "^8.0 || ^9.0 <9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.10.x-dev"
+                    "dev-master": "1.11.x-dev"
                 }
             },
             "autoload": {
@@ -1689,7 +1786,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2020-03-05T15:02:03+00:00"
+            "time": "2020-09-29T09:10:42+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -1941,6 +2038,7 @@
             "keywords": [
                 "tokenizer"
             ],
+            "abandoned": true,
             "time": "2019-09-17T06:23:10+00:00"
         },
         {
@@ -2024,6 +2122,16 @@
                 "testing",
                 "xunit"
             ],
+            "funding": [
+                {
+                    "url": "https://phpunit.de/donate.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-06-22T07:06:58+00:00"
         },
         {
@@ -2830,16 +2938,16 @@
         },
         {
             "name": "setasign/fpdi",
-            "version": "v2.3.3",
+            "version": "v2.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Setasign/FPDI.git",
-                "reference": "50c388860a73191e010810ed57dbed795578e867"
+                "reference": "2b5fb811c04f937ef257ef3f798cebeded33c136"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Setasign/FPDI/zipball/50c388860a73191e010810ed57dbed795578e867",
-                "reference": "50c388860a73191e010810ed57dbed795578e867",
+                "url": "https://api.github.com/repos/Setasign/FPDI/zipball/2b5fb811c04f937ef257ef3f798cebeded33c136",
+                "reference": "2b5fb811c04f937ef257ef3f798cebeded33c136",
                 "shasum": ""
             },
             "require": {
@@ -2853,6 +2961,7 @@
                 "phpunit/phpunit": "~5.7",
                 "setasign/fpdf": "~1.8",
                 "setasign/tfpdf": "1.31",
+                "squizlabs/php_codesniffer": "^3.5",
                 "tecnickcom/tcpdf": "~6.2"
             },
             "suggest": {
@@ -2887,20 +2996,26 @@
                 "fpdi",
                 "pdf"
             ],
-            "time": "2020-04-28T12:40:35+00:00"
+            "funding": [
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/setasign/fpdi",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-08-27T06:55:47+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.5.5",
+            "version": "3.5.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6"
+                "reference": "e97627871a7eab2f70e59166072a6b767d5834e0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/73e2e7f57d958e7228fce50dc0c61f58f017f9f6",
-                "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/e97627871a7eab2f70e59166072a6b767d5834e0",
+                "reference": "e97627871a7eab2f70e59166072a6b767d5834e0",
                 "shasum": ""
             },
             "require": {
@@ -2938,20 +3053,20 @@
                 "phpcs",
                 "standards"
             ],
-            "time": "2020-04-17T01:09:41+00:00"
+            "time": "2020-08-10T04:50:15+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v5.1.2",
+            "version": "v5.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "34ac555a3627e324b660e318daa07572e1140123"
+                "reference": "ae789a8a2ad189ce7e8216942cdb9b77319f5eb8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/34ac555a3627e324b660e318daa07572e1140123",
-                "reference": "34ac555a3627e324b660e318daa07572e1140123",
+                "url": "https://api.github.com/repos/symfony/console/zipball/ae789a8a2ad189ce7e8216942cdb9b77319f5eb8",
+                "reference": "ae789a8a2ad189ce7e8216942cdb9b77319f5eb8",
                 "shasum": ""
             },
             "require": {
@@ -3017,20 +3132,34 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2020-06-15T12:59:21+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-10-07T15:23:00+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v2.1.2",
+            "version": "v2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337"
+                "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337",
-                "reference": "dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5fa56b4074d1ae755beb55617ddafe6f5d78f665",
+                "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665",
                 "shasum": ""
             },
             "require": {
@@ -3039,7 +3168,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev"
+                    "dev-master": "2.2-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -3063,20 +3196,34 @@
             ],
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
-            "time": "2020-05-27T08:34:37+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-09-07T11:33:47+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v5.1.2",
+            "version": "v5.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "cc0d059e2e997e79ca34125a52f3e33de4424ac7"
+                "reference": "d5de97d6af175a9e8131c546db054ca32842dd0f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/cc0d059e2e997e79ca34125a52f3e33de4424ac7",
-                "reference": "cc0d059e2e997e79ca34125a52f3e33de4424ac7",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d5de97d6af175a9e8131c546db054ca32842dd0f",
+                "reference": "d5de97d6af175a9e8131c546db054ca32842dd0f",
                 "shasum": ""
             },
             "require": {
@@ -3096,6 +3243,7 @@
                 "psr/log": "~1.0",
                 "symfony/config": "^4.4|^5.0",
                 "symfony/dependency-injection": "^4.4|^5.0",
+                "symfony/error-handler": "^4.4|^5.0",
                 "symfony/expression-language": "^4.4|^5.0",
                 "symfony/http-foundation": "^4.4|^5.0",
                 "symfony/service-contracts": "^1.1|^2",
@@ -3135,20 +3283,34 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2020-05-20T17:43:50+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-09-18T14:27:32+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v2.1.2",
+            "version": "v2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "405952c4e90941a17e52ef7489a2bd94870bb290"
+                "reference": "0ba7d54483095a198fa51781bc608d17e84dffa2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/405952c4e90941a17e52ef7489a2bd94870bb290",
-                "reference": "405952c4e90941a17e52ef7489a2bd94870bb290",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/0ba7d54483095a198fa51781bc608d17e84dffa2",
+                "reference": "0ba7d54483095a198fa51781bc608d17e84dffa2",
                 "shasum": ""
             },
             "require": {
@@ -3161,7 +3323,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev"
+                    "dev-master": "2.2-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -3193,20 +3359,34 @@
                 "interoperability",
                 "standards"
             ],
-            "time": "2020-05-20T17:43:50+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-09-07T11:33:47+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v5.1.2",
+            "version": "v5.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "6e4320f06d5f2cce0d96530162491f4465179157"
+                "reference": "1a8697545a8d87b9f2f6b1d32414199cc5e20aae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/6e4320f06d5f2cce0d96530162491f4465179157",
-                "reference": "6e4320f06d5f2cce0d96530162491f4465179157",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/1a8697545a8d87b9f2f6b1d32414199cc5e20aae",
+                "reference": "1a8697545a8d87b9f2f6b1d32414199cc5e20aae",
                 "shasum": ""
             },
             "require": {
@@ -3243,20 +3423,34 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2020-05-30T20:35:19+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-09-27T14:02:37+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v5.1.2",
+            "version": "v5.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "4298870062bfc667cb78d2b379be4bf5dec5f187"
+                "reference": "2c3ba7ad6884e6c4451ce2340e2dc23f6fa3e0d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/4298870062bfc667cb78d2b379be4bf5dec5f187",
-                "reference": "4298870062bfc667cb78d2b379be4bf5dec5f187",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/2c3ba7ad6884e6c4451ce2340e2dc23f6fa3e0d8",
+                "reference": "2c3ba7ad6884e6c4451ce2340e2dc23f6fa3e0d8",
                 "shasum": ""
             },
             "require": {
@@ -3292,20 +3486,34 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2020-05-20T17:43:50+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-09-02T16:23:27+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v5.1.2",
+            "version": "v5.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "663f5dd5e14057d1954fe721f9709d35837f2447"
+                "reference": "4c7e155bf7d93ea4ba3824d5a14476694a5278dd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/663f5dd5e14057d1954fe721f9709d35837f2447",
-                "reference": "663f5dd5e14057d1954fe721f9709d35837f2447",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/4c7e155bf7d93ea4ba3824d5a14476694a5278dd",
+                "reference": "4c7e155bf7d93ea4ba3824d5a14476694a5278dd",
                 "shasum": ""
             },
             "require": {
@@ -3348,20 +3556,34 @@
                 "configuration",
                 "options"
             ],
-            "time": "2020-05-23T13:08:13+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-09-27T03:44:28+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.17.1",
+            "version": "v1.18.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d"
+                "reference": "1c302646f6efc070cd46856e600e5e0684d6b454"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d",
-                "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/1c302646f6efc070cd46856e600e5e0684d6b454",
+                "reference": "1c302646f6efc070cd46856e600e5e0684d6b454",
                 "shasum": ""
             },
             "require": {
@@ -3373,7 +3595,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.17-dev"
+                    "dev-master": "1.18-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -3410,20 +3632,34 @@
                 "polyfill",
                 "portable"
             ],
-            "time": "2020-06-06T08:46:27+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-07-14T12:35:20+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.17.1",
+            "version": "v1.18.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "6e4dbcf5e81eba86e36731f94fe56b1726835846"
+                "reference": "b740103edbdcc39602239ee8860f0f45a8eb9aa5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/6e4dbcf5e81eba86e36731f94fe56b1726835846",
-                "reference": "6e4dbcf5e81eba86e36731f94fe56b1726835846",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b740103edbdcc39602239ee8860f0f45a8eb9aa5",
+                "reference": "b740103edbdcc39602239ee8860f0f45a8eb9aa5",
                 "shasum": ""
             },
             "require": {
@@ -3435,7 +3671,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.17-dev"
+                    "dev-master": "1.18-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -3474,20 +3710,34 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-06-06T08:46:27+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-07-14T12:35:20+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.17.1",
+            "version": "v1.18.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "40309d1700e8f72447bb9e7b54af756eeea35620"
+                "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/40309d1700e8f72447bb9e7b54af756eeea35620",
-                "reference": "40309d1700e8f72447bb9e7b54af756eeea35620",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e",
+                "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e",
                 "shasum": ""
             },
             "require": {
@@ -3499,7 +3749,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.17-dev"
+                    "dev-master": "1.18-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -3541,20 +3791,34 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-06-14T14:40:37+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-07-14T12:35:20+00:00"
         },
         {
             "name": "symfony/polyfill-php70",
-            "version": "v1.17.1",
+            "version": "v1.18.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php70.git",
-                "reference": "471b096aede7025bace8eb356b9ac801aaba7e2d"
+                "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/471b096aede7025bace8eb356b9ac801aaba7e2d",
-                "reference": "471b096aede7025bace8eb356b9ac801aaba7e2d",
+                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/0dd93f2c578bdc9c72697eaa5f1dd25644e618d3",
+                "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3",
                 "shasum": ""
             },
             "require": {
@@ -3564,7 +3828,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.17-dev"
+                    "dev-master": "1.18-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -3604,20 +3868,34 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-06-06T08:46:27+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-07-14T12:35:20+00:00"
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.17.0",
+            "version": "v1.18.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "f048e612a3905f34931127360bdd2def19a5e582"
+                "reference": "639447d008615574653fb3bc60d1986d7172eaae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/f048e612a3905f34931127360bdd2def19a5e582",
-                "reference": "f048e612a3905f34931127360bdd2def19a5e582",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/639447d008615574653fb3bc60d1986d7172eaae",
+                "reference": "639447d008615574653fb3bc60d1986d7172eaae",
                 "shasum": ""
             },
             "require": {
@@ -3626,7 +3904,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.17-dev"
+                    "dev-master": "1.18-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -3659,20 +3941,34 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-05-12T16:47:27+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-07-14T12:35:20+00:00"
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.17.1",
+            "version": "v1.18.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "fa0837fe02d617d31fbb25f990655861bb27bd1a"
+                "reference": "fffa1a52a023e782cdcc221d781fe1ec8f87fcca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fa0837fe02d617d31fbb25f990655861bb27bd1a",
-                "reference": "fa0837fe02d617d31fbb25f990655861bb27bd1a",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fffa1a52a023e782cdcc221d781fe1ec8f87fcca",
+                "reference": "fffa1a52a023e782cdcc221d781fe1ec8f87fcca",
                 "shasum": ""
             },
             "require": {
@@ -3681,7 +3977,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.17-dev"
+                    "dev-master": "1.18-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -3721,20 +4017,34 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-06-06T08:46:27+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-07-14T12:35:20+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.17.1",
+            "version": "v1.18.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "4a5b6bba3259902e386eb80dd1956181ee90b5b2"
+                "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4a5b6bba3259902e386eb80dd1956181ee90b5b2",
-                "reference": "4a5b6bba3259902e386eb80dd1956181ee90b5b2",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/d87d5766cbf48d72388a9f6b85f280c8ad51f981",
+                "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981",
                 "shasum": ""
             },
             "require": {
@@ -3743,7 +4053,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.17-dev"
+                    "dev-master": "1.18-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -3787,20 +4097,34 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-06-06T08:46:27+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-07-14T12:35:20+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v5.1.2",
+            "version": "v5.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "7f6378c1fa2147eeb1b4c385856ce9de0d46ebd1"
+                "reference": "d3a2e64866169586502f0cd9cab69135ad12cee9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/7f6378c1fa2147eeb1b4c385856ce9de0d46ebd1",
-                "reference": "7f6378c1fa2147eeb1b4c385856ce9de0d46ebd1",
+                "url": "https://api.github.com/repos/symfony/process/zipball/d3a2e64866169586502f0cd9cab69135ad12cee9",
+                "reference": "d3a2e64866169586502f0cd9cab69135ad12cee9",
                 "shasum": ""
             },
             "require": {
@@ -3837,20 +4161,34 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2020-05-30T20:35:19+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-09-02T16:23:27+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v2.1.2",
+            "version": "v2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b"
+                "reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/66a8f0957a3ca54e4f724e49028ab19d75a8918b",
-                "reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/d15da7ba4957ffb8f1747218be9e1a121fd298a1",
+                "reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1",
                 "shasum": ""
             },
             "require": {
@@ -3863,7 +4201,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev"
+                    "dev-master": "2.2-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -3895,11 +4237,25 @@
                 "interoperability",
                 "standards"
             ],
-            "time": "2020-05-20T17:43:50+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-09-07T11:33:47+00:00"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v5.1.2",
+            "version": "v5.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
@@ -3945,20 +4301,34 @@
             ],
             "description": "Symfony Stopwatch Component",
             "homepage": "https://symfony.com",
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-05-20T17:43:50+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v5.1.2",
+            "version": "v5.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "ac70459db781108db7c6d8981dd31ce0e29e3298"
+                "reference": "4a9afe9d07bac506f75bcee8ed3ce76da5a9343e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/ac70459db781108db7c6d8981dd31ce0e29e3298",
-                "reference": "ac70459db781108db7c6d8981dd31ce0e29e3298",
+                "url": "https://api.github.com/repos/symfony/string/zipball/4a9afe9d07bac506f75bcee8ed3ce76da5a9343e",
+                "reference": "4a9afe9d07bac506f75bcee8ed3ce76da5a9343e",
                 "shasum": ""
             },
             "require": {
@@ -4016,7 +4386,21 @@
                 "utf-8",
                 "utf8"
             ],
-            "time": "2020-06-11T12:16:36+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-09-15T12:23:47+00:00"
         },
         {
             "name": "tecnickcom/tcpdf",
@@ -4082,23 +4466,23 @@
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.1.3",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9"
+                "reference": "75a63c33a8577608444246075ea0af0d052e452a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
-                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/75a63c33a8577608444246075ea0af0d052e452a",
+                "reference": "75a63c33a8577608444246075ea0af0d052e452a",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-tokenizer": "*",
                 "ext-xmlwriter": "*",
-                "php": "^7.0"
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "autoload": {
@@ -4118,24 +4502,30 @@
                 }
             ],
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
-            "time": "2019-06-13T22:48:21+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/theseer",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-07-12T23:59:07+00:00"
         },
         {
             "name": "webmozart/assert",
-            "version": "1.9.0",
+            "version": "1.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozart/assert.git",
-                "reference": "9dc4f203e36f2b486149058bade43c851dd97451"
+                "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/9dc4f203e36f2b486149058bade43c851dd97451",
-                "reference": "9dc4f203e36f2b486149058bade43c851dd97451",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
+                "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.3 || ^7.0",
+                "php": "^5.3.3 || ^7.0 || ^8.0",
                 "symfony/polyfill-ctype": "^1.8"
             },
             "conflict": {
@@ -4167,7 +4557,7 @@
                 "check",
                 "validate"
             ],
-            "time": "2020-06-16T10:16:42+00:00"
+            "time": "2020-07-08T17:02:28+00:00"
         }
     ],
     "aliases": [],
@@ -4176,7 +4566,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "^7.2",
+        "php": "^7.2|^8.0",
         "ext-ctype": "*",
         "ext-dom": "*",
         "ext-gd": "*",

From ae0cd464235bf8040b3df8cd4d05d4a8835bbf6f Mon Sep 17 00:00:00 2001
From: oleibman <eclipsechasers2@yahoo.com>
Date: Mon, 26 Oct 2020 12:56:24 -0700
Subject: [PATCH 152/153] Add exportArray Method for Styles (#1580)

Issue #580 has gone stale since I started work on this.
Nevertheless, this implements an exportArray function as an
exact counterpart of applyFromArry.
I chose the name exportArray to avoid confusion with the existing
method getStyleArray, which does something completely different.

This change also increases coverage for all the Style classes to 100%,
with the exception of Style.php itself. There were several (unchanged)
places in Style.php where I did not have sufficient understanding of
what was supposed to be happening, so could not create tests.

All properties used by applyFromArray are exported by this method.
Note that conditional styles are not covered; this is consistent
with the fact that they are not covered by applyFromArray.

The method is implemented as a final public function in Style/Supervisor,
which calls abstract protected function exportArray1, which is implemented
in each of the subclasses, and which calls final protected
function exportArray2 in Style/Supervisor.
So exportArray is usable for any of the subclasses as well.

The new method is added to the documentation.
The existing documentation for applyFromArray was alphabetized to make
it easier to follow.
One property (Style quotePrefix) was added to the documentation.
Some Borders pseudo-properties (vertical, horizontal, and outline) were
documented as usable by applyFromArray,
but aren't actually supported - they were removed.
The documentation of the properties seemed to use setProperty and
getProperty fairly randomly - it now uses setProperty exclusively.

New constants were added for the textRotation "angles" used to create a
"stacked" cell. I felt that changing the readers and writers to use
these constants was beyond the scope of this change, but it is
on my to-do list.
---
 docs/topics/recipes.md                        | 124 +++++-----
 src/PhpSpreadsheet/Style/Alignment.php        |  24 +-
 src/PhpSpreadsheet/Style/Border.php           |  19 +-
 src/PhpSpreadsheet/Style/Borders.php          |  13 +
 src/PhpSpreadsheet/Style/Color.php            |  39 ++-
 src/PhpSpreadsheet/Style/Fill.php             |  11 +
 src/PhpSpreadsheet/Style/Font.php             |  16 ++
 src/PhpSpreadsheet/Style/NumberFormat.php     |   8 +
 src/PhpSpreadsheet/Style/Protection.php       |   9 +
 src/PhpSpreadsheet/Style/Style.php            |  14 ++
 src/PhpSpreadsheet/Style/Supervisor.php       |  41 ++++
 .../Style/AlignmentTest.php                   |  94 ++++++++
 .../PhpSpreadsheetTests/Style/BorderTest.php  | 223 +++++++++++++++++-
 tests/PhpSpreadsheetTests/Style/ColorTest.php |  17 ++
 .../Style/ConditionalTest.php                 |  52 ++++
 .../Style/ExportArrayTest.php                 | 161 +++++++++++++
 tests/PhpSpreadsheetTests/Style/FillTest.php  |  22 ++
 .../Style/NumberFormatBuiltinTest.php         |  35 +++
 tests/PhpSpreadsheetTests/Style/StyleTest.php |  22 ++
 19 files changed, 853 insertions(+), 91 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Style/AlignmentTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Style/ConditionalTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Style/ExportArrayTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Style/FillTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Style/NumberFormatBuiltinTest.php
 create mode 100644 tests/PhpSpreadsheetTests/Style/StyleTest.php

diff --git a/docs/topics/recipes.md b/docs/topics/recipes.md
index 86448301..db09642d 100644
--- a/docs/topics/recipes.md
+++ b/docs/topics/recipes.md
@@ -587,6 +587,13 @@ execution whenever you are setting more than one style property. But the
 difference may barely be measurable unless you have many different
 styles in your workbook.
 
+You can perform the opposite function, exporting a Style as an array,
+as follows:
+
+``` php
+$styleArray = $spreadsheet->getActiveSheet()->getStyle('A3')->exportArray();
+```
+
 ### Number formats
 
 You often want to format numbers in Excel. For example you may want a
@@ -753,69 +760,74 @@ another style array.
 
 Array key    | Maps to property
 -------------|-------------------
-fill         | getFill()
-font         | getFont()
-borders      | getBorders()
-alignment    | getAlignment()
-numberFormat | getNumberFormat()
-protection   | getProtection()
-
-**\PhpOffice\PhpSpreadsheet\Style\Fill**
-
-Array key  | Maps to property
------------|-------------------
-fillType   | setFillType()
-rotation   | setRotation()
-startColor | getStartColor()
-endColor   | getEndColor()
-color      | getStartColor()
-
-**\PhpOffice\PhpSpreadsheet\Style\Font**
-
-Array key   | Maps to property
-------------|-------------------
-name        | setName()
-bold        | setBold()
-italic      | setItalic()
-underline   | setUnderline()
-strikethrough | setStrikethrough()
-color       | getColor()
-size        | setSize()
-superscript | setSuperscript()
-subscript   | setSubscript()
-
-**\PhpOffice\PhpSpreadsheet\Style\Borders**
-
-Array key         | Maps to property
-------------------|-------------------
-allBorders        | getLeft(); getRight(); getTop(); getBottom()
-left              | getLeft()
-right             | getRight()
-top               | getTop()
-bottom            | getBottom()
-diagonal          | getDiagonal()
-vertical          | getVertical()
-horizontal        | getHorizontal()
-diagonalDirection | setDiagonalDirection()
-outline           | setOutline()
-
-**\PhpOffice\PhpSpreadsheet\Style\Border**
-
-Array key   | Maps to property
-------------|-------------------
-borderStyle | setBorderStyle()
-color       | getColor()
+alignment    | setAlignment()
+borders      | setBorders()
+fill         | setFill()
+font         | setFont()
+numberFormat | setNumberFormat()
+protection   | setProtection()
+quotePrefix  | setQuotePrefix()
 
 **\PhpOffice\PhpSpreadsheet\Style\Alignment**
 
 Array key   | Maps to property
 ------------|-------------------
 horizontal  | setHorizontal()
-vertical    | setVertical()
-textRotation| setTextRotation()
-wrapText    | setWrapText()
-shrinkToFit | setShrinkToFit()
 indent      | setIndent()
+readOrder   | setReadOrder()
+shrinkToFit | setShrinkToFit()
+textRotation| setTextRotation()
+vertical    | setVertical()
+wrapText    | setWrapText()
+
+**\PhpOffice\PhpSpreadsheet\Style\Border**
+
+Array key   | Maps to property
+------------|-------------------
+borderStyle | setBorderStyle()
+color       | setColor()
+
+**\PhpOffice\PhpSpreadsheet\Style\Borders**
+
+Array key         | Maps to property
+------------------|-------------------
+allBorders        | setLeft(); setRight(); setTop(); setBottom()
+bottom            | setBottom()
+diagonal          | setDiagonal()
+diagonalDirection | setDiagonalDirection()
+left              | setLeft()
+right             | setRight()
+top               | setTop()
+
+**\PhpOffice\PhpSpreadsheet\Style\Color**
+
+Array key   | Maps to property
+------------|-------------------
+argb        | setARGB()
+
+**\PhpOffice\PhpSpreadsheet\Style\Fill**
+
+Array key  | Maps to property
+-----------|-------------------
+color      | getStartColor()
+endColor   | getEndColor()
+fillType   | setFillType()
+rotation   | setRotation()
+startColor | getStartColor()
+
+**\PhpOffice\PhpSpreadsheet\Style\Font**
+
+Array key   | Maps to property
+------------|-------------------
+bold        | setBold()
+color       | getColor()
+italic      | setItalic()
+name        | setName()
+size        | setSize()
+strikethrough | setStrikethrough()
+subscript   | setSubscript()
+superscript | setSuperscript()
+underline   | setUnderline()
 
 **\PhpOffice\PhpSpreadsheet\Style\NumberFormat**
 
diff --git a/src/PhpSpreadsheet/Style/Alignment.php b/src/PhpSpreadsheet/Style/Alignment.php
index 4d97dd2c..04a089fe 100644
--- a/src/PhpSpreadsheet/Style/Alignment.php
+++ b/src/PhpSpreadsheet/Style/Alignment.php
@@ -28,6 +28,10 @@ class Alignment extends Supervisor
     const READORDER_LTR = 1;
     const READORDER_RTL = 2;
 
+    // Special value for Text Rotation
+    const TEXTROTATION_STACK_EXCEL = 255;
+    const TEXTROTATION_STACK_PHPSPREADSHEET = -165; // 90 - 255
+
     /**
      * Horizontal alignment.
      *
@@ -270,12 +274,12 @@ class Alignment extends Supervisor
     public function setTextRotation($pValue)
     {
         // Excel2007 value 255 => PhpSpreadsheet value -165
-        if ($pValue == 255) {
-            $pValue = -165;
+        if ($pValue == self::TEXTROTATION_STACK_EXCEL) {
+            $pValue = self::TEXTROTATION_STACK_PHPSPREADSHEET;
         }
 
         // Set rotation
-        if (($pValue >= -90 && $pValue <= 90) || $pValue == -165) {
+        if (($pValue >= -90 && $pValue <= 90) || $pValue == self::TEXTROTATION_STACK_PHPSPREADSHEET) {
             if ($this->isSupervisor) {
                 $styleArray = $this->getStyleArray(['textRotation' => $pValue]);
                 $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
@@ -461,4 +465,18 @@ class Alignment extends Supervisor
             __CLASS__
         );
     }
+
+    protected function exportArray1(): array
+    {
+        $exportedArray = [];
+        $this->exportArray2($exportedArray, 'horizontal', $this->getHorizontal());
+        $this->exportArray2($exportedArray, 'indent', $this->getIndent());
+        $this->exportArray2($exportedArray, 'readOrder', $this->getReadOrder());
+        $this->exportArray2($exportedArray, 'shrinkToFit', $this->getShrinkToFit());
+        $this->exportArray2($exportedArray, 'textRotation', $this->getTextRotation());
+        $this->exportArray2($exportedArray, 'vertical', $this->getVertical());
+        $this->exportArray2($exportedArray, 'wrapText', $this->getWrapText());
+
+        return $exportedArray;
+    }
 }
diff --git a/src/PhpSpreadsheet/Style/Border.php b/src/PhpSpreadsheet/Style/Border.php
index 78ad8b26..1d3096f0 100644
--- a/src/PhpSpreadsheet/Style/Border.php
+++ b/src/PhpSpreadsheet/Style/Border.php
@@ -74,14 +74,6 @@ class Border extends Supervisor
     public function getSharedComponent()
     {
         switch ($this->parentPropertyName) {
-            case 'allBorders':
-            case 'horizontal':
-            case 'inside':
-            case 'outline':
-            case 'vertical':
-                throw new PhpSpreadsheetException('Cannot get shared component for a pseudo-border.');
-
-                break;
             case 'bottom':
                 return $this->parent->getSharedComponent()->getBottom();
             case 'diagonal':
@@ -93,6 +85,8 @@ class Border extends Supervisor
             case 'top':
                 return $this->parent->getSharedComponent()->getTop();
         }
+
+        throw new PhpSpreadsheetException('Cannot get shared component for a pseudo-border.');
     }
 
     /**
@@ -228,4 +222,13 @@ class Border extends Supervisor
             __CLASS__
         );
     }
+
+    protected function exportArray1(): array
+    {
+        $exportedArray = [];
+        $this->exportArray2($exportedArray, 'borderStyle', $this->getBorderStyle());
+        $this->exportArray2($exportedArray, 'color', $this->getColor());
+
+        return $exportedArray;
+    }
 }
diff --git a/src/PhpSpreadsheet/Style/Borders.php b/src/PhpSpreadsheet/Style/Borders.php
index e75d7eeb..a1acfdd4 100644
--- a/src/PhpSpreadsheet/Style/Borders.php
+++ b/src/PhpSpreadsheet/Style/Borders.php
@@ -408,4 +408,17 @@ class Borders extends Supervisor
             __CLASS__
         );
     }
+
+    protected function exportArray1(): array
+    {
+        $exportedArray = [];
+        $this->exportArray2($exportedArray, 'bottom', $this->getBottom());
+        $this->exportArray2($exportedArray, 'diagonal', $this->getDiagonal());
+        $this->exportArray2($exportedArray, 'diagonalDirection', $this->getDiagonalDirection());
+        $this->exportArray2($exportedArray, 'left', $this->getLeft());
+        $this->exportArray2($exportedArray, 'right', $this->getRight());
+        $this->exportArray2($exportedArray, 'top', $this->getTop());
+
+        return $exportedArray;
+    }
 }
diff --git a/src/PhpSpreadsheet/Style/Color.php b/src/PhpSpreadsheet/Style/Color.php
index d8ba08b2..ad598f11 100644
--- a/src/PhpSpreadsheet/Style/Color.php
+++ b/src/PhpSpreadsheet/Style/Color.php
@@ -71,14 +71,14 @@ class Color extends Supervisor
      */
     public function getSharedComponent()
     {
-        switch ($this->parentPropertyName) {
-            case 'endColor':
-                return $this->parent->getSharedComponent()->getEndColor();
-            case 'color':
-                return $this->parent->getSharedComponent()->getColor();
-            case 'startColor':
-                return $this->parent->getSharedComponent()->getStartColor();
+        if ($this->parentPropertyName === 'endColor') {
+            return $this->parent->getSharedComponent()->getEndColor();
         }
+        if ($this->parentPropertyName === 'startColor') {
+            return $this->parent->getSharedComponent()->getStartColor();
+        }
+
+        return $this->parent->getSharedComponent()->getColor();
     }
 
     /**
@@ -262,6 +262,7 @@ class Color extends Supervisor
     public static function changeBrightness($hex, $adjustPercentage)
     {
         $rgba = (strlen($hex) === 8);
+        $adjustPercentage = max(-1.0, min(1.0, $adjustPercentage));
 
         $red = self::getRed($hex, false);
         $green = self::getGreen($hex, false);
@@ -276,22 +277,6 @@ class Color extends Supervisor
             $blue += $blue * $adjustPercentage;
         }
 
-        if ($red < 0) {
-            $red = 0;
-        } elseif ($red > 255) {
-            $red = 255;
-        }
-        if ($green < 0) {
-            $green = 0;
-        } elseif ($green > 255) {
-            $green = 255;
-        }
-        if ($blue < 0) {
-            $blue = 0;
-        } elseif ($blue > 255) {
-            $blue = 255;
-        }
-
         $rgb = strtoupper(
             str_pad(dechex((int) $red), 2, '0', 0) .
             str_pad(dechex((int) $green), 2, '0', 0) .
@@ -404,4 +389,12 @@ class Color extends Supervisor
             __CLASS__
         );
     }
+
+    protected function exportArray1(): array
+    {
+        $exportedArray = [];
+        $this->exportArray2($exportedArray, 'argb', $this->getARGB());
+
+        return $exportedArray;
+    }
 }
diff --git a/src/PhpSpreadsheet/Style/Fill.php b/src/PhpSpreadsheet/Style/Fill.php
index c6baeed0..3891bc47 100644
--- a/src/PhpSpreadsheet/Style/Fill.php
+++ b/src/PhpSpreadsheet/Style/Fill.php
@@ -311,4 +311,15 @@ class Fill extends Supervisor
             __CLASS__
         );
     }
+
+    protected function exportArray1(): array
+    {
+        $exportedArray = [];
+        $this->exportArray2($exportedArray, 'endColor', $this->getEndColor());
+        $this->exportArray2($exportedArray, 'fillType', $this->getFillType());
+        $this->exportArray2($exportedArray, 'rotation', $this->getRotation());
+        $this->exportArray2($exportedArray, 'startColor', $this->getStartColor());
+
+        return $exportedArray;
+    }
 }
diff --git a/src/PhpSpreadsheet/Style/Font.php b/src/PhpSpreadsheet/Style/Font.php
index a062a38f..ad405708 100644
--- a/src/PhpSpreadsheet/Style/Font.php
+++ b/src/PhpSpreadsheet/Style/Font.php
@@ -539,4 +539,20 @@ class Font extends Supervisor
             __CLASS__
         );
     }
+
+    protected function exportArray1(): array
+    {
+        $exportedArray = [];
+        $this->exportArray2($exportedArray, 'bold', $this->getBold());
+        $this->exportArray2($exportedArray, 'color', $this->getColor());
+        $this->exportArray2($exportedArray, 'italic', $this->getItalic());
+        $this->exportArray2($exportedArray, 'name', $this->getName());
+        $this->exportArray2($exportedArray, 'size', $this->getSize());
+        $this->exportArray2($exportedArray, 'strikethrough', $this->getStrikethrough());
+        $this->exportArray2($exportedArray, 'subscript', $this->getSubscript());
+        $this->exportArray2($exportedArray, 'superscript', $this->getSuperscript());
+        $this->exportArray2($exportedArray, 'underline', $this->getUnderline());
+
+        return $exportedArray;
+    }
 }
diff --git a/src/PhpSpreadsheet/Style/NumberFormat.php b/src/PhpSpreadsheet/Style/NumberFormat.php
index 259acabf..0b761bd3 100644
--- a/src/PhpSpreadsheet/Style/NumberFormat.php
+++ b/src/PhpSpreadsheet/Style/NumberFormat.php
@@ -870,4 +870,12 @@ class NumberFormat extends Supervisor
 
         return $value;
     }
+
+    protected function exportArray1(): array
+    {
+        $exportedArray = [];
+        $this->exportArray2($exportedArray, 'formatCode', $this->getFormatCode());
+
+        return $exportedArray;
+    }
 }
diff --git a/src/PhpSpreadsheet/Style/Protection.php b/src/PhpSpreadsheet/Style/Protection.php
index f695837d..9ae7d4bb 100644
--- a/src/PhpSpreadsheet/Style/Protection.php
+++ b/src/PhpSpreadsheet/Style/Protection.php
@@ -183,4 +183,13 @@ class Protection extends Supervisor
             __CLASS__
         );
     }
+
+    protected function exportArray1(): array
+    {
+        $exportedArray = [];
+        $this->exportArray2($exportedArray, 'locked', $this->getLocked());
+        $this->exportArray2($exportedArray, 'hidden', $this->getHidden());
+
+        return $exportedArray;
+    }
 }
diff --git a/src/PhpSpreadsheet/Style/Style.php b/src/PhpSpreadsheet/Style/Style.php
index 533a7c38..c1aa319e 100644
--- a/src/PhpSpreadsheet/Style/Style.php
+++ b/src/PhpSpreadsheet/Style/Style.php
@@ -636,4 +636,18 @@ class Style extends Supervisor
     {
         $this->index = $pValue;
     }
+
+    protected function exportArray1(): array
+    {
+        $exportedArray = [];
+        $this->exportArray2($exportedArray, 'alignment', $this->getAlignment());
+        $this->exportArray2($exportedArray, 'borders', $this->getBorders());
+        $this->exportArray2($exportedArray, 'fill', $this->getFill());
+        $this->exportArray2($exportedArray, 'font', $this->getFont());
+        $this->exportArray2($exportedArray, 'numberFormat', $this->getNumberFormat());
+        $this->exportArray2($exportedArray, 'protection', $this->getProtection());
+        $this->exportArray2($exportedArray, 'quotePrefx', $this->getQuotePrefix());
+
+        return $exportedArray;
+    }
 }
diff --git a/src/PhpSpreadsheet/Style/Supervisor.php b/src/PhpSpreadsheet/Style/Supervisor.php
index 1a700974..7f655bef 100644
--- a/src/PhpSpreadsheet/Style/Supervisor.php
+++ b/src/PhpSpreadsheet/Style/Supervisor.php
@@ -114,4 +114,45 @@ abstract class Supervisor implements IComparable
             }
         }
     }
+
+    /**
+     * Export style as array.
+     *
+     * Available to anything which extends this class:
+     * Alignment, Border, Borders, Color, Fill, Font,
+     * NumberFormat, Protection, and Style.
+     */
+    final public function exportArray(): array
+    {
+        return $this->exportArray1();
+    }
+
+    /**
+     * Abstract method to be implemented in anything which
+     * extends this class.
+     *
+     * This method invokes exportArray2 with the names and values
+     * of all properties to be included in output array,
+     * returning that array to exportArray, then to caller.
+     */
+    abstract protected function exportArray1(): array;
+
+    /**
+     * Populate array from exportArray1.
+     * This method is available to anything which extends this class.
+     * The parameter index is the key to be added to the array.
+     * The parameter objOrValue is either a primitive type,
+     * which is the value added to the array,
+     * or a Style object to be recursively added via exportArray.
+     *
+     * @param mixed $objOrValue
+     */
+    final protected function exportArray2(array &$exportedArray, string $index, $objOrValue): void
+    {
+        if ($objOrValue instanceof self) {
+            $exportedArray[$index] = $objOrValue->exportArray();
+        } else {
+            $exportedArray[$index] = $objOrValue;
+        }
+    }
 }
diff --git a/tests/PhpSpreadsheetTests/Style/AlignmentTest.php b/tests/PhpSpreadsheetTests/Style/AlignmentTest.php
new file mode 100644
index 00000000..d10e3211
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Style/AlignmentTest.php
@@ -0,0 +1,94 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Style;
+
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PHPUnit\Framework\TestCase;
+
+class AlignmentTest extends TestCase
+{
+    public function testAlignment(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $cell1 = $sheet->getCell('A1');
+        $cell1->setValue('Cell1');
+        $cell1->getStyle()->getAlignment()->setTextRotation(45);
+        self::assertEquals(45, $cell1->getStyle()->getAlignment()->getTextRotation());
+        $cell2 = $sheet->getCell('A2');
+        $cell2->setValue('Cell2');
+        $cell2->getStyle()->getAlignment()->setTextRotation(-45);
+        self::assertEquals(-45, $cell2->getStyle()->getAlignment()->getTextRotation());
+        // special value for stacked
+        $cell3 = $sheet->getCell('A3');
+        $cell3->setValue('Cell3');
+        $cell3->getStyle()->getAlignment()->setTextRotation(255);
+        self::assertEquals(-165, $cell3->getStyle()->getAlignment()->getTextRotation());
+    }
+
+    public function testRotationTooHigh(): void
+    {
+        $this->expectException(PhpSpreadsheetException::class);
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $cell1 = $sheet->getCell('A1');
+        $cell1->setValue('Cell1');
+        $cell1->getStyle()->getAlignment()->setTextRotation(91);
+        self::assertEquals(0, $cell1->getStyle()->getAlignment()->getTextRotation());
+    }
+
+    public function testRotationTooLow(): void
+    {
+        $this->expectException(PhpSpreadsheetException::class);
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $cell1 = $sheet->getCell('A1');
+        $cell1->setValue('Cell1');
+        $cell1->getStyle()->getAlignment()->setTextRotation(-91);
+        self::assertEquals(0, $cell1->getStyle()->getAlignment()->getTextRotation());
+    }
+
+    public function testHorizontal(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $cell1 = $sheet->getCell('A1');
+        $cell1->setValue('X');
+        $cell1->getStyle()->getAlignment()->setHorizontal(Alignment::HORIZONTAL_LEFT)->setIndent(1);
+        self::assertEquals(Alignment::HORIZONTAL_LEFT, $cell1->getStyle()->getAlignment()->getHorizontal());
+        self::assertEquals(1, $cell1->getStyle()->getAlignment()->getIndent());
+        $cell2 = $sheet->getCell('A2');
+        $cell2->setValue('Y');
+        $cell2->getStyle()->getAlignment()->setHorizontal(Alignment::HORIZONTAL_RIGHT)->setIndent(2);
+        self::assertEquals(Alignment::HORIZONTAL_RIGHT, $cell2->getStyle()->getAlignment()->getHorizontal());
+        self::assertEquals(2, $cell2->getStyle()->getAlignment()->getIndent());
+        $cell3 = $sheet->getCell('A3');
+        $cell3->setValue('Z');
+        // indent not supported for next style - changed to 0
+        $cell3->getStyle()->getAlignment()->setHorizontal(Alignment::HORIZONTAL_CENTER_CONTINUOUS)->setIndent(3);
+        self::assertEquals(Alignment::HORIZONTAL_CENTER_CONTINUOUS, $cell3->getStyle()->getAlignment()->getHorizontal());
+        self::assertEquals(0, $cell3->getStyle()->getAlignment()->getIndent());
+    }
+
+    public function testReadOrder(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $cell1 = $sheet->getCell('A1');
+        $cell1->setValue('ABC');
+        $cell1->getStyle()->getAlignment()->setReadOrder(0);
+        self::assertEquals(0, $cell1->getStyle()->getAlignment()->getReadOrder());
+        $cell1->getStyle()->getAlignment()->setReadOrder(1);
+        self::assertEquals(1, $cell1->getStyle()->getAlignment()->getReadOrder());
+        // following not supported - zero is used instead
+        $cell1->getStyle()->getAlignment()->setReadOrder(-1);
+        self::assertEquals(0, $cell1->getStyle()->getAlignment()->getReadOrder());
+        $cell1->getStyle()->getAlignment()->setReadOrder(2);
+        self::assertEquals(2, $cell1->getStyle()->getAlignment()->getReadOrder());
+        // following not supported - zero is used instead
+        $cell1->getStyle()->getAlignment()->setReadOrder(3);
+        self::assertEquals(0, $cell1->getStyle()->getAlignment()->getReadOrder());
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Style/BorderTest.php b/tests/PhpSpreadsheetTests/Style/BorderTest.php
index f1f1bf56..cf6cd3a9 100644
--- a/tests/PhpSpreadsheetTests/Style/BorderTest.php
+++ b/tests/PhpSpreadsheetTests/Style/BorderTest.php
@@ -2,13 +2,16 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Style;
 
+use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Style\Border;
+use PhpOffice\PhpSpreadsheet\Style\Borders;
+use PhpOffice\PhpSpreadsheet\Style\Color;
 use PHPUnit\Framework\TestCase;
 
 class BorderTest extends TestCase
 {
-    public function testCase(): void
+    public function testAllBorders(): void
     {
         $spreadsheet = new Spreadsheet();
         $borders = $spreadsheet->getActiveSheet()->getStyle('A1')->getBorders();
@@ -22,5 +25,223 @@ class BorderTest extends TestCase
 
         $actual = $bottom->getBorderStyle();
         self::assertSame(Border::BORDER_THIN, $actual, 'should have been set via allBorders');
+        self::assertSame(Border::BORDER_THIN, $borders->getTop()->getBorderStyle());
+        self::assertSame(Border::BORDER_THIN, $borders->getRight()->getBorderStyle());
+        self::assertSame(Border::BORDER_THIN, $borders->getLeft()->getBorderStyle());
+        self::assertSame(Border::BORDER_NONE, $borders->getDiagonal()->getBorderStyle());
+    }
+
+    public function testAllBordersArray(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->getStyle('A1')->getBorders()->applyFromArray(['allBorders' => ['borderStyle' => Border::BORDER_THIN]]);
+        $borders = $sheet->getCell('A1')->getStyle()->getBorders();
+
+        self::assertSame(Border::BORDER_THIN, $borders->getBottom()->getBorderStyle());
+        self::assertSame(Border::BORDER_THIN, $borders->getTop()->getBorderStyle());
+        self::assertSame(Border::BORDER_THIN, $borders->getRight()->getBorderStyle());
+        self::assertSame(Border::BORDER_THIN, $borders->getLeft()->getBorderStyle());
+        self::assertSame(Border::BORDER_NONE, $borders->getDiagonal()->getBorderStyle());
+    }
+
+    public function testAllBordersArrayNotSupervisor(): void
+    {
+        $borders = new Borders();
+        $borders->applyFromArray(['allBorders' => ['borderStyle' => Border::BORDER_THIN]]);
+
+        self::assertSame(Border::BORDER_THIN, $borders->getBottom()->getBorderStyle());
+        self::assertSame(Border::BORDER_THIN, $borders->getTop()->getBorderStyle());
+        self::assertSame(Border::BORDER_THIN, $borders->getRight()->getBorderStyle());
+        self::assertSame(Border::BORDER_THIN, $borders->getLeft()->getBorderStyle());
+        self::assertSame(Border::BORDER_NONE, $borders->getDiagonal()->getBorderStyle());
+    }
+
+    public function testOutline(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $borders = $sheet->getStyle('A1:B2')->getBorders();
+        $outline = $borders->getOutline();
+        $outline->setBorderStyle(Border::BORDER_THIN);
+
+        self::assertSame(Border::BORDER_THIN, $sheet->getCell('A1')->getStyle()->getBorders()->getLeft()->getBorderStyle());
+        self::assertSame(Border::BORDER_THIN, $sheet->getCell('A1')->getStyle()->getBorders()->getTop()->getBorderStyle());
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('A1')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('A1')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+
+        self::assertSame(Border::BORDER_THIN, $sheet->getCell('A2')->getStyle()->getBorders()->getLeft()->getBorderStyle());
+        self::assertSame(Border::BORDER_THIN, $sheet->getCell('A2')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('A2')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('A2')->getStyle()->getBorders()->getTop()->getBorderStyle());
+
+        self::assertSame(Border::BORDER_THIN, $sheet->getCell('B1')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertSame(Border::BORDER_THIN, $sheet->getCell('B1')->getStyle()->getBorders()->getTop()->getBorderStyle());
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('B1')->getStyle()->getBorders()->getLeft()->getBorderStyle());
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('B1')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+
+        self::assertSame(Border::BORDER_THIN, $sheet->getCell('B2')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertSame(Border::BORDER_THIN, $sheet->getCell('B2')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('B2')->getStyle()->getBorders()->getLeft()->getBorderStyle());
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('B2')->getStyle()->getBorders()->getTop()->getBorderStyle());
+    }
+
+    public function testInside(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $borders = $sheet->getStyle('A1:B2')->getBorders();
+        $inside = $borders->getInside();
+        $inside->setBorderStyle(Border::BORDER_THIN);
+
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('A1')->getStyle()->getBorders()->getLeft()->getBorderStyle());
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('A1')->getStyle()->getBorders()->getTop()->getBorderStyle());
+        self::assertSame(Border::BORDER_THIN, $sheet->getCell('A1')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertSame(Border::BORDER_THIN, $sheet->getCell('A1')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('A2')->getStyle()->getBorders()->getLeft()->getBorderStyle());
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('A2')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+        self::assertSame(Border::BORDER_THIN, $sheet->getCell('A2')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertSame(Border::BORDER_THIN, $sheet->getCell('A2')->getStyle()->getBorders()->getTop()->getBorderStyle());
+
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('B1')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('B1')->getStyle()->getBorders()->getTop()->getBorderStyle());
+        self::assertSame(Border::BORDER_THIN, $sheet->getCell('B1')->getStyle()->getBorders()->getLeft()->getBorderStyle());
+        self::assertSame(Border::BORDER_THIN, $sheet->getCell('B1')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('B2')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('B2')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+        self::assertSame(Border::BORDER_THIN, $sheet->getCell('B2')->getStyle()->getBorders()->getLeft()->getBorderStyle());
+        self::assertSame(Border::BORDER_THIN, $sheet->getCell('B2')->getStyle()->getBorders()->getTop()->getBorderStyle());
+    }
+
+    public function testHorizontal(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $borders = $sheet->getStyle('A1:B2')->getBorders();
+        $horizontal = $borders->getHorizontal();
+        $horizontal->setBorderStyle(Border::BORDER_THIN);
+
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('A1')->getStyle()->getBorders()->getLeft()->getBorderStyle());
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('A1')->getStyle()->getBorders()->getTop()->getBorderStyle());
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('A1')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertSame(Border::BORDER_THIN, $sheet->getCell('A1')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('A2')->getStyle()->getBorders()->getLeft()->getBorderStyle());
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('A2')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('A2')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertSame(Border::BORDER_THIN, $sheet->getCell('A2')->getStyle()->getBorders()->getTop()->getBorderStyle());
+
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('B1')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('B1')->getStyle()->getBorders()->getTop()->getBorderStyle());
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('B1')->getStyle()->getBorders()->getLeft()->getBorderStyle());
+        self::assertSame(Border::BORDER_THIN, $sheet->getCell('B1')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('B2')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('B2')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('B2')->getStyle()->getBorders()->getLeft()->getBorderStyle());
+        self::assertSame(Border::BORDER_THIN, $sheet->getCell('B2')->getStyle()->getBorders()->getTop()->getBorderStyle());
+    }
+
+    public function testVertical(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $borders = $sheet->getStyle('A1:B2')->getBorders();
+        $vertical = $borders->getVertical();
+        $vertical->setBorderStyle(Border::BORDER_THIN);
+
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('A1')->getStyle()->getBorders()->getLeft()->getBorderStyle());
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('A1')->getStyle()->getBorders()->getTop()->getBorderStyle());
+        self::assertSame(Border::BORDER_THIN, $sheet->getCell('A1')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('A1')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('A2')->getStyle()->getBorders()->getLeft()->getBorderStyle());
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('A2')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+        self::assertSame(Border::BORDER_THIN, $sheet->getCell('A2')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('A2')->getStyle()->getBorders()->getTop()->getBorderStyle());
+
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('B1')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('B1')->getStyle()->getBorders()->getTop()->getBorderStyle());
+        self::assertSame(Border::BORDER_THIN, $sheet->getCell('B1')->getStyle()->getBorders()->getLeft()->getBorderStyle());
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('B1')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('B2')->getStyle()->getBorders()->getRight()->getBorderStyle());
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('B2')->getStyle()->getBorders()->getBottom()->getBorderStyle());
+        self::assertSame(Border::BORDER_THIN, $sheet->getCell('B2')->getStyle()->getBorders()->getLeft()->getBorderStyle());
+        self::assertSame(Border::BORDER_NONE, $sheet->getCell('B2')->getStyle()->getBorders()->getTop()->getBorderStyle());
+    }
+
+    public function testNoSupervisorAllBorders(): void
+    {
+        $this->expectException(PhpSpreadsheetException::class);
+        $borders = new Borders();
+        $borders->getAllBorders();
+    }
+
+    public function testNoSupervisorOutline(): void
+    {
+        $this->expectException(PhpSpreadsheetException::class);
+        $borders = new Borders();
+        $borders->getOutline();
+    }
+
+    public function testNoSupervisorInside(): void
+    {
+        $this->expectException(PhpSpreadsheetException::class);
+        $borders = new Borders();
+        $borders->getInside();
+    }
+
+    public function testNoSupervisorVertical(): void
+    {
+        $this->expectException(PhpSpreadsheetException::class);
+        $borders = new Borders();
+        $borders->getVertical();
+    }
+
+    public function testNoSupervisorHorizontal(): void
+    {
+        $this->expectException(PhpSpreadsheetException::class);
+        $borders = new Borders();
+        $borders->getHorizontal();
+    }
+
+    public function testGetSharedComponentPseudo(): void
+    {
+        $this->expectException(PhpSpreadsheetException::class);
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->getStyle('A1')->getBorders()->getHorizontal()->setBorderStyle(Border::BORDER_MEDIUM);
+        $sheet->getStyle('A1')->getBorders()->getHorizontal()->getSharedComponent();
+    }
+
+    public function testBorderStyle(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->getStyle('A1')->getBorders()->getTop()->setBorderStyle(false);
+        $sheet->getStyle('A2')->getBorders()->getTop()->setBorderStyle(true);
+        self::assertEquals(Border::BORDER_NONE, $sheet->getStyle('A1')->getBorders()->getTop()->getBorderStyle());
+        self::assertEquals(Border::BORDER_MEDIUM, $sheet->getStyle('A2')->getBorders()->getTop()->getBorderStyle());
+        $sheet->getStyle('A3')->getBorders()->getTop()->applyFromArray(['borderStyle' => Border::BORDER_MEDIUM]);
+        self::assertEquals(Border::BORDER_MEDIUM, $sheet->getStyle('A3')->getBorders()->getTop()->getBorderStyle());
+        $border = new Border();
+        $border->setBorderStyle(Border::BORDER_THIN)->setColor(new Color('FFFF0000'));
+        self::assertEquals('FFFF0000', $border->getColor()->getARGB());
+        self::assertEquals(Border::BORDER_THIN, $border->getBorderStyle());
+    }
+
+    public function testDiagonalDirection(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->getStyle('A1')->getBorders()->getDiagonal()->setBorderStyle(Border::BORDER_MEDIUM);
+        $sheet->getStyle('A1')->getBorders()->setDiagonalDirection(Borders::DIAGONAL_BOTH);
+        $borders = $sheet->getStyle('A1')->getBorders();
+
+        self::assertSame(Border::BORDER_MEDIUM, $borders->getDiagonal()->getBorderStyle());
+        self::assertSame(Borders::DIAGONAL_BOTH, $borders->getDiagonalDirection());
     }
 }
diff --git a/tests/PhpSpreadsheetTests/Style/ColorTest.php b/tests/PhpSpreadsheetTests/Style/ColorTest.php
index 9b524e93..04028f87 100644
--- a/tests/PhpSpreadsheetTests/Style/ColorTest.php
+++ b/tests/PhpSpreadsheetTests/Style/ColorTest.php
@@ -70,4 +70,21 @@ class ColorTest extends TestCase
     {
         return require 'tests/data/Style/ColorChangeBrightness.php';
     }
+
+    public function testDefaultColor(): void
+    {
+        $color = new Color();
+        $color->setARGB('FFFF0000');
+        self::assertEquals('FFFF0000', $color->getARGB());
+        self::assertEquals('FF0000', $color->getRGB());
+        $color->setARGB('');
+        self::assertEquals(Color::COLOR_BLACK, $color->getARGB());
+        self::assertEquals('000000', $color->getRGB());
+        $color->setARGB('FFFF0000');
+        self::assertEquals('FFFF0000', $color->getARGB());
+        self::assertEquals('FF0000', $color->getRGB());
+        $color->setRGB('');
+        self::assertEquals(Color::COLOR_BLACK, $color->getARGB());
+        self::assertEquals('000000', $color->getRGB());
+    }
 }
diff --git a/tests/PhpSpreadsheetTests/Style/ConditionalTest.php b/tests/PhpSpreadsheetTests/Style/ConditionalTest.php
new file mode 100644
index 00000000..064a52f1
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Style/ConditionalTest.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Style;
+
+use PhpOffice\PhpSpreadsheet\Style\Conditional;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+use PHPUnit\Framework\TestCase;
+
+class ConditionalTest extends TestCase
+{
+    public function testClone(): void
+    {
+        $condition1 = new Conditional();
+        $condition1->setConditionType(Conditional::CONDITION_CELLIS);
+        $condition1->setOperatorType(Conditional::OPERATOR_LESSTHAN);
+        $condition1->addCondition(0.6);
+        $condition1->getStyle()->getFill()
+            ->setFillType(Fill::FILL_SOLID)
+            ->getEndColor()->setARGB('FFFF0000');
+        $conditionclone = clone $condition1;
+        self::AssertEquals($condition1, $conditionclone);
+        self::AssertEquals($condition1->getStyle(), $conditionclone->getStyle());
+        self::AssertNotSame($condition1->getStyle(), $conditionclone->getStyle());
+    }
+
+    public function testVariousAdds(): void
+    {
+        $condition1 = new Conditional();
+        $condition1->setConditionType(Conditional::CONDITION_CELLIS);
+        $condition1->setOperatorType(Conditional::OPERATOR_LESSTHAN);
+        $condition1->addCondition(0.6);
+        $condition1->getStyle()->getFill()
+            ->setFillType(Fill::FILL_SOLID)
+            ->getEndColor()->setARGB('FFFF0000');
+        $condition2 = new Conditional();
+        $condition2->setConditionType(Conditional::CONDITION_CELLIS);
+        $condition2->setOperatorType(Conditional::OPERATOR_LESSTHAN);
+        $condition2->setConditions(0.6);
+        $condition2->getStyle()->getFill()
+            ->setFillType(Fill::FILL_SOLID)
+            ->getEndColor()->setARGB('FFFF0000');
+        $condition3 = new Conditional();
+        $condition3->setConditionType(Conditional::CONDITION_CELLIS);
+        $condition3->setOperatorType(Conditional::OPERATOR_LESSTHAN);
+        $condition3->setConditions([0.6]);
+        $condition3->getStyle()->getFill()
+            ->setFillType(Fill::FILL_SOLID)
+            ->getEndColor()->setARGB('FFFF0000');
+        self::AssertEquals($condition1, $condition2);
+        self::AssertEquals($condition1, $condition3);
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Style/ExportArrayTest.php b/tests/PhpSpreadsheetTests/Style/ExportArrayTest.php
new file mode 100644
index 00000000..e11e5f29
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Style/ExportArrayTest.php
@@ -0,0 +1,161 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Style;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PhpOffice\PhpSpreadsheet\Style\Border;
+use PhpOffice\PhpSpreadsheet\Style\Color;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+use PhpOffice\PhpSpreadsheet\Style\Font;
+use PhpOffice\PhpSpreadsheet\Style\Protection;
+use PHPUnit\Framework\TestCase;
+
+class ExportArrayTest extends TestCase
+{
+    public function testStyleCopy(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $cell1 = $sheet->getCell('A1');
+        $cell1->setValue('Cell A1');
+        $cell1style = $cell1->getStyle();
+        $cell1style->getAlignment()->setHorizontal(Alignment::HORIZONTAL_RIGHT);
+        $cell1style->getFont()->getColor()->setARGB('FFFF0000');
+        $cell1style->getFont()->setBold(true);
+        $cell1style->getFill()->setFillType(Fill::FILL_PATTERN_GRAY125);
+        $cell1style->getFill()->setStartColor(new Color('FF0000FF'));
+        $cell1style->getFill()->setEndColor(new Color('FF00FF00'));
+        $cell1style->getFont()->setUnderline(true);
+        self::assertEquals(Font::UNDERLINE_SINGLE, $cell1style->getFont()->getUnderline());
+        $cell1style->getProtection()->setHidden(Protection::PROTECTION_UNPROTECTED);
+        $cell1style->getProtection()->setLocked(Protection::PROTECTION_UNPROTECTED);
+        $styleArray = $cell1style->exportArray();
+        $cell2 = $sheet->getCell('B1');
+        $cell2->setValue('Cell B1');
+        $cell2style = $cell2->getStyle();
+        $cell2style->applyFromArray($styleArray);
+
+        self::AssertEquals($cell1style->getAlignment()->getHorizontal(), $cell2style->getAlignment()->getHorizontal());
+        self::AssertEquals($cell1style->getFont()->getColor()->getARGB(), $cell2style->getFont()->getColor()->getARGB());
+        self::AssertEquals($cell1style->getFont()->getBold(), $cell2style->getFont()->getBold());
+        self::AssertEquals($cell1style->getFont()->getUnderline(), $cell2style->getFont()->getUnderline());
+        self::AssertEquals($cell1style->getFill()->getFillType(), $cell2style->getFill()->getFillType());
+        self::AssertEquals($cell1style->getFill()->getStartColor()->getARGB(), $cell2style->getFill()->getStartColor()->getARGB());
+        self::AssertEquals($cell1style->getFill()->getEndColor()->getARGB(), $cell2style->getFill()->getEndColor()->getARGB());
+        self::AssertEquals($cell1style->getProtection()->getLocked(), $cell2style->getProtection()->getLocked());
+        self::AssertEquals($cell1style->getProtection()->getHidden(), $cell2style->getProtection()->getHidden());
+
+        self::AssertEquals($cell1style->getHashCode(), $cell2style->getHashCode());
+        self::AssertEquals($cell1style->getAlignment()->getHashCode(), $cell2style->getAlignment()->getHashCode());
+        self::AssertEquals($cell1style->getFont()->getHashCode(), $cell2style->getFont()->getHashCode());
+        self::AssertEquals($cell1style->getFill()->getHashCode(), $cell2style->getFill()->getHashCode());
+        self::AssertEquals($cell1style->getProtection()->getHashCode(), $cell2style->getProtection()->getHashCode());
+    }
+
+    public function testStyleFromArrayCopy(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $cell1 = $sheet->getCell('A1');
+        $cell1->setValue('Cell A1');
+        $cell1style = $cell1->getStyle();
+        $cell1style->getAlignment()->applyFromArray(['horizontal' => Alignment::HORIZONTAL_RIGHT]);
+        $cell1style->getFont()->getColor()->setARGB('FFFF0000');
+        $cell1style->getFont()->applyFromArray(['bold' => true]);
+        $cell1style->getFill()->applyFromArray(['fillType' => Fill::FILL_PATTERN_GRAY125]);
+        $cell1style->getFill()->getStartColor()->applyFromArray(['argb' => 'FF0000FF']);
+        $cell1style->getFill()->getEndColor()->setRGB('00FF00');
+        $cell1style->getFill()->setRotation(45);
+        $cell1style->getFont()->setUnderline(true);
+        self::assertEquals(Font::UNDERLINE_SINGLE, $cell1style->getFont()->getUnderline());
+        $cell1style->getProtection()->applyFromArray(['hidden' => Protection::PROTECTION_UNPROTECTED, 'locked' => Protection::PROTECTION_UNPROTECTED]);
+        $styleArray = $cell1style->exportArray();
+        $cell2 = $sheet->getCell('B1');
+        $cell2->setValue('Cell B1');
+        $cell2style = $cell2->getStyle();
+        $cell2style->applyFromArray($styleArray);
+
+        self::AssertEquals($cell1style->getAlignment()->getHorizontal(), $cell2style->getAlignment()->getHorizontal());
+        self::AssertEquals($cell1style->getFont()->getColor()->getARGB(), $cell2style->getFont()->getColor()->getARGB());
+        self::AssertEquals($cell1style->getFont()->getBold(), $cell2style->getFont()->getBold());
+        self::AssertEquals($cell1style->getFont()->getUnderline(), $cell2style->getFont()->getUnderline());
+        self::AssertEquals($cell1style->getFill()->getFillType(), $cell2style->getFill()->getFillType());
+        self::AssertEquals($cell1style->getFill()->getRotation(), $cell2style->getFill()->getRotation());
+        self::AssertEquals($cell1style->getFill()->getStartColor()->getARGB(), $cell2style->getFill()->getStartColor()->getARGB());
+        self::AssertEquals($cell1style->getFill()->getEndColor()->getARGB(), $cell2style->getFill()->getEndColor()->getARGB());
+        self::AssertEquals($cell1style->getProtection()->getLocked(), $cell2style->getProtection()->getLocked());
+        self::AssertEquals($cell1style->getProtection()->getHidden(), $cell2style->getProtection()->getHidden());
+
+        self::AssertEquals($cell1style->getFill()->getStartColor()->getHashCode(), $cell2style->getFill()->getStartColor()->getHashCode());
+        self::AssertEquals($cell1style->getFill()->getEndColor()->getHashCode(), $cell2style->getFill()->getEndColor()->getHashCode());
+    }
+
+    public function testNumberFormat(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $cell1 = $sheet->getCell('A1');
+        $cell1style = $cell1->getStyle();
+        $fmt2 = '$ #,##0.000';
+        $cell1style->getNumberFormat()->setFormatCode($fmt2);
+        $cell1style->getFont()->setUnderline('');
+        self::assertEquals(Font::UNDERLINE_NONE, $cell1style->getFont()->getUnderline());
+        $cell1->setValue(2345.679);
+        $styleArray = $cell1style->exportArray();
+        self::assertEquals('$ 2,345.679', $cell1->getFormattedValue());
+
+        $cell2 = $sheet->getCell('B1');
+        $cell2->setValue(12345.679);
+        $cell2style = $cell2->getStyle();
+        $cell2style->applyFromArray($styleArray);
+        self::assertEquals('$ 12,345.679', $cell2->getFormattedValue());
+
+        self::AssertEquals($cell1style->getNumberFormat()->getHashCode(), $cell2style->getNumberFormat()->getHashCode());
+    }
+
+    public function testNumberFormatFromArray(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $cell1 = $sheet->getCell('A1');
+        $cell1style = $cell1->getStyle();
+        $fmt2 = '$ #,##0.000';
+        $cell1style->getNumberFormat()->applyFromArray(['formatCode' => $fmt2]);
+        $cell1style->getFont()->setUnderline('');
+        self::assertEquals(Font::UNDERLINE_NONE, $cell1style->getFont()->getUnderline());
+        $cell1style->getBorders()->getTop()->setBorderStyle(Border::BORDER_THIN);
+        $cell1->setValue(2345.679);
+        $styleArray = $cell1style->exportArray();
+        self::assertEquals('$ 2,345.679', $cell1->getFormattedValue());
+
+        $cell2 = $sheet->getCell('B1');
+        $cell2->setValue(12345.679);
+        $cell2style = $cell2->getStyle();
+        $cell2style->applyFromArray($styleArray);
+        self::assertEquals('$ 12,345.679', $cell2->getFormattedValue());
+
+        self::AssertEquals($cell1style->getNumberFormat()->getHashCode(), $cell2style->getNumberFormat()->getHashCode());
+        self::AssertEquals($cell1style->getBorders()->getHashCode(), $cell2style->getBorders()->getHashCode());
+        self::AssertEquals($cell1style->getBorders()->getTop()->getHashCode(), $cell2style->getBorders()->getTop()->getHashCode());
+        self::AssertEquals($cell1style->getBorders()->getTop()->getBorderStyle(), $cell2style->getBorders()->getTop()->getBorderStyle());
+    }
+
+    public function testStackedRotation(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $cell1 = $sheet->getCell('A1');
+        $cell1->setValue('Cell A1');
+        $cell1style = $cell1->getStyle();
+        $cell1style->getAlignment()->setTextRotation(Alignment::TEXTROTATION_STACK_EXCEL);
+        self::assertEquals(Alignment::TEXTROTATION_STACK_PHPSPREADSHEET, $cell1style->getAlignment()->getTextRotation());
+        $styleArray = $cell1style->exportArray();
+        $cell2 = $sheet->getCell('B1');
+        $cell2->setValue('Cell B1');
+        $cell2style = $cell2->getStyle();
+        $cell2style->applyFromArray($styleArray);
+
+        self::AssertEquals($cell1style->getAlignment()->getTextRotation(), $cell2style->getAlignment()->getTextRotation());
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Style/FillTest.php b/tests/PhpSpreadsheetTests/Style/FillTest.php
new file mode 100644
index 00000000..18ee224d
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Style/FillTest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Style;
+
+use PhpOffice\PhpSpreadsheet\Style\Color;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+use PHPUnit\Framework\TestCase;
+
+class FillTest extends TestCase
+{
+    public function testNonSupervisorColor(): void
+    {
+        $fill = new Fill();
+        $startColor = new Color('FFFF0000');
+        $endColor = new Color('FF00FFFF');
+        $fill->setFillType(Fill::FILL_PATTERN_GRAY125);
+        $fill->setStartColor($startColor);
+        $fill->setEndColor($endColor);
+        self::assertEquals('FF0000', $fill->getStartColor()->getRGB());
+        self::assertEquals('00FFFF', $fill->getEndColor()->getRGB());
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Style/NumberFormatBuiltinTest.php b/tests/PhpSpreadsheetTests/Style/NumberFormatBuiltinTest.php
new file mode 100644
index 00000000..dd3d672a
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Style/NumberFormatBuiltinTest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Style;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+use PHPUnit\Framework\TestCase;
+
+class NumberFormatBuiltinTest extends TestCase
+{
+    public function testBuiltinCodes(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $cell1 = $sheet->getCell('A1');
+        $cell1->setValue(1);
+        $cell1->getStyle()->getNumberFormat()->setBuiltInFormatCode(2); // 0.00
+        self::assertEquals('1.00', $cell1->getFormattedValue());
+        $cell2 = $sheet->getCell('A2');
+        $cell2->setValue(1234);
+        $cell2->getStyle()->getNumberFormat()->setFormatCode('#,##0'); // builtin 3
+        self::assertEquals(3, $cell2->getStyle()->getNumberFormat()->getBuiltinFormatCode());
+        self::assertEquals('1,234', $cell2->getFormattedValue());
+        $cell3 = $sheet->getCell('A3');
+        $cell3->setValue(1234);
+        $cell3->getStyle()->getNumberFormat()->setFormatCode(''); // General
+        self::assertEquals(NumberFormat::FORMAT_GENERAL, $cell3->getStyle()->getNumberFormat()->getFormatCode());
+        self::assertEquals(0, $cell3->getStyle()->getNumberFormat()->getBuiltinFormatCode());
+        self::assertEquals('1234', $cell3->getFormattedValue());
+        // non-supervisor
+        $numberFormat = new NumberFormat();
+        $numberFormat->setBuiltInFormatCode(4);
+        self::assertEquals('#,##0.00', $numberFormat->getFormatCode());
+    }
+}
diff --git a/tests/PhpSpreadsheetTests/Style/StyleTest.php b/tests/PhpSpreadsheetTests/Style/StyleTest.php
new file mode 100644
index 00000000..b695a50b
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Style/StyleTest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Style;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PHPUnit\Framework\TestCase;
+
+class StyleTest extends TestCase
+{
+    public function testStyleOddMethods(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $cellCoordinate = 'A1';
+        $cell1 = $sheet->getCell($cellCoordinate);
+        $cell1style = $cell1->getStyle();
+        self::assertSame($spreadsheet, $cell1style->getParent());
+        $styleArray = ['alignment' => ['textRotation' => 45]];
+        $outArray = $cell1style->getStyleArray($styleArray);
+        self::assertEquals($styleArray, $outArray['quotePrefix']);
+    }
+}

From 0bf3986efa0d096981101872c2f10e31a7bcf6b4 Mon Sep 17 00:00:00 2001
From: CoryHrycko <40903917+CoryHrycko@users.noreply.github.com>
Date: Sun, 1 Nov 2020 06:05:04 -0500
Subject: [PATCH 153/153] Updating a misspelling of a function name. (#1695)

This will update the function name DCOUNTA from the misspelling of DCOUNT.
---
 docs/topics/calculation-engine.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/topics/calculation-engine.md b/docs/topics/calculation-engine.md
index d15dbb16..4fd300e8 100644
--- a/docs/topics/calculation-engine.md
+++ b/docs/topics/calculation-engine.md
@@ -456,7 +456,7 @@ has not yet been implemented in PhpSpreadsheet.
 
 #### DCOUNTA
 
-The DCOUNT function returns the count of cells that aren’t blank in a
+The DCOUNTA function returns the count of cells that aren’t blank in a
 column of a list or database and that match conditions that you specify.
 
 ##### Syntax