-
Notifications
You must be signed in to change notification settings - Fork 3.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix #3552. Inserting rows or columns can cause page break arrays to be out of order. Sort them in Worksheet functions getBreaks, getRowBreaks, and getColumnBreaks before returning to caller.
- Loading branch information
Showing
3 changed files
with
74 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
<?php | ||
|
||
namespace PhpOffice\PhpSpreadsheetTests\Reader\Xlsx; | ||
|
||
use PhpOffice\PhpSpreadsheet\Reader\Xlsx; | ||
use PhpOffice\PhpSpreadsheet\Spreadsheet; | ||
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet; | ||
use PhpOffice\PhpSpreadsheetTests\Functional\AbstractFunctional; | ||
|
||
class Issue3552Test extends AbstractFunctional | ||
{ | ||
/** | ||
* @var string | ||
*/ | ||
private static $testbook = 'tests/data/Reader/XLSX/issue.3552.xlsx'; | ||
|
||
public function testRowBreaks(): void | ||
{ | ||
$reader = new Xlsx(); | ||
$spreadsheet = $reader->load(self::$testbook); | ||
$sheet = $spreadsheet->getActiveSheet(); | ||
self::assertSame(['A92', 'A184', 'A276', 'A368', 'A417', 'A511', 'A554'], array_keys($sheet->getRowBreaks())); | ||
$sheet->insertNewRowBefore(397, 1); | ||
$reloadedSpreadsheet = $this->writeAndReload($spreadsheet, 'Xlsx'); | ||
$spreadsheet->disconnectWorksheets(); | ||
$reloadedSheet = $reloadedSpreadsheet->getActiveSheet(); | ||
self::assertSame(['A92', 'A184', 'A276', 'A368', 'A418', 'A512', 'A555'], array_keys($reloadedSheet->getRowBreaks())); | ||
$reloadedSpreadsheet->disconnectWorksheets(); | ||
} | ||
|
||
public function testColumnBreaks(): void | ||
{ | ||
$spreadsheet = new Spreadsheet(); | ||
$sheet = $spreadsheet->getActiveSheet(); | ||
$sheet->setBreak('Z1', Worksheet::BREAK_COLUMN); | ||
$sheet->setBreak('H1', Worksheet::BREAK_COLUMN); | ||
$sheet->setBreak('P1', Worksheet::BREAK_COLUMN); | ||
self::assertSame(['H1', 'P1', 'Z1'], array_keys($sheet->getColumnBreaks())); | ||
$sheet->insertNewColumnBefore('N', 2); | ||
self::assertSame(['H1', 'R1', 'AB1'], array_keys($sheet->getColumnBreaks())); | ||
$spreadsheet->disconnectWorksheets(); | ||
} | ||
} |
Binary file not shown.