Initial work on deprecating `ByColumnAndRow` methods; and providing functionality to use the basic cellAddress methods to be used with a string cell address (e.g. `C5`); an array of columnId and rowId (e.g. `[3, 5]`) or a new CellAddress object.

Current implementation for all methods that take a single cell reference argument: - `setCellValue()` - `setCellValueExplicit()` - `getCell()` - `cellExists()` - `setBreak()` - `freezePane()` - `getComment()` Also introducing a CellRange object to work with similar cases for methods that accept a cell range rather than simply a cell address; and RowRange/ColumnRange objects for those cases. Still need to apply to methods that accept a cell range or single cell: - `mergeCells()` - `unmergeCells()` - `protectCells()` - `unprotectCells()` - `setAutoFilter()` Then there's a few special cases that accept row and column ranges, not simply cell ranges; or a series of cell ranges.
2022-03-30 17:02:42 +02:00 · 2022-03-30 17:02:42 +02:00 · 62238bc011
parent 8885c4eeef
commit 62238bc011
10 changed files with 1087 additions and 72 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -37,6 +37,27 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 ### Deprecated

 - All Excel Function implementations in `Calculation\Functions` (including the Error functions) have been moved to dedicated classes for groups of related functions. See the docblocks against all the deprecated methods for details of the new methods to call instead. At some point, these old classes will be deleted.
+- Worksheet methods that reference cells "byColumnandRow". All such methods have an equivalent that references the cell by its address (e.g. '`E3'` rather than `5, 3`).
+
+  These functions now accept either a cell address string (`'E3')` or an array with columnId and rowId (`[5, 3]`) or a new `CellAddress` object as their `cellAddress`/`coordinate` argument.
+  This includes the methods:
+  - `setCellValueByColumnAndRow()` use the equivalent `setCellValue()`
+  - `setCellValueExplicitByColumnAndRow()` use the equivalent `setCellValueExplicit()`
+  - `getCellByColumnAndRow()` use the equivalent `getCell()`
+  - `cellExistsByColumnAndRow()` use the equivalent `cellExists()`
+  - `getStyleByColumnAndRow()` use the equivalent `getStyle()`
+  - `setBreakByColumnAndRow()` use the equivalent `setBreak()`
+  - `mergeCellsByColumnAndRow()` use the equivalent `mergeCells()`
+  - `unmergeCellsByColumnAndRow()` use the equivalent `unmergeCells()`
+  - `protectCellsByColumnAndRow()` use the equivalent `protectCells()`
+  - `unprotectCellsByColumnAndRow()` use the equivalent `unprotectCells()`
+  - `setAutoFilterByColumnAndRow()` use the equivalent `setAutoFilter()`
+  - `freezePaneByColumnAndRow()` use the equivalent `freezePane()`
+  - `getCommentByColumnAndRow()` use the equivalent `getComment()`
+  - `setSelectedCellByColumnAndRow()` use the equivalent `setSelectedCells()`
+
+  This change provides more consistency in the methods (not every "by cell address" method has an equivalent "byColumnAndRow" method);
+  and the "by cell address" methods often provide more flexibility, such as allowing a range of cells, or referencig them by passing the defined name of a named range as the argument.

 ### Removed

--- a/src/PhpSpreadsheet/Cell/CellAddress.php
+++ b/src/PhpSpreadsheet/Cell/CellAddress.php
@ -0,0 +1,172 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class CellAddress
+{
+    /**
+     * @var ?Worksheet
+     */
+    protected $worksheet;
+
+    /**
+     * @var string
+     */
+    protected $cellAddress;
+
+    /**
+     * @var string
+     */
+    protected $columnName;
+
+    /**
+     * @var int
+     */
+    protected $columnId;
+
+    /**
+     * @var int
+     */
+    protected $rowId;
+
+    protected function __construct(string $cellAddress, ?Worksheet $worksheet)
+    {
+        $this->cellAddress = str_replace('$', '', $cellAddress);
+        [$this->columnName, $rowId] = Coordinate::coordinateFromString($cellAddress);
+        $this->rowId = (int) $rowId;
+        $this->columnId = Coordinate::columnIndexFromString($this->columnName);
+        $this->worksheet = $worksheet;
+    }
+
+    /**
+     * @param mixed $columnId
+     * @param mixed $rowId
+     */
+    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');
+                }
+            }
+        );
+    }
+
+    /**
+     * @param mixed $columnId
+     * @param mixed $rowId
+     */
+    public static function fromColumnAndRow($columnId, $rowId, ?Worksheet $worksheet = null): self
+    {
+        self::validateColumnAndRow($columnId, $rowId);
+
+        return new static(Coordinate::stringFromColumnIndex($columnId) . ((string) $rowId), $worksheet);
+    }
+
+    public static function fromColumnRowArray(array $array, ?Worksheet $worksheet = null): self
+    {
+        [$columnId, $rowId] = $array;
+
+        return static::fromColumnAndRow($columnId, $rowId, $worksheet);
+    }
+
+    /**
+     * @param mixed $cellAddress
+     */
+    public static function fromCellAddress($cellAddress, ?Worksheet $worksheet = null): self
+    {
+        return new static($cellAddress, $worksheet);
+    }
+
+    /**
+     * The returned address string will contain the worksheet name as well, if available,
+     *     (ie. if a Worksheet was provided to the constructor).
+     *     e.g. "'Mark''s Worksheet'!C5".
+     */
+    public function fullCellAddress(): string
+    {
+        if ($this->worksheet !== null) {
+            $title = str_replace("'", "''", $this->worksheet->getTitle());
+
+            return "'{$title}'!{$this->cellAddress}";
+        }
+
+        return $this->cellAddress;
+    }
+
+    public function worksheet(): ?Worksheet
+    {
+        return $this->worksheet;
+    }
+
+    /**
+     * The returned address string will contain just the column/row address,
+     *     (even if a Worksheet was provided to the constructor).
+     *     e.g. "C5".
+     */
+    public function cellAddress(): string
+    {
+        return $this->cellAddress;
+    }
+
+    public function rowId(): int
+    {
+        return $this->rowId;
+    }
+
+    public function columnId(): int
+    {
+        return $this->columnId;
+    }
+
+    public function columnName(): string
+    {
+        return $this->columnName;
+    }
+
+    public function nextRow(int $offset = 1): self
+    {
+        $newRowId = $this->rowId + $offset;
+        if ($newRowId < 1) {
+            $newRowId = 1;
+        }
+
+        return static::fromColumnAndRow($this->columnId, $newRowId);
+    }
+
+    public function previousRow(int $offset = 1): self
+    {
+        return $this->nextRow(0 - $offset);
+    }
+
+    public function nextColumn(int $offset = 1): self
+    {
+        $newColumnId = $this->columnId + $offset;
+        if ($newColumnId < 1) {
+            $newColumnId = 1;
+        }
+
+        return static::fromColumnAndRow($newColumnId, $this->rowId);
+    }
+
+    public function previousColumn(int $offset = 1): self
+    {
+        return $this->nextColumn(0 - $offset);
+    }
+
+    /**
+     * The returned address string will contain the worksheet name as well, if available,
+     *     (ie. if a Worksheet was provided to the constructor).
+     *     e.g. "'Mark''s Worksheet'!C5".
+     */
+    public function __toString()
+    {
+        return $this->fullCellAddress();
+    }
+}
--- a/src/PhpSpreadsheet/Cell/CellRange.php
+++ b/src/PhpSpreadsheet/Cell/CellRange.php
@ -0,0 +1,78 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class CellRange
+{
+    /**
+     * @var CellAddress
+     */
+    protected $from;
+
+    /**
+     * @var CellAddress
+     */
+    protected $to;
+
+    public function __construct(CellAddress $from, CellAddress $to)
+    {
+        $this->validateFromTo($from, $to);
+    }
+
+    private function validateFromTo(CellAddress $from, CellAddress $to): void
+    {
+        // Identify actual top-left and bottom-right values (in case we've been given top-right and bottom-left)
+        $firstColumn = min($from->columnId(), $to->columnId());
+        $firstRow = min($from->rowId(), $to->rowId());
+        $lastColumn = max($from->columnId(), $to->columnId());
+        $lastRow = max($from->rowId(), $to->rowId());
+
+        $fromWorksheet = $from->worksheet();
+        $toWorksheet = $to->worksheet();
+        $this->validateWorksheets($fromWorksheet, $toWorksheet);
+
+        $this->from = CellAddress::fromColumnAndRow($firstColumn, $firstRow, $fromWorksheet);
+        $this->to = CellAddress::fromColumnAndRow($lastColumn, $lastRow, $toWorksheet);
+    }
+
+    private function validateWorksheets(?Worksheet $fromWorksheet, ?Worksheet $toWorksheet): void
+    {
+        if ($fromWorksheet !== null && $toWorksheet !== null) {
+            // We could simply compare worksheets rather than worksheet titles; but at some point we may introduce
+            //    support for 3d ranges; and at that point we drop this check and let the validation fall through
+            //    to the check for same workbook; but unless we check on titles, this test will also detect if the
+            //    worksheets are in different spreadsheets, and the next check will never execute or throw its
+            //    own exception.
+            if ($fromWorksheet->getTitle() !== $toWorksheet->getTitle()) {
+                throw new Exception('3d Cell Ranges are not supported');
+            } elseif ($fromWorksheet->getParent() !== $toWorksheet->getParent()) {
+                throw new Exception('Worksheets must be in the same spreadsheet');
+            }
+        }
+    }
+
+    public function from(): CellAddress
+    {
+        return $this->from;
+    }
+
+    public function to(): CellAddress
+    {
+        return $this->to;
+    }
+
+    public function __toString(): string
+    {
+        if ($this->from->cellAddress() === $this->to->cellAddress()) {
+            return "{$this->from->fullCellAddress()}";
+        }
+
+        $fromAddress = $this->from->fullCellAddress();
+        $toAddress = $this->to->cellAddress();
+
+        return "{$fromAddress}:{$toAddress}";
+    }
+}
--- a/src/PhpSpreadsheet/Cell/ColumnRange.php
+++ b/src/PhpSpreadsheet/Cell/ColumnRange.php
@ -0,0 +1,111 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class ColumnRange
+{
+    private const MAX_ROW = 1048576;
+
+    /**
+     * @var ?Worksheet
+     */
+    protected $worksheet;
+
+    /**
+     * @var int
+     */
+    protected $from;
+
+    /**
+     * @var int
+     */
+    protected $to;
+
+    public function __construct(string $from, ?string $to = null, ?Worksheet $worksheet = null)
+    {
+        $this->validateFromTo(
+            Coordinate::columnIndexFromString($from),
+            Coordinate::columnIndexFromString($to ?? $from)
+        );
+        $this->worksheet = $worksheet;
+    }
+
+    public static function fromColumnIndexes(int $from, int $to, ?Worksheet $worksheet = null): self
+    {
+        return new self(Coordinate::stringFromColumnIndex($from), Coordinate::stringFromColumnIndex($to), $worksheet);
+    }
+
+    /**
+     * @param array<int|string> $array
+     */
+    public static function fromArray(array $array, ?Worksheet $worksheet = null): self
+    {
+        array_walk(
+            $array,
+            function (&$column): void {
+                $column = is_numeric($column) ? Coordinate::stringFromColumnIndex((int) $column) : $column;
+            }
+        );
+        /** @var string $from */
+        /** @var string $to */
+        [$from, $to] = $array;
+
+        return new self($from, $to, $worksheet);
+    }
+
+    private function validateFromTo(int $from, int $to): void
+    {
+        // Identify actual top and bottom values (in case we've been given bottom and top)
+        $this->from = min($from, $to);
+        $this->to = max($from, $to);
+    }
+
+    public function columnCount(): int
+    {
+        return $this->to - $this->from + 1;
+    }
+
+    public function from(): string
+    {
+        return Coordinate::stringFromColumnIndex($this->from);
+    }
+
+    public function to(): string
+    {
+        return Coordinate::stringFromColumnIndex($this->to);
+    }
+
+    public function fromIndex(): int
+    {
+        return $this->from;
+    }
+
+    public function toIndex(): int
+    {
+        return $this->to;
+    }
+
+    public function toCellRange(): CellRange
+    {
+        return new CellRange(
+            CellAddress::fromColumnAndRow($this->from, 1, $this->worksheet),
+            CellAddress::fromColumnAndRow($this->to, self::MAX_ROW)
+        );
+    }
+
+    public function __toString(): string
+    {
+        $from = $this->from();
+        $to = $this->to();
+
+        if ($this->worksheet !== null) {
+            $title = str_replace("'", "''", $this->worksheet->getTitle());
+
+            return "'{$title}'!{$from}:{$to}";
+        }
+
+        return "{$from}:{$to}";
+    }
+}
--- a/src/PhpSpreadsheet/Cell/RowRange.php
+++ b/src/PhpSpreadsheet/Cell/RowRange.php
@ -0,0 +1,79 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheet\Cell;
+
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+
+class RowRange
+{
+    private const MAX_COLUMN = 'XFD';
+
+    /**
+     * @var ?Worksheet
+     */
+    protected $worksheet;
+
+    /**
+     * @var int
+     */
+    protected $from;
+
+    /**
+     * @var int
+     */
+    protected $to;
+
+    public function __construct(int $from, ?int $to = null, ?Worksheet $worksheet = null)
+    {
+        $this->validateFromTo($from, $to ?? $from);
+        $this->worksheet = $worksheet;
+    }
+
+    public static function fromArray(array $array, ?Worksheet $worksheet = null): self
+    {
+        [$from, $to] = $array;
+
+        return new self($from, $to, $worksheet);
+    }
+
+    private function validateFromTo(int $from, int $to): void
+    {
+        // Identify actual top and bottom values (in case we've been given bottom and top)
+        $this->from = min($from, $to);
+        $this->to = max($from, $to);
+    }
+
+    public function from(): int
+    {
+        return $this->from;
+    }
+
+    public function to(): int
+    {
+        return $this->to;
+    }
+
+    public function rowCount(): int
+    {
+        return $this->to - $this->from + 1;
+    }
+
+    public function toCellRange(): CellRange
+    {
+        return new CellRange(
+            CellAddress::fromColumnAndRow(Coordinate::columnIndexFromString('A'), $this->from, $this->worksheet),
+            CellAddress::fromColumnAndRow(Coordinate::columnIndexFromString(self::MAX_COLUMN), $this->to)
+        );
+    }
+
+    public function __toString(): string
+    {
+        if ($this->worksheet !== null) {
+            $title = str_replace("'", "''", $this->worksheet->getTitle());
+
+            return "'{$title}'!{$this->from}:{$this->to}";
+        }
+
+        return "{$this->from}:{$this->to}";
+    }
+}
--- a/src/PhpSpreadsheet/Worksheet/Worksheet.php
+++ b/src/PhpSpreadsheet/Worksheet/Worksheet.php
@ -5,6 +5,8 @@ namespace PhpOffice\PhpSpreadsheet\Worksheet;
 use ArrayObject;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
+use PhpOffice\PhpSpreadsheet\Cell\CellAddress;
+use PhpOffice\PhpSpreadsheet\Cell\CellRange;
 use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
 use PhpOffice\PhpSpreadsheet\Cell\DataValidation;
@ -1103,17 +1105,44 @@ class Worksheet implements IComparable
        return $this->cellCollection->getHighestRowAndColumn();
    }

+    /**
+     * Validate a cell address.
+     *
+     * @param null|array<int>|CellAddress|string $cellAddress Coordinate of the cell as a string, eg: 'C5';
+     *               or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     */
+    protected function validateCellAddress($cellAddress, bool $allowNull = false): ?string
+    {
+        if (is_string($cellAddress) || ($cellAddress === null && $allowNull === true)) {
+            if ($cellAddress === null) {
+                return null;
+            }
+            [$worksheet, $address] = self::extractSheetTitle($cellAddress, true);
+
+            return empty($worksheet) ? strtoupper($address) : $worksheet . '!' . strtoupper($address);
+        }
+
+        if (is_array($cellAddress)) {
+            $cellAddress = CellAddress::fromColumnRowArray($cellAddress);
+        }
+
+        return (string) $cellAddress;
+    }
+
    /**
     * Set a cell value.
     *
-     * @param string $coordinate Coordinate of the cell, eg: 'A1'
-     * @param mixed $value Value of the cell
+     * @param array<int>|CellAddress|string $coordinate Coordinate of the cell as a string, eg: 'C5';
+     *               or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     * @param mixed $value Value for the cell
     *
     * @return $this
     */
    public function setCellValue($coordinate, $value)
    {
-        $this->getCell($coordinate)->setValue($value);
+        /** @var string $cellAddress */
+        $cellAddress = $this->validateCellAddress($coordinate);
+        $this->getCell($cellAddress)->setValue($value);

        return $this;
    }
@ -1121,6 +1150,10 @@ class Worksheet implements IComparable
    /**
     * Set a cell value by using numeric cell coordinates.
     *
+     * @Deprecated 1.23.0
+     *      Use the setCellValue() method with a cell address such as 'C5' instead;,
+     *          or passing in an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     *
     * @param int $columnIndex Numeric column coordinate of the cell
     * @param int $row Numeric row coordinate of the cell
     * @param mixed $value Value of the cell
@ -1129,7 +1162,7 @@ class Worksheet implements IComparable
     */
    public function setCellValueByColumnAndRow($columnIndex, $row, $value)
    {
-        $this->getCellByColumnAndRow($columnIndex, $row)->setValue($value);
+        $this->getCell([$columnIndex, $row])->setValue($value);

        return $this;
    }
@ -1137,7 +1170,8 @@ class Worksheet implements IComparable
    /**
     * Set a cell value.
     *
-     * @param string $coordinate Coordinate of the cell, eg: 'A1'
+     * @param array<int>|CellAddress|string $coordinate Coordinate of the cell as a string, eg: 'C5';
+     *               or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
     * @param mixed $value Value of the cell
     * @param string $dataType Explicit data type, see DataType::TYPE_*
     *
@ -1145,8 +1179,9 @@ class Worksheet implements IComparable
     */
    public function setCellValueExplicit($coordinate, $value, $dataType)
    {
-        // Set value
-        $this->getCell($coordinate)->setValueExplicit($value, $dataType);
+        /** @var string $cellAddress */
+        $cellAddress = $this->validateCellAddress($coordinate);
+        $this->getCell($cellAddress)->setValueExplicit($value, $dataType);

        return $this;
    }
@ -1154,6 +1189,10 @@ class Worksheet implements IComparable
    /**
     * Set a cell value by using numeric cell coordinates.
     *
+     * @Deprecated 1.23.0
+     *      Use the setCellValueExplicit() method with a cell address such as 'C5' instead;,
+     *          or passing in an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     *
     * @param int $columnIndex Numeric column coordinate of the cell
     * @param int $row Numeric row coordinate of the cell
     * @param mixed $value Value of the cell
@ -1163,7 +1202,7 @@ class Worksheet implements IComparable
     */
    public function setCellValueExplicitByColumnAndRow($columnIndex, $row, $value, $dataType)
    {
-        $this->getCellByColumnAndRow($columnIndex, $row)->setValueExplicit($value, $dataType);
+        $this->getCell([$columnIndex, $row])->setValueExplicit($value, $dataType);

        return $this;
    }
@ -1171,22 +1210,26 @@ class Worksheet implements IComparable
    /**
     * Get cell at a specific coordinate.
     *
-     * @param string $coordinate Coordinate of the cell, eg: 'A1'
+     * @param array<int>|CellAddress|string $coordinate Coordinate of the cell as a string, eg: 'C5';
+     *               or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
     *
     * @return Cell Cell that was found or created
     */
-    public function getCell(string $coordinate): Cell
+    public function getCell($coordinate): Cell
    {
+        /** @var string $cellAddress */
+        $cellAddress = $this->validateCellAddress($coordinate);
+
        // Shortcut for increased performance for the vast majority of simple cases
-        if ($this->cellCollection->has($coordinate)) {
+        if ($this->cellCollection->has($cellAddress)) {
            /** @var Cell $cell */
-            $cell = $this->cellCollection->get($coordinate);
+            $cell = $this->cellCollection->get($cellAddress);

            return $cell;
        }

        /** @var Worksheet $sheet */
-        [$sheet, $finalCoordinate] = $this->getWorksheetAndCoordinate($coordinate);
+        [$sheet, $finalCoordinate] = $this->getWorksheetAndCoordinate($cellAddress);
        $cell = $sheet->cellCollection->get($finalCoordinate);

        return $cell ?? $sheet->createNewCell($finalCoordinate);
@ -1210,7 +1253,7 @@ class Worksheet implements IComparable
            $sheet = $this->parent->getSheetByName($worksheetReference[0]);
            $finalCoordinate = strtoupper($worksheetReference[1]);

-            if (!$sheet) {
+            if ($sheet === null) {
                throw new Exception('Sheet not found for name: ' . $worksheetReference[0]);
            }
        } elseif (
@ -1221,7 +1264,7 @@ class Worksheet implements IComparable
            $namedRange = $this->validateNamedRange($coordinate, true);
            if ($namedRange !== null) {
                $sheet = $namedRange->getWorksheet();
-                if (!$sheet) {
+                if ($sheet === null) {
                    throw new Exception('Sheet not found for named range: ' . $namedRange->getName());
                }

@ -1231,7 +1274,7 @@ class Worksheet implements IComparable
            }
        }

-        if (!$sheet || !$finalCoordinate) {
+        if ($sheet === null || $finalCoordinate === null) {
            $sheet = $this;
            $finalCoordinate = strtoupper($coordinate);
        }
@ -1265,6 +1308,10 @@ class Worksheet implements IComparable
    /**
     * Get cell at a specific coordinate by using numeric cell coordinates.
     *
+     * @Deprecated 1.23.0
+     *      Use the getCell() method with a cell address such as 'C5' instead;,
+     *          or passing in an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     *
     * @param int $columnIndex Numeric column coordinate of the cell
     * @param int $row Numeric row coordinate of the cell
     *
@ -1272,18 +1319,7 @@ class Worksheet implements IComparable
     */
    public function getCellByColumnAndRow($columnIndex, $row): Cell
    {
-        $columnLetter = Coordinate::stringFromColumnIndex($columnIndex);
-        $coordinate = $columnLetter . $row;
-
-        if ($this->cellCollection->has($coordinate)) {
-            /** @var Cell $cell */
-            $cell = $this->cellCollection->get($coordinate);
-
-            return $cell;
-        }
-
-        // Create new cell object, if required
-        return $this->createNewCell($coordinate);
+        return $this->getCell([$columnIndex, $row]);
    }

    /**
@ -1328,14 +1364,15 @@ class Worksheet implements IComparable
    /**
     * Does the cell at a specific coordinate exist?
     *
-     * @param string $coordinate Coordinate of the cell eg: 'A1'
-     *
-     * @return bool
+     * @param array<int>|CellAddress|string $coordinate Coordinate of the cell as a string, eg: 'C5';
+     *               or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
     */
-    public function cellExists($coordinate)
+    public function cellExists($coordinate): bool
    {
+        /** @var string $cellAddress */
+        $cellAddress = $this->validateCellAddress($coordinate);
        /** @var Worksheet $sheet */
-        [$sheet, $finalCoordinate] = $this->getWorksheetAndCoordinate($coordinate);
+        [$sheet, $finalCoordinate] = $this->getWorksheetAndCoordinate($cellAddress);

        return $sheet->cellCollection->has($finalCoordinate);
    }
@ -1343,14 +1380,16 @@ class Worksheet implements IComparable
    /**
     * Cell at a specific coordinate by using numeric cell coordinates exists?
     *
+     * @Deprecated 1.23.0
+     *      Use the cellExists() method with a cell address such as 'C5' instead;,
+     *          or passing in an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     *
     * @param int $columnIndex Numeric column coordinate of the cell
     * @param int $row Numeric row coordinate of the cell
-     *
-     * @return bool
     */
-    public function cellExistsByColumnAndRow($columnIndex, $row)
+    public function cellExistsByColumnAndRow($columnIndex, $row): bool
    {
-        return $this->cellExists(Coordinate::stringFromColumnIndex($columnIndex) . $row);
+        return $this->cellExists([$columnIndex, $row]);
    }

    /**
@ -1548,12 +1587,15 @@ class Worksheet implements IComparable
    public function getStyleByColumnAndRow($columnIndex1, $row1, $columnIndex2 = null, $row2 = null)
    {
        if ($columnIndex2 !== null && $row2 !== null) {
-            $cellRange = Coordinate::stringFromColumnIndex($columnIndex1) . $row1 . ':' . Coordinate::stringFromColumnIndex($columnIndex2) . $row2;
+            $cellRange = new CellRange(
+                CellAddress::fromColumnAndRow($columnIndex1, $row1),
+                CellAddress::fromColumnAndRow($columnIndex2, $row2)
+            );

            return $this->getStyle($cellRange);
        }

-        return $this->getStyle(Coordinate::stringFromColumnIndex($columnIndex1) . $row1);
+        return $this->getStyle(CellAddress::fromColumnAndRow($columnIndex1, $row1));
    }

    /**
@ -1640,34 +1682,38 @@ class Worksheet implements IComparable
    /**
     * Set break on a cell.
     *
-     * @param string $coordinate Cell coordinate (e.g. A1)
+     * @param array<int>|CellAddress|string $coordinate Coordinate of the cell as a string, eg: 'C5';
+     *               or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
     * @param int $break Break type (type of Worksheet::BREAK_*)
     *
     * @return $this
     */
    public function setBreak($coordinate, $break)
    {
-        // Uppercase coordinate
-        $coordinate = strtoupper($coordinate);
+        $cellAddress = $this->validateCellAddress($coordinate);

-        if ($coordinate != '') {
-            if ($break == self::BREAK_NONE) {
-                if (isset($this->breaks[$coordinate])) {
-                    unset($this->breaks[$coordinate]);
-                }
-            } else {
-                $this->breaks[$coordinate] = $break;
-            }
-        } else {
+        if ($cellAddress === '') {
            throw new Exception('No cell coordinate specified.');
        }

+        if ($break === self::BREAK_NONE) {
+            if (isset($this->breaks[$cellAddress])) {
+                unset($this->breaks[$cellAddress]);
+            }
+        } else {
+            $this->breaks[$cellAddress] = $break;
+        }
+
        return $this;
    }

    /**
     * Set break on a cell by using numeric cell coordinates.
     *
+     * @Deprecated 1.23.0
+     *      Use the setBreak() method with a cell address such as 'C5' instead;,
+     *          or passing in an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     *
     * @param int $columnIndex Numeric column coordinate of the cell
     * @param int $row Numeric row coordinate of the cell
     * @param int $break Break type (type of Worksheet::BREAK_*)
@ -1676,7 +1722,7 @@ class Worksheet implements IComparable
     */
    public function setBreakByColumnAndRow($columnIndex, $row, $break)
    {
-        return $this->setBreak(Coordinate::stringFromColumnIndex($columnIndex) . $row, $break);
+        return $this->setBreak([$columnIndex, $row], $break);
    }

    /**
@ -1779,6 +1825,11 @@ class Worksheet implements IComparable
    /**
     * Set merge on a cell range by using numeric cell coordinates.
     *
+     * @Deprecated 1.23.0
+     *      Use the mergeCells() method with a cell address range such as 'C5:E8' instead;,
+     *          or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5]),
+     *          or a CellAddress object.
+     *
     * @param int $columnIndex1 Numeric column coordinate of the first cell
     * @param int $row1 Numeric row coordinate of the first cell
     * @param int $columnIndex2 Numeric column coordinate of the last cell
@ -1788,7 +1839,10 @@ class Worksheet implements IComparable
     */
    public function mergeCellsByColumnAndRow($columnIndex1, $row1, $columnIndex2, $row2)
    {
-        $cellRange = Coordinate::stringFromColumnIndex($columnIndex1) . $row1 . ':' . Coordinate::stringFromColumnIndex($columnIndex2) . $row2;
+        $cellRange = new CellRange(
+            CellAddress::fromColumnAndRow($columnIndex1, $row1),
+            CellAddress::fromColumnAndRow($columnIndex2, $row2)
+        );

        return $this->mergeCells($cellRange);
    }
@ -1830,7 +1884,10 @@ class Worksheet implements IComparable
     */
    public function unmergeCellsByColumnAndRow($columnIndex1, $row1, $columnIndex2, $row2)
    {
-        $cellRange = Coordinate::stringFromColumnIndex($columnIndex1) . $row1 . ':' . Coordinate::stringFromColumnIndex($columnIndex2) . $row2;
+        $cellRange = new CellRange(
+            CellAddress::fromColumnAndRow($columnIndex1, $row1),
+            CellAddress::fromColumnAndRow($columnIndex2, $row2)
+        );

        return $this->unmergeCells($cellRange);
    }
@ -1896,7 +1953,10 @@ class Worksheet implements IComparable
     */
    public function protectCellsByColumnAndRow($columnIndex1, $row1, $columnIndex2, $row2, $password, $alreadyHashed = false)
    {
-        $cellRange = Coordinate::stringFromColumnIndex($columnIndex1) . $row1 . ':' . Coordinate::stringFromColumnIndex($columnIndex2) . $row2;
+        $cellRange = new CellRange(
+            CellAddress::fromColumnAndRow($columnIndex1, $row1),
+            CellAddress::fromColumnAndRow($columnIndex2, $row2)
+        );

        return $this->protectCells($cellRange, $password, $alreadyHashed);
    }
@ -1934,7 +1994,10 @@ class Worksheet implements IComparable
     */
    public function unprotectCellsByColumnAndRow($columnIndex1, $row1, $columnIndex2, $row2)
    {
-        $cellRange = Coordinate::stringFromColumnIndex($columnIndex1) . $row1 . ':' . Coordinate::stringFromColumnIndex($columnIndex2) . $row2;
+        $cellRange = new CellRange(
+            CellAddress::fromColumnAndRow($columnIndex1, $row1),
+            CellAddress::fromColumnAndRow($columnIndex2, $row2)
+        );

        return $this->unprotectCells($cellRange);
    }
@ -2026,23 +2089,26 @@ class Worksheet implements IComparable
     *     - B1 will freeze the columns to the left of cell B1 (i.e column A)
     *     - B2 will freeze the rows above and to the left of cell B2 (i.e row 1 and column A)
     *
-     * @param null|string $cell Position of the split
+     * @param null|array<int>|CellAddress|string $coordinate Coordinate of the cell as a string, eg: 'C5';
+     *               or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     *        Passing a null value for this argument will clear an existing freeze pane for this worksheet.
     * @param null|string $topLeftCell default position of the right bottom pane
     *
     * @return $this
     */
-    public function freezePane($cell, $topLeftCell = null)
+    public function freezePane($coordinate, $topLeftCell = null)
    {
-        if (is_string($cell) && Coordinate::coordinateIsRange($cell)) {
+        $cellAddress = $this->validateCellAddress($coordinate, true);
+        if (is_string($cellAddress) && Coordinate::coordinateIsRange($cellAddress)) {
            throw new Exception('Freeze pane can not be set on a range of cells.');
        }

-        if ($cell !== null && $topLeftCell === null) {
-            $coordinate = Coordinate::coordinateFromString($cell);
+        if ($cellAddress !== null && $topLeftCell === null) {
+            $coordinate = Coordinate::coordinateFromString($cellAddress);
            $topLeftCell = $coordinate[0] . $coordinate[1];
        }

-        $this->freezePane = $cell;
+        $this->freezePane = $cellAddress;
        $this->topLeftCell = $topLeftCell;

        return $this;
@ -2058,6 +2124,10 @@ class Worksheet implements IComparable
    /**
     * Freeze Pane by using numeric cell coordinates.
     *
+     * @Deprecated 1.23.0
+     *      Use the freezePane() method with a cell address such as 'C5' instead;,
+     *          or passing in an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     *
     * @param int $columnIndex Numeric column coordinate of the cell
     * @param int $row Numeric row coordinate of the cell
     *
@ -2065,7 +2135,7 @@ class Worksheet implements IComparable
     */
    public function freezePaneByColumnAndRow($columnIndex, $row)
    {
-        return $this->freezePane(Coordinate::stringFromColumnIndex($columnIndex) . $row);
+        return $this->freezePane([$columnIndex, $row]);
    }

    /**
@ -2427,31 +2497,32 @@ class Worksheet implements IComparable
    /**
     * Get comment for cell.
     *
-     * @param string $cellCoordinate Cell coordinate to get comment for, eg: 'A1'
+     * @param array<int>|CellAddress|string $cellCoordinate Coordinate of the cell as a string, eg: 'C5';
+     *               or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
     *
     * @return Comment
     */
    public function getComment($cellCoordinate)
    {
-        // Uppercase coordinate
-        $cellCoordinate = strtoupper($cellCoordinate);
+        /** @var string $cellAddress */
+        $cellAddress = $this->validateCellAddress($cellCoordinate);

-        if (Coordinate::coordinateIsRange($cellCoordinate)) {
+        if (Coordinate::coordinateIsRange($cellAddress)) {
            throw new Exception('Cell coordinate string can not be a range of cells.');
-        } elseif (strpos($cellCoordinate, '$') !== false) {
+        } elseif (strpos($cellAddress, '$') !== false) {
            throw new Exception('Cell coordinate string must not be absolute.');
-        } elseif ($cellCoordinate == '') {
+        } elseif ($cellAddress == '') {
            throw new Exception('Cell coordinate can not be zero-length string.');
        }

        // Check if we already have a comment for this cell.
-        if (isset($this->comments[$cellCoordinate])) {
-            return $this->comments[$cellCoordinate];
+        if (isset($this->comments[$cellAddress])) {
+            return $this->comments[$cellAddress];
        }

        // If not, create a new comment.
        $newComment = new Comment();
-        $this->comments[$cellCoordinate] = $newComment;
+        $this->comments[$cellAddress] = $newComment;

        return $newComment;
    }
@ -2459,6 +2530,10 @@ class Worksheet implements IComparable
    /**
     * Get comment for cell by using numeric cell coordinates.
     *
+     * @Deprecated 1.23.0
+     *      Use the getComment() method with a cell address such as 'C5' instead;,
+     *          or passing in an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     *
     * @param int $columnIndex Numeric column coordinate of the cell
     * @param int $row Numeric row coordinate of the cell
     *
@ -2466,7 +2541,7 @@ class Worksheet implements IComparable
     */
    public function getCommentByColumnAndRow($columnIndex, $row)
    {
-        return $this->getComment(Coordinate::stringFromColumnIndex($columnIndex) . $row);
+        return $this->getComment([$columnIndex, $row]);
    }

    /**
@ -2574,6 +2649,10 @@ class Worksheet implements IComparable
    /**
     * Selected cell by using numeric cell coordinates.
     *
+     * @Deprecated 1.23.0
+     *      Use the setSelectedCells() method with a cell address such as 'C5' instead;,
+     *          or passing in an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
+     *
     * @param int $columnIndex Numeric column coordinate of the cell
     * @param int $row Numeric row coordinate of the cell
     *
--- a/tests/PhpSpreadsheetTests/Cell/CellAddressTest.php
+++ b/tests/PhpSpreadsheetTests/Cell/CellAddressTest.php
@ -0,0 +1,246 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Cell;
+
+use PhpOffice\PhpSpreadsheet\Cell\CellAddress;
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PHPUnit\Framework\TestCase;
+
+class CellAddressTest extends TestCase
+{
+    /**
+     * @dataProvider providerCreateFromCellAddress
+     */
+    public function testCreateFromCellAddress(
+        string $cellAddress,
+        string $expectedColumnName,
+        int $expectedColumnId,
+        int $expectedRowId
+    ): void {
+        $cellAddressObject = CellAddress::fromCellAddress($cellAddress);
+
+        self::assertSame($cellAddress, (string) $cellAddressObject);
+        self::assertSame($cellAddress, $cellAddressObject->cellAddress());
+        self::assertSame($expectedRowId, $cellAddressObject->rowId());
+        self::assertSame($expectedColumnId, $cellAddressObject->columnId());
+        self::assertSame($expectedColumnName, $cellAddressObject->columnName());
+    }
+
+    public function providerCreateFromCellAddress(): array
+    {
+        return [
+            ['A1', 'A', 1, 1],
+            ['C5', 'C', 3, 5],
+            ['IV256', 'IV', 256, 256],
+        ];
+    }
+
+    /**
+     * @dataProvider providerCreateFromCellAddressException
+     *
+     * @param mixed $cellAddress
+     */
+    public function testCreateFromCellAddressException($cellAddress): void
+    {
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage(
+            $cellAddress === ''
+                ? 'Cell coordinate can not be zero-length string'
+                : "Invalid cell coordinate {$cellAddress}"
+        );
+
+        CellAddress::fromCellAddress($cellAddress);
+    }
+
+    public function providerCreateFromCellAddressException(): array
+    {
+        return [
+            ['INVALID'],
+            [''],
+            ['IV'],
+            ['12'],
+            [123],
+        ];
+    }
+
+    /**
+     * @dataProvider providerCreateFromColumnAndRow
+     */
+    public function testCreateFromColumnAndRow(
+        int $columnId,
+        int $rowId,
+        string $expectedCellAddress,
+        string $expectedColumnName
+    ): void {
+        $cellAddressObject = CellAddress::fromColumnAndRow($columnId, $rowId);
+
+        self::assertSame($expectedCellAddress, (string) $cellAddressObject);
+        self::assertSame($expectedCellAddress, $cellAddressObject->cellAddress());
+        self::assertSame($rowId, $cellAddressObject->rowId());
+        self::assertSame($columnId, $cellAddressObject->columnId());
+        self::assertSame($expectedColumnName, $cellAddressObject->columnName());
+    }
+
+    /**
+     * @dataProvider providerCreateFromColumnRowException
+     *
+     * @param mixed $columnId
+     * @param mixed $rowId
+     */
+    public function testCreateFromColumnRowException($columnId, $rowId): void
+    {
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage('Row and Column Ids must be positive integer values');
+
+        CellAddress::fromColumnAndRow($columnId, $rowId);
+    }
+
+    public function providerCreateFromColumnAndRow(): array
+    {
+        return [
+            [1, 1, 'A1', 'A'],
+            [3, 5, 'C5', 'C'],
+            [256, 256, 'IV256', 'IV'],
+        ];
+    }
+
+    /**
+     * @dataProvider providerCreateFromColumnRowArray
+     */
+    public function testCreateFromColumnRowArray(
+        int $columnId,
+        int $rowId,
+        string $expectedCellAddress,
+        string $expectedColumnName
+    ): void {
+        $columnRowArray = [$columnId, $rowId];
+        $cellAddressObject = CellAddress::fromColumnRowArray($columnRowArray);
+
+        self::assertSame($expectedCellAddress, (string) $cellAddressObject);
+        self::assertSame($expectedCellAddress, $cellAddressObject->cellAddress());
+        self::assertSame($rowId, $cellAddressObject->rowId());
+        self::assertSame($columnId, $cellAddressObject->columnId());
+        self::assertSame($expectedColumnName, $cellAddressObject->columnName());
+    }
+
+    public function providerCreateFromColumnRowArray(): array
+    {
+        return [
+            [1, 1, 'A1', 'A'],
+            [3, 5, 'C5', 'C'],
+            [256, 256, 'IV256', 'IV'],
+        ];
+    }
+
+    /**
+     * @dataProvider providerCreateFromColumnRowException
+     *
+     * @param mixed $columnId
+     * @param mixed $rowId
+     */
+    public function testCreateFromColumnRowArrayException($columnId, $rowId): void
+    {
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage('Row and Column Ids must be positive integer values');
+
+        $columnRowArray = [$columnId, $rowId];
+        CellAddress::fromColumnRowArray($columnRowArray);
+    }
+
+    public function providerCreateFromColumnRowException(): array
+    {
+        return [
+            [-1, 1],
+            [3, 'A'],
+        ];
+    }
+
+    /**
+     * @dataProvider providerCreateFromCellAddressWithWorksheet
+     */
+    public function testCreateFromCellAddressWithWorksheet(
+        string $cellAddress,
+        string $expectedCellAddress,
+        string $expectedColumnName,
+        int $expectedColumnId,
+        int $expectedRowId
+    ): void {
+        $spreadsheet = new Spreadsheet();
+        $worksheet = $spreadsheet->getActiveSheet();
+        $worksheet->setTitle("Mark's Worksheet");
+
+        $cellAddressObject = CellAddress::fromCellAddress($cellAddress, $worksheet);
+
+        self::assertSame($expectedCellAddress, (string) $cellAddressObject);
+        self::assertSame($cellAddress, $cellAddressObject->cellAddress());
+        self::assertSame($expectedRowId, $cellAddressObject->rowId());
+        self::assertSame($expectedColumnId, $cellAddressObject->columnId());
+        self::assertSame($expectedColumnName, $cellAddressObject->columnName());
+    }
+
+    public function providerCreateFromCellAddressWithWorksheet(): array
+    {
+        return [
+            ['A1', "'Mark''s Worksheet'!A1", 'A', 1, 1],
+            ['C5', "'Mark''s Worksheet'!C5", 'C', 3, 5],
+            ['IV256', "'Mark''s Worksheet'!IV256", 'IV', 256, 256],
+        ];
+    }
+
+    public function testNextRow(): void
+    {
+        $cellAddress = CellAddress::fromCellAddress('C5');
+        // default single row
+        $cellAddressC6 = $cellAddress->nextRow();
+        self::assertSame('C6', (string) $cellAddressC6);
+        // multiple rows
+        $cellAddressC9 = $cellAddress->nextRow(4);
+        self::assertSame('C9', (string) $cellAddressC9);
+        // negative rows
+        $cellAddressC3 = $cellAddress->nextRow(-2);
+        self::assertSame('C3', (string) $cellAddressC3);
+        // negative beyond the minimum
+        $cellAddressC1 = $cellAddress->nextRow(-10);
+        self::assertSame('C1', (string) $cellAddressC1);
+
+        // Check that the original object is still unchanged
+        self::assertSame('C5', (string) $cellAddress);
+    }
+
+    public function testPreviousRow(): void
+    {
+        $cellAddress = CellAddress::fromCellAddress('C5');
+        // default single row
+        $cellAddressC4 = $cellAddress->previousRow();
+        self::assertSame('C4', (string) $cellAddressC4);
+    }
+
+    public function testNextColumn(): void
+    {
+        $cellAddress = CellAddress::fromCellAddress('C5');
+        // default single row
+        $cellAddressD5 = $cellAddress->nextColumn();
+        self::assertSame('D5', (string) $cellAddressD5);
+        // multiple rows
+        $cellAddressG5 = $cellAddress->nextColumn(4);
+        self::assertSame('G5', (string) $cellAddressG5);
+        // negative rows
+        $cellAddressB5 = $cellAddress->nextColumn(-1);
+        self::assertSame('B5', (string) $cellAddressB5);
+        // negative beyond the minimum
+        $cellAddressA5 = $cellAddress->nextColumn(-10);
+        self::assertSame('A5', (string) $cellAddressA5);
+
+        // Check that the original object is still unchanged
+        self::assertSame('C5', (string) $cellAddress);
+    }
+
+    public function testPreviousColumn(): void
+    {
+        $cellAddress = CellAddress::fromCellAddress('C5');
+        // default single row
+        $cellAddressC4 = $cellAddress->previousColumn();
+        self::assertSame('B5', (string) $cellAddressC4);
+    }
+}
--- a/tests/PhpSpreadsheetTests/Cell/CellRangeTest.php
+++ b/tests/PhpSpreadsheetTests/Cell/CellRangeTest.php
@ -0,0 +1,113 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Cell;
+
+use PhpOffice\PhpSpreadsheet\Cell\CellAddress;
+use PhpOffice\PhpSpreadsheet\Cell\CellRange;
+use PhpOffice\PhpSpreadsheet\Exception;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
+use PHPUnit\Framework\TestCase;
+
+class CellRangeTest extends TestCase
+{
+    public function testCreateCellRange(): void
+    {
+        $from = CellAddress::fromCellAddress('B5');
+        $to = CellAddress::fromCellAddress('E2');
+        $cellRange = new CellRange($from, $to);
+        self::assertSame('B2:E5', (string) $cellRange);
+    }
+
+    public function testCreateCellRangeWithWorksheet(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $worksheet = $spreadsheet->getActiveSheet();
+        $worksheet->setTitle("Mark's Worksheet");
+
+        $from = CellAddress::fromCellAddress('B5', $worksheet);
+        $to = CellAddress::fromCellAddress('E2');
+        $cellRange = new CellRange($from, $to);
+        self::assertSame("'Mark''s Worksheet'!B2:E5", (string) $cellRange);
+    }
+
+    public function testCreateCellRangeWithWorksheets(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $worksheet = $spreadsheet->getActiveSheet();
+        $worksheet->setTitle("Mark's Worksheet");
+
+        $from = CellAddress::fromCellAddress('B5', $worksheet);
+        $to = CellAddress::fromCellAddress('E2', $worksheet);
+        $cellRange = new CellRange($from, $to);
+        self::assertSame("'Mark''s Worksheet'!B2:E5", (string) $cellRange);
+    }
+
+    public function testSingleCellRange(): void
+    {
+        $from = CellAddress::fromCellAddress('C3');
+        $to = CellAddress::fromCellAddress('C3');
+        $cellRange = new CellRange($from, $to);
+        self::assertSame('C3', (string) $cellRange);
+    }
+
+    public function testSingleCellRangeWithWorksheet(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $worksheet = $spreadsheet->getActiveSheet();
+        $worksheet->setTitle("Mark's Worksheet");
+
+        $from = CellAddress::fromCellAddress('C3', $worksheet);
+        $to = CellAddress::fromCellAddress('C3');
+        $cellRange = new CellRange($from, $to);
+        self::assertSame("'Mark''s Worksheet'!C3", (string) $cellRange);
+    }
+
+    public function testRangeFrom(): void
+    {
+        $from = CellAddress::fromCellAddress('B5');
+        $to = CellAddress::fromCellAddress('E2');
+        $cellRange = new CellRange($from, $to);
+        self::assertSame('B2', (string) $cellRange->from());
+    }
+
+    public function testRangeTo(): void
+    {
+        $from = CellAddress::fromCellAddress('B5');
+        $to = CellAddress::fromCellAddress('E2');
+        $cellRange = new CellRange($from, $to);
+        self::assertSame('E5', (string) $cellRange->to());
+    }
+
+    public function testCreateCellRangeWithMismatchedWorksheets(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $worksheet = $spreadsheet->getActiveSheet();
+        $worksheet->setTitle("Mark's Worksheet");
+        $secondWorksheet = new Worksheet($spreadsheet, 'A Second Worksheet');
+
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage('3d Cell Ranges are not supported');
+
+        $from = CellAddress::fromCellAddress('B5', $worksheet);
+        $to = CellAddress::fromCellAddress('E2', $secondWorksheet);
+        new CellRange($from, $to);
+    }
+
+    public function testCreateCellRangeWithMismatchedSpreadsheets(): void
+    {
+        $spreadsheet1 = new Spreadsheet();
+        $worksheet1 = $spreadsheet1->getActiveSheet();
+        $worksheet1->setTitle("Mark's Worksheet");
+        $spreadsheet2 = new Spreadsheet();
+        $worksheet2 = $spreadsheet2->getActiveSheet();
+        $worksheet2->setTitle("Mark's Worksheet");
+
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage('Worksheets must be in the same spreadsheet');
+
+        $from = CellAddress::fromCellAddress('B5', $worksheet1);
+        $to = CellAddress::fromCellAddress('E2', $worksheet2);
+        new CellRange($from, $to);
+    }
+}
--- a/tests/PhpSpreadsheetTests/Cell/ColumnRangeTest.php
+++ b/tests/PhpSpreadsheetTests/Cell/ColumnRangeTest.php
@ -0,0 +1,65 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Cell;
+
+use PhpOffice\PhpSpreadsheet\Cell\ColumnRange;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PHPUnit\Framework\TestCase;
+
+class ColumnRangeTest extends TestCase
+{
+    public function testCreateColumnRange(): void
+    {
+        $columnRange = new ColumnRange('C', 'E');
+        self::assertSame('C', $columnRange->from());
+        self::assertSame('E', $columnRange->to());
+        self::assertSame(3, $columnRange->fromIndex());
+        self::assertSame(5, $columnRange->toIndex());
+        self::assertSame('C:E', (string) $columnRange);
+        self::assertSame(3, $columnRange->columnCount());
+        self::assertSame('C1:E1048576', (string) $columnRange->toCellRange());
+    }
+
+    public function testCreateSingleColumnRange(): void
+    {
+        $columnRange = new ColumnRange('E');
+        self::assertSame('E', $columnRange->from());
+        self::assertSame('E', $columnRange->to());
+        self::assertSame('E:E', (string) $columnRange);
+        self::assertSame(1, $columnRange->columnCount());
+        self::assertSame('E1:E1048576', (string) $columnRange->toCellRange());
+    }
+
+    public function testCreateColumnRangeWithWorksheet(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $worksheet = $spreadsheet->getActiveSheet();
+        $worksheet->setTitle("Mark's Worksheet");
+
+        $columnRange = new ColumnRange('C', 'E', $worksheet);
+        self::assertSame('C', $columnRange->from());
+        self::assertSame('E', $columnRange->to());
+        self::assertSame("'Mark''s Worksheet'!C:E", (string) $columnRange);
+        self::assertSame("'Mark''s Worksheet'!C1:E1048576", (string) $columnRange->toCellRange());
+    }
+
+    public function testCreateColumnRangeFromArray(): void
+    {
+        $columnRange = ColumnRange::fromArray(['C', 'E']);
+        self::assertSame('C', $columnRange->from());
+        self::assertSame('E', $columnRange->to());
+        self::assertSame('C:E', (string) $columnRange);
+        self::assertSame(3, $columnRange->columnCount());
+        self::assertSame('C1:E1048576', (string) $columnRange->toCellRange());
+    }
+
+    public function testCreateColumnRangeFromIndexes(): void
+    {
+        $columnRange = ColumnRange::fromColumnIndexes(3, 5);
+        self::assertSame('C', $columnRange->from());
+        self::assertSame('E', $columnRange->to());
+        self::assertSame('C:E', (string) $columnRange);
+        self::assertSame(3, $columnRange->columnCount());
+        self::assertSame('C1:E1048576', (string) $columnRange->toCellRange());
+    }
+}
--- a/tests/PhpSpreadsheetTests/Cell/RowRangeTest.php
+++ b/tests/PhpSpreadsheetTests/Cell/RowRangeTest.php
@ -0,0 +1,51 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Cell;
+
+use PhpOffice\PhpSpreadsheet\Cell\RowRange;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PHPUnit\Framework\TestCase;
+
+class RowRangeTest extends TestCase
+{
+    public function testCreateRowRange(): void
+    {
+        $rowRange = new RowRange(3, 5);
+        self::assertSame(3, $rowRange->from());
+        self::assertSame(5, $rowRange->to());
+        self::assertSame('3:5', (string) $rowRange);
+        self::assertSame(3, $rowRange->rowCount());
+        self::assertSame('A3:XFD5', (string) $rowRange->toCellRange());
+    }
+
+    public function testCreateSingleRowRange(): void
+    {
+        $rowRange = new RowRange(3);
+        self::assertSame(3, $rowRange->from());
+        self::assertSame(3, $rowRange->to());
+        self::assertSame('3:3', (string) $rowRange);
+        self::assertSame(1, $rowRange->rowCount());
+    }
+
+    public function testCreateRowRangeWithWorksheet(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $worksheet = $spreadsheet->getActiveSheet();
+        $worksheet->setTitle("Mark's Worksheet");
+
+        $rowRange = new RowRange(3, 5, $worksheet);
+        self::assertSame(3, $rowRange->from());
+        self::assertSame(5, $rowRange->to());
+        self::assertSame("'Mark''s Worksheet'!3:5", (string) $rowRange);
+    }
+
+    public function testCreateRowRangeFromArray(): void
+    {
+        $rowRange = RowRange::fromArray([3, 5]);
+        self::assertSame(3, $rowRange->from());
+        self::assertSame(5, $rowRange->to());
+        self::assertSame('3:5', (string) $rowRange);
+        self::assertSame(3, $rowRange->rowCount());
+        self::assertSame('A3:XFD5', (string) $rowRange->toCellRange());
+    }
+}