alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Stricter typing for mergeCells 

Closes #1494
This commit is contained in:
Adrien Crivelli 2020-05-31 15:58:57 +09:00
parent 8b2bba9bdb
commit c434e9b137
No known key found for this signature in database
GPG Key ID: B182FD79DC6DE92E
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
- Fix incorrect behaviour when saving XLSX file with drawings [#1462](https://github.com/PHPOffice/PhpSpreadsheet/pull/1462), - Fix incorrect behaviour when saving XLSX file with drawings [#1462](https://github.com/PHPOffice/PhpSpreadsheet/pull/1462),
- Fix Crash while trying setting a cell the value "123456\n" [#1476](https://github.com/PHPOffice/PhpSpreadsheet/pull/1481) - Fix Crash while trying setting a cell the value "123456\n" [#1476](https://github.com/PHPOffice/PhpSpreadsheet/pull/1481)
- Improved DATEDIF() function and reduced errors for Y and YM units [#1466](https://github.com/PHPOffice/PhpSpreadsheet/pull/1466) - Improved DATEDIF() function and reduced errors for Y and YM units [#1466](https://github.com/PHPOffice/PhpSpreadsheet/pull/1466)
- Stricter typing for mergeCells [#1494](https://github.com/PHPOffice/PhpSpreadsheet/pull/1494)
### Changed ### Changed

6
src/PhpSpreadsheet/Worksheet/Worksheet.php
View File

@ -187,7 +187,7 @@ class Worksheet implements IComparable
/** /**
* Collection of merged cell ranges. * Collection of merged cell ranges.
* *
* @var array * @var string[]
*/ */
private $mergeCells = []; private $mergeCells = [];
@ -1747,7 +1747,7 @@ class Worksheet implements IComparable
/** /**
* Get merge cells array. * Get merge cells array.
* *
* @return array[] * @return string[]
*/ */
public function getMergeCells() public function getMergeCells()
{ {
@ -1758,6 +1758,8 @@ class Worksheet implements IComparable
* Set merge cells array for the entire sheet. Use instead mergeCells() to merge * Set merge cells array for the entire sheet. Use instead mergeCells() to merge
* a single cell range. * a single cell range.
* *
* @param string[] $pValue
*
* @return $this * @return $this
*/ */
public function setMergeCells(array $pValue) public function setMergeCells(array $pValue)