Merge branch 'master' into issue3866

tests/PhpSpreadsheetTests/Cell/AdvancedValueBinderTest.php

@@ -150,6 +150,12 @@ class AdvancedValueBinderTest extends TestCase
             ['1 16/20', 1.8],
             ['12 20/100', 12.2],
             ['-1 4/20', -1.2],
+            ['407 / ', '407 / '],
+            ['407 /', '407 /'],
+            ['407 3/', '407 3/'],
+            ['-407 /4', -101.75],
+            [' /', ' /'],
+            [' / ', ' / '],
         ];
     }
 

tests/PhpSpreadsheetTests/Functional/ReadBlankCellsTest.php

@@ -4,44 +4,89 @@ declare(strict_types=1);
 
 namespace PhpOffice\PhpSpreadsheetTests\Functional;
 
-use PhpOffice\PhpSpreadsheet\Reader\IReader;
-use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 
 class ReadBlankCellsTest extends AbstractFunctional
 {
     public static function providerSheetFormat(): array
     {
         return [
-            ['Xlsx'],
-            ['Xls'],
-            // ['Ods'], // Broken. Requires fix in Ods reader.
-            // ['Csv'], // never reads blank cells
-            // ['Html'], // never reads blank cells
+            ['Xlsx', false],
+            ['Xls', true],
+            ['Ods', true],
+            ['Csv', false],
+            ['Html', false],
         ];
     }
 
+    /**
+     * Test load file with explicitly empty cells.
+     */
+    public function testLoadReadEmptyCells(): void
+    {
+        $filename = 'tests/data/Reader/XLSX/blankcell.xlsx';
+        $reader = new Xlsx();
+        $reloadedSpreadsheet = $reader->load($filename);
+        self::assertTrue($reloadedSpreadsheet->getActiveSheet()->getCellCollection()->has('B2'));
+        self::assertFalse($reloadedSpreadsheet->getActiveSheet()->getCellCollection()->has('C2'));
+        self::assertTrue($reloadedSpreadsheet->getActiveSheet()->getCellCollection()->has('C3'));
+        $reloadedSpreadsheet->disconnectWorksheets();
+    }
+
+    /**
+     * Test load file ignoring empty cells.
+     */
+    public function testLoadDontReadEmptyCells(): void
+    {
+        $filename = 'tests/data/Reader/XLSX/blankcell.xlsx';
+        $reader = new Xlsx();
+        $reader->setReadEmptyCells(false);
+        $reloadedSpreadsheet = $reader->load($filename);
+        self::assertFalse($reloadedSpreadsheet->getActiveSheet()->getCellCollection()->has('B2'));
+        self::assertFalse($reloadedSpreadsheet->getActiveSheet()->getCellCollection()->has('C2'));
+        self::assertTrue($reloadedSpreadsheet->getActiveSheet()->getCellCollection()->has('C3'));
+        $reloadedSpreadsheet->disconnectWorksheets();
+    }
+
     /**
      * Test generate file with some empty cells.
      *
      * @dataProvider providerSheetFormat
      */
-    public function testXlsxLoadWithNoBlankCells(mixed $format): void
+    public function testLoadAndSaveReadEmpty(string $format, bool $expected): void
     {
-        $spreadsheet = new Spreadsheet();
-        $spreadsheet->getActiveSheet()->getCell('B2')->setValue('');
-        $spreadsheet->getActiveSheet()->getCell('C1')->setValue('C1');
-        $spreadsheet->getActiveSheet()->getCell('C3')->setValue('C3');
-
+        $filename = 'tests/data/Reader/XLSX/blankcell.xlsx';
+        $reader = new Xlsx();
+        //$reader->setReadEmptyCells(false);
+        $spreadsheet = $reader->load($filename);
         $reloadedSpreadsheet = $this->writeAndReload($spreadsheet, $format);
-        self::assertTrue($reloadedSpreadsheet->getActiveSheet()->getCellCollection()->has('B2'));
+        $spreadsheet->disconnectWorksheets();
+        self::assertSame($expected, $reloadedSpreadsheet->getActiveSheet()->getCellCollection()->has('B2'));
+        if ($expected) {
+            self::assertContains($reloadedSpreadsheet->getActiveSheet()->getCell('B2')->getValue(), ['', null]);
+        }
         self::assertFalse($reloadedSpreadsheet->getActiveSheet()->getCellCollection()->has('C2'));
         self::assertTrue($reloadedSpreadsheet->getActiveSheet()->getCellCollection()->has('C3'));
+        $reloadedSpreadsheet->disconnectWorksheets();
+    }
+
+    /**
+     * Test generate file with some empty cells.
+     *
+     * @dataProvider providerSheetFormat
+     */
+    public function testLoadAndSaveDontReadEmpty(string $format): void
+    {
+        $filename = 'tests/data/Reader/XLSX/blankcell.xlsx';
+        $reader = new Xlsx();
+        $reader->setReadEmptyCells(false);
+        $spreadsheet = $reader->load($filename);
+        $reloadedSpreadsheet = $this->writeAndReload($spreadsheet, $format);
+        $spreadsheet->disconnectWorksheets();
 
-        $reloadedSpreadsheet = $this->writeAndReload($spreadsheet, $format, function (IReader $reader): void {
-            $reader->setReadEmptyCells(false);
-        });
         self::assertFalse($reloadedSpreadsheet->getActiveSheet()->getCellCollection()->has('B2'));
         self::assertFalse($reloadedSpreadsheet->getActiveSheet()->getCellCollection()->has('C2'));
         self::assertTrue($reloadedSpreadsheet->getActiveSheet()->getCellCollection()->has('C3'));
+        $reloadedSpreadsheet->disconnectWorksheets();
     }
 }

tests/PhpSpreadsheetTests/Reader/Xlsx/Issue3863Test.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Cell\DataValidator;
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+
+class Issue3863Test extends \PHPUnit\Framework\TestCase
+{
+    private static string $testbook = 'tests/data/Reader/XLSX/issue.3863.xlsx';
+
+    public function testPreliminaries(): void
+    {
+        $file = 'zip://';
+        $file .= self::$testbook;
+        $file .= '#xl/worksheets/sheet1.xml';
+        $data = file_get_contents($file);
+        if ($data === false) {
+            self::fail('Unable to read file');
+        } else {
+            // Only 1 Data Validation and it does not specify operator
+            self::assertStringContainsString('<dataValidations count="1"><dataValidation type="whole" allowBlank="1" showInputMessage="1" showErrorMessage="1" sqref="A1" xr:uid="{D0F98CC5-7234-4ADF-BD42-F33321DCD3CA}"><formula1>5</formula1><formula2>10</formula2></dataValidation></dataValidations>', $data);
+        }
+    }
+
+    public function testValidData(): void
+    {
+        $reader = new Xlsx();
+        $spreadsheet = $reader->load(self::$testbook);
+        $sheet = $spreadsheet->getActiveSheet();
+        self::assertSame('between', $sheet->getCell('A1')->getDataValidation()->getOperator());
+        $validator = new DataValidator();
+        self::assertTrue($validator->isValid($sheet->getCell('A1')));
+        $sheet->getCell('A1')->setValue(3);
+        self::assertFalse($validator->isValid($sheet->getCell('A1')));
+        $sheet->getCell('A1')->setValue(7);
+        self::assertTrue($validator->isValid($sheet->getCell('A1')));
+        $spreadsheet->disconnectWorksheets();
+    }
+}

tests/PhpSpreadsheetTests/Worksheet/CopyCellsTest.php

@@ -0,0 +1,85 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpOffice\PhpSpreadsheetTests\Worksheet;
+
+use PhpOffice\PhpSpreadsheet\Exception as SpreadsheetException;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PHPUnit\Framework\TestCase;
+
+class CopyCellsTest extends TestCase
+{
+    public function testCopyCells(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->fromArray(
+            [
+                ['hello1', 'goodbye1', 'neither1', 'constant'],
+                ['hello2', 'goodbye2', 'neither2'],
+                ['hello3', 'goodbye3', 'neither3'],
+                ['hello4', 'goodbye4', 'neither4'],
+                ['hello5', 'goodbye5', 'neither5'],
+            ],
+        );
+        $sheet->getCell('E3')->setValue('=A1&B1');
+        $sheet->getStyle('E3')->getFont()->setBold(true);
+        $sheet->copyCells('E3', 'E3:F7');
+        $result1 = $sheet->rangeToArray('E3:F7', null, false, false);
+        $expected1 = [
+            ['=A1&B1', '=B1&C1'],
+            ['=A2&B2', '=B2&C2'],
+            ['=A3&B3', '=B3&C3'],
+            ['=A4&B4', '=B4&C4'],
+            ['=A5&B5', '=B5&C5'],
+        ];
+        self::assertSame($expected1, $result1);
+        self::assertSame('goodbye3neither3', $sheet->getCell('F5')->getCalculatedValue());
+        self::assertTrue($sheet->getCell('F5')->getStyle()->getFont()->getBold());
+
+        $sheet->getCell('E14')->setValue('=A5&$D$1');
+        $sheet->copyCells('E14', 'E10:E14');
+        $result2 = $sheet->rangeToArray('E10:E14', null, false, false);
+        $expected2 = [
+            ['=A1&$D$1'],
+            ['=A2&$D$1'],
+            ['=A3&$D$1'],
+            ['=A4&$D$1'],
+            ['=A5&$D$1'],
+        ];
+        self::assertSame($expected2, $result2);
+        self::assertSame('hello4constant', $sheet->getCell('E13')->getCalculatedValue());
+
+        $sheet->getCell('I3')->setValue('=A1&$B1');
+        $sheet->getStyle('I3')->getFont()->setItalic(true);
+        $sheet->copyCells('I3', 'I3:J7', false);
+        $result3 = $sheet->rangeToArray('I3:J7', null, false, false);
+        $expected3 = [
+            ['=A1&$B1', '=B1&$B1'],
+            ['=A2&$B2', '=B2&$B2'],
+            ['=A3&$B3', '=B3&$B3'],
+            ['=A4&$B4', '=B4&$B4'],
+            ['=A5&$B5', '=B5&$B5'],
+        ];
+        self::assertSame($expected3, $result3);
+        self::assertSame('hello2goodbye2', $sheet->getCell('I4')->getCalculatedValue());
+        self::assertFalse($sheet->getCell('I5')->getStyle()->getFont()->getItalic());
+
+        try {
+            $sheet->copyCells('invalid', 'Z1:Z10');
+            self::fail('Did not receive expected exception');
+        } catch (SpreadsheetException $e) {
+            self::assertStringContainsString('Invalid cell coordinate', $e->getMessage());
+        }
+
+        try {
+            $sheet->copyCells('A1', 'invalid');
+            self::fail('Did not receive expected exception');
+        } catch (SpreadsheetException $e) {
+            self::assertStringContainsString('Column string index', $e->getMessage());
+        }
+
+        $spreadsheet->disconnectWorksheets();
+    }
+}

tests/PhpSpreadsheetTests/Worksheet/InsertTest.php

@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpOffice\PhpSpreadsheetTests\Worksheet;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PHPUnit\Framework\TestCase;
+
+class InsertTest extends TestCase
+{
+    public function testInsertRow(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->fromArray([
+            [1, 2, 3, 4],
+            [5, 6, 7, 8],
+            [9, 10, 11, 12],
+            [13, 14, 15, 16],
+            [17, 18, 19, 20],
+        ]);
+        $sheet->getRowDimension(1000)->setVisible(false);
+        $sheet->getStyle('C3')->getFont()->setBold(true);
+        self::assertSame(1000, $sheet->getHighestRow());
+        self::assertSame(5, $sheet->getHighestDataRow());
+        $currentRow = 4;
+        $sheet->insertNewRowBefore($currentRow, 1);
+        self::assertSame(1001, $sheet->getHighestRow());
+        self::assertSame(6, $sheet->getHighestDataRow());
+        self::assertTrue($sheet->getStyle('C3')->getFont()->getBold());
+        self::assertSame(11, $sheet->getCell('C3')->getValue());
+        self::assertTrue($sheet->getStyle('C4')->getFont()->getBold());
+        self::assertNull($sheet->getCell('C4')->getValue());
+        self::assertFalse($sheet->getRowDimension(1001)->getVisible());
+        self::assertTrue($sheet->getRowDimension(1000)->getVisible());
+        $spreadsheet->disconnectWorksheets();
+    }
+
+    public function testInsertColumn(): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $sheet->fromArray([
+            [1, 2, 3, 4],
+            [5, 6, 7, 8],
+            [9, 10, 11, 12],
+            [13, 14, 15, 16],
+            [17, 18, 19, 20],
+        ]);
+        $sheet->getColumnDimension('ZY')->setVisible(false);
+        $sheet->getStyle('C3')->getFont()->setBold(true);
+        self::assertSame('ZY', $sheet->getHighestColumn());
+        self::assertSame('D', $sheet->getHighestDataColumn());
+        $currentColumn = 'D';
+        $sheet->insertNewColumnBefore($currentColumn, 1);
+        self::assertSame('ZZ', $sheet->getHighestColumn());
+        self::assertSame('E', $sheet->getHighestDataColumn());
+        self::assertTrue($sheet->getStyle('C3')->getFont()->getBold());
+        self::assertSame(11, $sheet->getCell('C3')->getValue());
+        self::assertTrue($sheet->getStyle('D3')->getFont()->getBold());
+        self::assertNull($sheet->getCell('D3')->getValue());
+        self::assertFalse($sheet->getColumnDimension('ZZ')->getVisible());
+        self::assertTrue($sheet->getColumnDimension('ZY')->getVisible());
+        $spreadsheet->disconnectWorksheets();
+    }
+}