Additional Tests

Author: oleibman

tests/PhpSpreadsheetTests/Functional/ReadBlankCellsTest.php

@@ -48,6 +48,20 @@ public function testLoadDontReadEmptyCells(): void
         $reloadedSpreadsheet->disconnectWorksheets();
     }
 
+    /**
+     * Test load file ignoring empty cells.
+     */
+    public function testLoadDontReadEmptyCellsFlag(): void
+    {
+        $filename = 'tests/data/Reader/XLSX/blankcell.xlsx';
+        $reader = new Xlsx();
+        $reloadedSpreadsheet = $reader->load($filename, Xlsx::IGNORE_EMPTY_CELLS);
+        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.
      */

tests/PhpSpreadsheetTests/Reader/CreateBlankSheetIfNoneReadTest.php

@@ -53,4 +53,17 @@ public static function providerIdentify(): array
             ['samples/templates/excel2003.xml', 'Xml', Reader\Xml::class],
         ];
     }
+
+    public function testUsingFlage(): void
+    {
+        $file = 'samples/templates/26template.xlsx';
+        $reader = IOFactory::createReaderForFile($file);
+        $sheetlist = ['Unknown sheetname'];
+        $reader->setLoadSheetsOnly($sheetlist);
+        $spreadsheet = $reader->load($file, Reader\BaseReader::CREATE_BLANK_SHEET_IF_NONE_READ);
+        $sheet = $spreadsheet->getActiveSheet();
+        self::assertSame('Worksheet', $sheet->getTitle());
+        self::assertCount(1, $spreadsheet->getAllSheets());
+        $spreadsheet->disconnectWorksheets();
+    }
 }

tests/PhpSpreadsheetTests/Reader/Csv/BinderTest.php

@@ -34,6 +34,7 @@ public function testLoadFromString(): void
 
         $reader2 = new Csv();
         $reader2->setValueBinder(new StringValueBinder());
+        self::assertInstanceOf(StringValueBinder::class, $reader2->getValueBinder());
         $spreadsheet2 = $reader2->loadSpreadsheetFromString($data);
         $sheet2 = $spreadsheet2->getActiveSheet();
         $sheet2->getCell('A3')->setValueExplicit(7, DataType::TYPE_STRING);

tests/PhpSpreadsheetTests/Reader/Xlsx/URLImageTest.php

@@ -45,12 +45,38 @@ public function testURLImageSourceAllowed(): void
         $spreadsheet->disconnectWorksheets();
     }
 
+    public function testURLImageSourceAllowedFlag(): void
+    {
+        if (getenv('SKIP_URL_IMAGE_TEST') === '1') {
+            self::markTestSkipped('Skipped due to setting of environment variable');
+        }
+        $filename = realpath(__DIR__ . '/../../../data/Reader/XLSX/urlImage.xlsx');
+        self::assertNotFalse($filename);
+        $reader = IOFactory::createReader('Xlsx');
+        $spreadsheet = $reader->load($filename, XlsxReader::ALLOW_EXTERNAL_IMAGES);
+        $worksheet = $spreadsheet->getActiveSheet();
+        $collection = $worksheet->getDrawingCollection();
+        self::assertCount(1, $collection);
+
+        foreach ($collection as $drawing) {
+            self::assertInstanceOf(Drawing::class, $drawing);
+            // Check if the source is a URL or a file path
+            self::assertTrue($drawing->getIsURL());
+            self::assertSame('https://phpspreadsheet.readthedocs.io/en/latest/topics/images/01-03-filter-icon-1.png', $drawing->getPath());
+            self::assertSame(IMAGETYPE_PNG, $drawing->getType());
+            self::assertSame(84, $drawing->getWidth());
+            self::assertSame(44, $drawing->getHeight());
+        }
+        $spreadsheet->disconnectWorksheets();
+    }
+
     public function testURLImageSourceNotAllowed(): void
     {
         $filename = realpath(__DIR__ . '/../../../data/Reader/XLSX/urlImage.xlsx');
         self::assertNotFalse($filename);
         $reader = IOFactory::createReader('Xlsx');
         $reader->setAllowExternalImages(false);
+        self::assertFalse($reader->getAllowExternalImages());
         $spreadsheet = $reader->load($filename);
         $worksheet = $spreadsheet->getActiveSheet();
         $collection = $worksheet->getDrawingCollection();
@@ -87,6 +113,18 @@ public function testURLImageSourceNotFoundNotAllowed(): void
         $spreadsheet->disconnectWorksheets();
     }
 
+    public function testURLImageSourceNotFoundNotAllowedFlag(): void
+    {
+        $filename = realpath(__DIR__ . '/../../../data/Reader/XLSX/urlImage.notfound.xlsx');
+        self::assertNotFalse($filename);
+        $reader = IOFactory::createReader('Xlsx');
+        $spreadsheet = $reader->load($filename, XlsxReader::DONT_ALLOW_EXTERNAL_IMAGES);
+        $worksheet = $spreadsheet->getActiveSheet();
+        $collection = $worksheet->getDrawingCollection();
+        self::assertCount(0, $collection);
+        $spreadsheet->disconnectWorksheets();
+    }
+
     public function testURLImageSourceBadProtocol(): void
     {
         $filename = realpath(__DIR__ . '/../../../data/Reader/XLSX/urlImage.bad.dontuse');