-
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.
Support Data Validations in More Versions of Excel (#2377)
* Support Data Validations in More Versions of Excel Attempt to deal with #2368, this time for good. Some deleted code was accidentally restored just before release 19, causing errors in spreadsheets with Data Validations. PR #2369 removed the duplicated code, and the fix was confirmed in current versions of Excel for Windows, Google sheets, and other versions of Excel. However, there were problems reported in earlier version of Excel for Windows, and some, versions of Excel for Mac, not all but including a recent one. This change, which is simpler than the original (no need for extLst) fix for DataValidations, is tested with Excel 2007 and Excel 2003 as well as more recent versions. I do not have a Mac on which to test. * Multiple Identical Data Validation Lists Using the same Data Validation List in multiple places on a worksheet caused them all to be merged into the same range. This was because sqref was not part of the hash code; it is now, avoiding this problem. * Must Write Data Validations Before Hyperlinks See discussion in #2389.
- Loading branch information
Showing
4 changed files
with
89 additions
and
20 deletions.
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
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,78 @@ | ||
| <?php | ||
|
|
||
| namespace PhpOffice\PhpSpreadsheetTests\Writer\Xlsx; | ||
|
|
||
| use PhpOffice\PhpSpreadsheet\Cell\DataValidation; | ||
| use PhpOffice\PhpSpreadsheet\IOFactory; | ||
| use PhpOffice\PhpSpreadsheet\Shared\File; | ||
| use PhpOffice\PhpSpreadsheet\Spreadsheet; | ||
| use PhpOffice\PhpSpreadsheet\Writer\Xlsx as Writer; | ||
| use PhpOffice\PhpSpreadsheetTests\Functional\AbstractFunctional; | ||
|
|
||
| class Issue2368Test extends AbstractFunctional | ||
| { | ||
| public function testBoolWrite(): void | ||
| { | ||
| // DataValidations were incorrectly written twice. | ||
| $spreadsheet = new Spreadsheet(); | ||
| $sheet = $spreadsheet->getActiveSheet(); | ||
| $validation = $sheet->getDataValidation('A1:A10'); | ||
| $validation->setType(DataValidation::TYPE_LIST); | ||
| $validation->setShowDropDown(true); | ||
| $validation->setFormula1('"Option 1, Option 2"'); | ||
|
|
||
| $outputFilename = File::temporaryFilename(); | ||
| $writer = new Writer($spreadsheet); | ||
| $writer->save($outputFilename); | ||
| $zipfile = "zip://$outputFilename#xl/worksheets/sheet1.xml"; | ||
| $contents = file_get_contents($zipfile); | ||
| unlink($outputFilename); | ||
| $spreadsheet->disconnectWorksheets(); | ||
| if ($contents === false) { | ||
| self::fail('Unable to open file'); | ||
| } else { | ||
| self::assertSame(0, substr_count($contents, '<extLst>')); | ||
| self::assertSame(2, substr_count($contents, 'dataValidations')); // start and end tags | ||
| } | ||
| } | ||
|
|
||
| public function testMultipleRange(): void | ||
| { | ||
| // DataValidations which were identical except for sqref were incorrectly merged. | ||
| $filename = 'tests/data/Writer/XLSX/issue.2368new.xlsx'; | ||
| $reader = IOFactory::createReader('Xlsx'); | ||
| $spreadsheet = $reader->load($filename); | ||
| $sheet = $spreadsheet->getActiveSheet(); | ||
| $validations = $sheet->getDataValidationCollection(); | ||
| /** @var string[] */ | ||
| $ranges = []; | ||
| foreach ($validations as $validation) { | ||
| $ranges[] = $validation->getSqref(); | ||
| } | ||
| self::assertContains('A1:A5', $ranges); | ||
| self::assertContains('A10:A14', $ranges); | ||
| self::assertContains('A20:A24', $ranges); | ||
| self::assertSame('"yes,no"', $sheet->getCell('A3')->getDataValidation()->getFormula1()); | ||
| self::assertSame('"yes,no"', $sheet->getCell('A10')->getDataValidation()->getFormula1()); | ||
| self::assertSame('"yes,no"', $sheet->getCell('A24')->getDataValidation()->getFormula1()); | ||
|
|
||
| $reloadedSpreadsheet = $this->writeAndReload($spreadsheet, 'Xlsx'); | ||
| $spreadsheet->disconnectWorksheets(); | ||
|
|
||
| $sheet2 = $reloadedSpreadsheet->getActiveSheet(); | ||
| $validation2 = $sheet2->getDataValidationCollection(); | ||
| /** @var string[] */ | ||
| $range2 = []; | ||
| foreach ($validation2 as $validation) { | ||
| $range2[] = $validation->getSqref(); | ||
| } | ||
| self::assertContains('A1:A5', $range2); | ||
| self::assertContains('A10:A14', $range2); | ||
| self::assertContains('A20:A24', $range2); | ||
| self::assertSame('"yes,no"', $sheet2->getCell('A3')->getDataValidation()->getFormula1()); | ||
| self::assertSame('"yes,no"', $sheet2->getCell('A10')->getDataValidation()->getFormula1()); | ||
| self::assertSame('"yes,no"', $sheet2->getCell('A24')->getDataValidation()->getFormula1()); | ||
|
|
||
| $reloadedSpreadsheet->disconnectWorksheets(); | ||
| } | ||
| } |
Binary file not shown.