From 9fed8d87f66c274c314f98aab148a2ca382ec23e Mon Sep 17 00:00:00 2001
From: Owen Leibman <eclipsechasers2@yahoo.com>
Date: Sun, 9 May 2021 15:41:36 -0700
Subject: [PATCH] Two Problems with Sample19

19_NamedRange.php was not changed to use absolute addressing when that was introduced to Named Ranges. Consequently, the output from this sample has been wrong ever since, for both Xls and Xlsx.

There was an additional problem with Xls. It appears that the Xls Writer Parser does not parse multiple concatenations using the ampersand operator correctly. So, `=B1+" "+B2` was parsed as `=B1+" "`. I believe that this is due to ampersand being treated as a condition rather than an operator; `A1>A2>A3` isn't valid, but `A1&A2&A3` is. My original PR (#1992, which I will now close) only partially resolved this, but I think moving ampersand handling from `condition` to `expression` is fully successful.

There are already more than ample tests for Named Ranges, so I did not add a new one for that purpose. However, I did add a new test for the Xls parser problem.
---
 samples/Basic/19_Namedrange.php               |  4 +--
 src/PhpSpreadsheet/Writer/Xls/Parser.php      |  9 +++---
 .../Writer/Xls/Sample19Test.php               | 28 +++++++++++++++++++
 3 files changed, 35 insertions(+), 6 deletions(-)
 create mode 100644 tests/PhpSpreadsheetTests/Writer/Xls/Sample19Test.php

diff --git a/samples/Basic/19_Namedrange.php b/samples/Basic/19_Namedrange.php
index d89e1b04..6170fa28 100644
--- a/samples/Basic/19_Namedrange.php
+++ b/samples/Basic/19_Namedrange.php
@@ -31,8 +31,8 @@ $spreadsheet->getActiveSheet()->setCellValue('A1', 'Firstname:')
 
 // Define named ranges
 $helper->log('Define named ranges');
-$spreadsheet->addNamedRange(new NamedRange('PersonName', $spreadsheet->getActiveSheet(), 'B1'));
-$spreadsheet->addNamedRange(new NamedRange('PersonLN', $spreadsheet->getActiveSheet(), 'B2'));
+$spreadsheet->addNamedRange(new NamedRange('PersonName', $spreadsheet->getActiveSheet(), '$B$1'));
+$spreadsheet->addNamedRange(new NamedRange('PersonLN', $spreadsheet->getActiveSheet(), '$B$2'));
 
 // Rename named ranges
 $helper->log('Rename named ranges');
diff --git a/src/PhpSpreadsheet/Writer/Xls/Parser.php b/src/PhpSpreadsheet/Writer/Xls/Parser.php
index d49459b3..4033fd53 100644
--- a/src/PhpSpreadsheet/Writer/Xls/Parser.php
+++ b/src/PhpSpreadsheet/Writer/Xls/Parser.php
@@ -1149,10 +1149,6 @@ class Parser
             $this->advance();
             $result2 = $this->expression();
             $result = $this->createTree('ptgNE', $result, $result2);
-        } elseif ($this->currentToken == '&') {
-            $this->advance();
-            $result2 = $this->expression();
-            $result = $this->createTree('ptgConcat', $result, $result2);
         }
 
         return $result;
@@ -1203,6 +1199,11 @@ class Parser
             return $this->createTree('ptgUplus', $result2, '');
         }
         $result = $this->term();
+        while ($this->currentToken === '&') {
+            $this->advance();
+            $result2 = $this->expression();
+            $result = $this->createTree('ptgConcat', $result, $result2);
+        }
         while (
             ($this->currentToken == '+') ||
             ($this->currentToken == '-') ||
diff --git a/tests/PhpSpreadsheetTests/Writer/Xls/Sample19Test.php b/tests/PhpSpreadsheetTests/Writer/Xls/Sample19Test.php
new file mode 100644
index 00000000..13fa9fa1
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Writer/Xls/Sample19Test.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Writer\Xls;
+
+use PhpOffice\PhpSpreadsheetTests\Functional\AbstractFunctional;
+
+class Sample19Test extends AbstractFunctional
+{
+    public function testSample19Xls(): void
+    {
+        $spreadsheet = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
+        $spreadsheet->setActiveSheetIndex(0);
+        $spreadsheet->getActiveSheet()->setCellValue('A1', 'Firstname:')
+            ->setCellValue('A2', 'Lastname:')
+            ->setCellValue('A3', 'Fullname:')
+            ->setCellValue('B1', 'Maarten')
+            ->setCellValue('B2', 'Balliauw')
+            ->setCellValue('B3', '=B1 & " " & B2')
+            ->setCellValue('C1', '=A2&A3&A3&A2&B1');
+
+        $robj = $this->writeAndReload($spreadsheet, 'Xls');
+        $sheet0 = $robj->setActiveSheetIndex(0);
+        // Xls parser eliminates unneeded whitespace
+        self::assertEquals('=B1&" "&B2', $sheet0->getCell('B3')->getValue());
+        self::assertEquals('Maarten Balliauw', $sheet0->getCell('B3')->getCalculatedValue());
+        self::assertEquals('Lastname:Fullname:Fullname:Lastname:Maarten', $sheet0->getCell('C1')->getCalculatedValue());
+    }
+}