Merge pull request #2818 from PHPOffice/Performance-Minor-Tweaks

Performance tweaks to cell address validation

Author: MarkBaker

src/PhpSpreadsheet/Cell/AddressHelper.php

@@ -118,17 +118,17 @@ public static function convertToR1C1(
             throw new Exception('Invalid A1-format Cell Reference');
         }
 
-        $columnId = Coordinate::columnIndexFromString($cellReference['col_ref']);
-        if ($cellReference['absolute_col'] === '$') {
+        if ($cellReference['col'][0] === '$') {
             // Column must be absolute address
             $currentColumnNumber = null;
         }
+        $columnId = Coordinate::columnIndexFromString(ltrim($cellReference['col'], '$'));
 
-        $rowId = (int) $cellReference['row_ref'];
-        if ($cellReference['absolute_row'] === '$') {
+        if ($cellReference['row'][0] === '$') {
             // Row must be absolute address
             $currentRowNumber = null;
         }
+        $rowId = (int) ltrim($cellReference['row'], '$');
 
         if ($currentRowNumber !== null) {
             if ($rowId === $currentRowNumber) {

src/PhpSpreadsheet/Cell/CellAddress.php

@@ -35,9 +35,7 @@ class CellAddress
     public function __construct(string $cellAddress, ?Worksheet $worksheet = null)
     {
         $this->cellAddress = str_replace('$', '', $cellAddress);
-        [$this->columnName, $rowId] = Coordinate::coordinateFromString($cellAddress);
-        $this->rowId = (int) $rowId;
-        $this->columnId = Coordinate::columnIndexFromString($this->columnName);
+        [$this->columnId, $this->rowId, $this->columnName] = Coordinate::indexesFromString($this->cellAddress);
         $this->worksheet = $worksheet;
     }
 

src/PhpSpreadsheet/Cell/Coordinate.php

@@ -13,7 +13,7 @@
  */
 abstract class Coordinate
 {
-    public const A1_COORDINATE_REGEX = '/^(?<absolute_col>\$?)(?<col_ref>[A-Z]{1,3})(?<absolute_row>\$?)(?<row_ref>\d{1,7})$/i';
+    public const A1_COORDINATE_REGEX = '/^(?<col>\$?[A-Z]{1,3})(?<row>\$?\d{1,7})$/i';
 
     /**
      * Default range variable constant.
@@ -32,7 +32,7 @@ abstract class Coordinate
     public static function coordinateFromString($cellAddress)
     {
         if (preg_match(self::A1_COORDINATE_REGEX, $cellAddress, $matches)) {
-            return [$matches['absolute_col'] . $matches['col_ref'], $matches['absolute_row'] . $matches['row_ref']];
+            return [$matches['col'], $matches['row']];
         } elseif (self::coordinateIsRange($cellAddress)) {
             throw new Exception('Cell coordinate string can not be a range of cells');
         } elseif ($cellAddress == '') {

src/PhpSpreadsheet/Worksheet/Validations.php

@@ -42,9 +42,8 @@ public static function validateCellAddress($cellAddress): string
     public static function validateCellOrCellRange($cellRange): string
     {
         if (is_string($cellRange) || is_numeric($cellRange)) {
-            $cellRange = (string) $cellRange;
             // Convert a single column reference like 'A' to 'A:A'
-            $cellRange = (string) preg_replace('/^([A-Z]+)$/', '${1}:${1}', $cellRange);
+            $cellRange = (string) preg_replace('/^([A-Z]+)$/', '${1}:${1}', (string) $cellRange);
             // Convert a single row reference like '1' to '1:1'
             $cellRange = (string) preg_replace('/^(\d+)$/', '${1}:${1}', $cellRange);
         } elseif (is_object($cellRange) && $cellRange instanceof CellAddress) {
@@ -85,7 +84,7 @@ public static function validateCellRange($cellRange): string
     public static function definedNameToCoordinate(string $coordinate, Worksheet $worksheet): string
     {
         // Uppercase coordinate
-        $testCoordinate = strtoupper($coordinate);
+        $coordinate = strtoupper($coordinate);
         // Eliminate leading equal sign
         $testCoordinate = (string) preg_replace('/^=/', '', $coordinate);
         $defined = $worksheet->getParent()->getDefinedName($testCoordinate, $worksheet);