From 62d3a56a57a9920b8a73721e7a47df1f59d803dd Mon Sep 17 00:00:00 2001
From: Nathan Dench <ndenc2@gmail.com>
Date: Mon, 10 May 2021 16:40:04 +1000
Subject: [PATCH] Add AddressHelper::convertFormulaToA1 tests for
 SpreadsheetXML

---
 src/PhpSpreadsheet/Cell/AddressHelper.php         |  2 +-
 .../Cell/AddressHelperTest.php                    | 15 +++++++++++++++
 .../Cell/ConvertFormulaToA1SpreadsheetXml.php     |  7 +++++++
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 tests/data/Cell/ConvertFormulaToA1SpreadsheetXml.php

diff --git a/src/PhpSpreadsheet/Cell/AddressHelper.php b/src/PhpSpreadsheet/Cell/AddressHelper.php
index 632c046f..cde31a13 100644
--- a/src/PhpSpreadsheet/Cell/AddressHelper.php
+++ b/src/PhpSpreadsheet/Cell/AddressHelper.php
@@ -48,7 +48,7 @@ class AddressHelper
     }
 
     /**
-     * Converts a formula that uses R1C1 format cell address to an A1 format cell address.
+     * Converts a formula that uses R1C1/SpreadsheetXML format cell address to an A1 format cell address.
      */
     public static function convertFormulaToA1(
         string $formula,
diff --git a/tests/PhpSpreadsheetTests/Cell/AddressHelperTest.php b/tests/PhpSpreadsheetTests/Cell/AddressHelperTest.php
index 3f9c8302..136a729d 100644
--- a/tests/PhpSpreadsheetTests/Cell/AddressHelperTest.php
+++ b/tests/PhpSpreadsheetTests/Cell/AddressHelperTest.php
@@ -109,4 +109,19 @@ class AddressHelperTest extends TestCase
     {
         return require 'tests/data/Cell/A1ConversionToR1C1Exception.php';
     }
+
+    /**
+     * @dataProvider providerConvertFormulaToA1SpreadsheetXml
+     */
+    public function testConvertFormulaToA1SpreadsheetXml(string $expectedValue, string $formula): void
+    {
+        $actualValue = AddressHelper::convertFormulaToA1($formula);
+
+        self::assertSame($expectedValue, $actualValue);
+    }
+
+    public function providerConvertFormulaToA1SpreadsheetXml(): array
+    {
+        return require 'tests/data/Cell/ConvertFormulaToA1SpreadsheetXml.php';
+    }
 }
diff --git a/tests/data/Cell/ConvertFormulaToA1SpreadsheetXml.php b/tests/data/Cell/ConvertFormulaToA1SpreadsheetXml.php
new file mode 100644
index 00000000..590d4d0d
--- /dev/null
+++ b/tests/data/Cell/ConvertFormulaToA1SpreadsheetXml.php
@@ -0,0 +1,7 @@
+<?php
+
+return [
+    ['=B4+C4', 'of:=[.B4]+[.C4]'],
+    ['=SUM(B1:B4)', 'of:=SUM([.B1:.B4])'],
+    ['=CONCAT("Result of formula expression =[.B4]+[.C4] is: ", B4+C4)', 'of:=CONCAT("Result of formula expression =[.B4]+[.C4] is: ", [.B4]+[.C4])'],
+];