Merge pull request #2802 from PHPOffice/Performance-Experimental-Changes

Simplify validation of columnId/rowId values when creating a CellAddress object

Author: MarkBaker

src/PhpSpreadsheet/Calculation/Functions.php

@@ -705,8 +705,8 @@ public static function trimTrailingRange(string $coordinate): string
 
     public static function trimSheetFromCellReference(string $coordinate): string
     {
-        while (strpos($coordinate, '!') !== false) {
-            $coordinate = substr($coordinate, strpos($coordinate, '!') + 1);
+        if (strpos($coordinate, '!') !== false) {
+            $coordinate = substr($coordinate, strrpos($coordinate, '!') + 1);
         }
 
         return $coordinate;

src/PhpSpreadsheet/Cell/CellAddress.php

@@ -47,15 +47,9 @@ public function __construct(string $cellAddress, ?Worksheet $worksheet = null)
      */
     private static function validateColumnAndRow($columnId, $rowId): void
     {
-        $array = [$columnId, $rowId];
-        array_walk(
-            $array,
-            function ($value): void {
-                if (!is_numeric($value) || $value <= 0) {
-                    throw new Exception('Row and Column Ids must be positive integer values');
-                }
-            }
-        );
+        if (!is_numeric($columnId) || $columnId <= 0 || !is_numeric($rowId) || $rowId <= 0) {
+            throw new Exception('Row and Column Ids must be positive integer values');
+        }
     }
 
     /**