| @@ -521,10 +521,9 @@ | ||
| 521 | 521 | return []; |
| 522 | 522 | } |
| 523 | 523 | |
| 524 | 524 | /** @var string[] */ |
| 525 | - $cellList = array_merge(...$cells); //* @phpstan-ignore-line | |
| 526 | - // Unsure how to satisfy phpstan in line above | |
| 525 | + $cellList = array_merge(...$cells); //* @phpstan-ignore argument.type (Unsure how to satisfy phpstan) | |
| 527 | 526 | |
| 528 | 527 | $retVal = array_map( |
| 529 | 528 | fn (string $cellAddress) => ($worksheet !== '') ? "{$quoted}{$worksheet}{$quoted}!{$cellAddress}" : $cellAddress, |
| 530 | 529 | self::sortCellReferenceArray($cellList) |
| @@ -646,12 +645,10 @@ | ||
| 646 | 645 | } |
| 647 | 646 | |
| 648 | 647 | // Range... |
| 649 | 648 | [$rangeStart, $rangeEnd] = $range; |
| 650 | - [$startColumn, $startRow] = self::coordinateFromString($rangeStart); | |
| 651 | - [$endColumn, $endRow] = self::coordinateFromString($rangeEnd); | |
| 652 | - $startColumnIndex = self::columnIndexFromString($startColumn); | |
| 653 | - $endColumnIndex = self::columnIndexFromString($endColumn); | |
| 649 | + [$startColumnIndex, $startRow, $startColumn] = self::indexesFromString($rangeStart); | |
| 650 | + [$endColumnIndex, $endRow, $endColumn] = self::indexesFromString($rangeEnd); | |
| 654 | 651 | ++$endColumnIndex; |
| 655 | 652 | |
| 656 | 653 | // Current data |
| 657 | 654 | $currentColumnIndex = $startColumnIndex; |
| @@ -660,10 +657,8 @@ | ||
| 660 | 657 | self::validateRange($cellBlock, $startColumnIndex, $endColumnIndex, (int) $currentRow, (int) $endRow); |
| 661 | 658 | |
| 662 | 659 | // Loop cells |
| 663 | 660 | while ($currentColumnIndex < $endColumnIndex) { |
| 664 | - /** @var int $currentRow */ | |
| 665 | - /** @var int $endRow */ | |
| 666 | 661 | while ($currentRow <= $endRow) { |
| 667 | 662 | $returnValue[] = self::stringFromColumnIndex($currentColumnIndex) . $currentRow; |
| 668 | 663 | ++$currentRow; |
| 669 | 664 | } |
| @@ -744,9 +739,9 @@ | ||
| 744 | 739 | $rowEnd = $row; |
| 745 | 740 | } |
| 746 | 741 | } |
| 747 | 742 | |
| 748 | - if ($rowStart !== null) { // @phpstan-ignore-line | |
| 743 | + if ($rowStart !== null) { | |
| 749 | 744 | if ($rowStart == $rowEnd) { |
| 750 | 745 | $ranges[] = $hashedValue->col . $rowStart; |
| 751 | 746 | } else { |
| 752 | 747 | $ranges[] = $hashedValue->col . $rowStart . ':' . $hashedValue->col . $rowEnd; |
