Clientbase
/
PhpSpreadsheet
mirror of https://github.com/basemaster/PhpSpreadsheet.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove complexity from AddressHelper::convertToR1C1

This commit is contained in:
Nathan Dench 2021-05-06 09:57:22 +10:00 committed by Mark Baker
parent a96109d89b
commit df01db58ad
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/PhpSpreadsheet/Cell/AddressHelper.php
View File

@ -102,26 +102,22 @@ class AddressHelper
?int $currentRowNumber = null, ?int $currentRowNumber = null,
?int $currentColumnNumber = null ?int $currentColumnNumber = null
): string { ): string {
$validityCheck = preg_match('/^(\$?[A-Z]{1,3})(\$?\d{1,7})$/i', $address, $cellReference); $validityCheck = preg_match('/^(\$?)([A-Z]{1,3})(\$?)(\d{1,7})$/i', $address, $cellReference);
if ($validityCheck === 0) { if ($validityCheck === 0) {
throw new Exception('Invalid A1-format Cell Reference'); throw new Exception('Invalid A1-format Cell Reference');
} }
if ($cellReference[1][0] === '$') { $columnId = Coordinate::columnIndexFromString($cellReference[2]);
$columnId = Coordinate::columnIndexFromString(substr($cellReference[1], 1)); if ($cellReference[1] === '$') {
// Column must be absolute address // Column must be absolute address
$currentColumnNumber = null; $currentColumnNumber = null;
} else {
$columnId = Coordinate::columnIndexFromString($cellReference[1]);
} }
if ($cellReference[2][0] === '$') { $rowId = (int) $cellReference[4];
$rowId = (int) substr($cellReference[2], 1); if ($cellReference[3] === '$') {
// Row must be absolute address // Row must be absolute address
$currentRowNumber = null; $currentRowNumber = null;
} else {
$rowId = (int) $cellReference[2];
} }
if ($currentRowNumber !== null) { if ($currentRowNumber !== null) {