More Tests

Author: oleibman

src/PhpSpreadsheet/Reader/Html.php

@@ -1056,6 +1056,9 @@ private function insertImage(Worksheet $sheet, string $column, int $row, array $
 
         $drawing = new Drawing();
         $drawing->setPath($src);
+        if ($drawing->getPath() === '') {
+            return;
+        }
         $drawing->setWorksheet($sheet);
         $drawing->setCoordinates($column . $row);
         $drawing->setOffsetX(0);

src/PhpSpreadsheet/Reader/Xlsx.php

@@ -1449,6 +1449,9 @@ protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
                                                         if (isset($images[$linkImageKey])) {
                                                             $url = str_replace('xl/drawings/', '', $images[$linkImageKey]);
                                                             $objDrawing->setPath($url);
+                                                            if ($objDrawing->getPath() === '') {
+                                                                continue;
+                                                            }
                                                         }
                                                     }
                                                     $objDrawing->setCoordinates(Coordinate::stringFromColumnIndex(((int) $oneCellAnchor->from->col) + 1) . ($oneCellAnchor->from->row + 1));
@@ -1543,6 +1546,9 @@ protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
                                                         if (isset($images[$linkImageKey])) {
                                                             $url = str_replace('xl/drawings/', '', $images[$linkImageKey]);
                                                             $objDrawing->setPath($url);
+                                                            if ($objDrawing->getPath() === '') {
+                                                                continue;
+                                                            }
                                                         }
                                                     }
                                                     $objDrawing->setCoordinates(Coordinate::stringFromColumnIndex(((int) $twoCellAnchor->from->col) + 1) . ($twoCellAnchor->from->row + 1));

src/PhpSpreadsheet/Worksheet/Drawing.php

@@ -103,13 +103,17 @@ public function setPath(string $path, bool $verifyFile = true, ?ZipArchive $zip
                 $this->path = $path;
                 // Implicit that it is a URL, rather store info than running check above on value in other places.
                 $this->isUrl = true;
-                $imageContents = file_get_contents($path);
-                $filePath = tempnam(sys_get_temp_dir(), 'Drawing');
-                if ($filePath) {
-                    file_put_contents($filePath, $imageContents);
-                    if (file_exists($filePath)) {
-                        $this->setSizesAndType($filePath);
-                        unlink($filePath);
+                $imageContents = @file_get_contents($path);
+                if ($imageContents === false) {
+                    $this->path = '';
+                } else {
+                    $filePath = tempnam(sys_get_temp_dir(), 'Drawing');
+                    if ($filePath) {
+                        file_put_contents($filePath, $imageContents);
+                        if (file_exists($filePath)) {
+                            $this->setSizesAndType($filePath);
+                            unlink($filePath);
+                        }
                     }
                 }
             } elseif (file_exists($path)) {
@@ -122,7 +126,8 @@ public function setPath(string $path, bool $verifyFile = true, ?ZipArchive $zip
                     $this->setSizesAndType($path);
                 }
             } else {
-                throw new PhpSpreadsheetException("File $path not found!");
+                //throw new PhpSpreadsheetException("File $path not found!");
+                $this->path = '';
             }
         } else {
             $this->path = $path;

src/PhpSpreadsheet/Writer/Xlsx/ContentTypes.php

@@ -6,6 +6,7 @@
 use PhpOffice\PhpSpreadsheet\Shared\File;
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
 use PhpOffice\PhpSpreadsheet\Worksheet\MemoryDrawing;
 use PhpOffice\PhpSpreadsheet\Writer\Exception as WriterException;
 
@@ -132,15 +133,20 @@ public function writeContentTypes(Spreadsheet $spreadsheet, bool $includeCharts
             $extension = '';
             $mimeType = '';
 
-            if ($this->getParentWriter()->getDrawingHashTable()->getByIndex($i) instanceof \PhpOffice\PhpSpreadsheet\Worksheet\Drawing) {
-                $extension = strtolower($this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getExtension());
-                $mimeType = $this->getImageMimeType($this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getPath());
-            } elseif ($this->getParentWriter()->getDrawingHashTable()->getByIndex($i) instanceof MemoryDrawing) {
-                $extension = strtolower($this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getMimeType());
+            $drawing = $this->getParentWriter()->getDrawingHashTable()->getByIndex($i);
+            if ($drawing instanceof Drawing) {
+                $extension = strtolower($drawing->getExtension());
+                if ($drawing->getIsUrl()) {
+                    $mimeType = image_type_to_mime_type($drawing->getType());
+                } else {
+                    $mimeType = $this->getImageMimeType($drawing->getPath());
+                }
+            } elseif ($drawing instanceof MemoryDrawing) {
+                $extension = strtolower($drawing->getMimeType());
                 $extension = explode('/', $extension);
                 $extension = $extension[1];
 
-                $mimeType = $this->getParentWriter()->getDrawingHashTable()->getByIndex($i)->getMimeType();
+                $mimeType = $drawing->getMimeType();
             }
 
             if (!isset($aMediaContentTypes[$extension])) {

tests/PhpSpreadsheetTests/Reader/Html/HtmlImage2Test.php

@@ -31,6 +31,24 @@ public function testCanInsertImageGoodProtocol(): void
         self::assertEquals('A1', $drawing->getCoordinates());
     }
 
+    public function testCantInsertImageNotFound(): void
+    {
+        if (getenv('SKIP_URL_IMAGE_TEST') === '1') {
+            self::markTestSkipped('Skipped due to setting of environment variable');
+        }
+        $imagePath = 'https://phpspreadsheet.readthedocs.io/en/latest/topics/images/xxx01-03-filter-icon-1.png';
+        $html = '<table>
+                    <tr>
+                        <td><img src="' . $imagePath . '" alt="test image voilà"></td>
+                    </tr>
+                </table>';
+        $filename = HtmlHelper::createHtml($html);
+        $spreadsheet = HtmlHelper::loadHtmlIntoSpreadsheet($filename, true);
+        $firstSheet = $spreadsheet->getSheet(0);
+        $drawingCollection = $firstSheet->getDrawingCollection();
+        self::assertCount(0, $drawingCollection);
+    }
+
     public function testCannotInsertImageBadProtocol(): void
     {
         $this->expectException(SpreadsheetException::class);

tests/PhpSpreadsheetTests/Reader/Xlsx/URLImageTest.php

@@ -43,6 +43,20 @@ public function testURLImageSource(): void
         }
     }
 
+    public function testURLImageSourceNotFound(): void
+    {
+        if (getenv('SKIP_URL_IMAGE_TEST') === '1') {
+            self::markTestSkipped('Skipped due to setting of environment variable');
+        }
+        $filename = realpath(__DIR__ . '/../../../data/Reader/XLSX/urlImage.notfound.xlsx');
+        self::assertNotFalse($filename);
+        $reader = IOFactory::createReader('Xlsx');
+        $spreadsheet = $reader->load($filename);
+        $worksheet = $spreadsheet->getActiveSheet();
+        $collection = $worksheet->getDrawingCollection();
+        self::assertCount(0, $collection);
+    }
+
     public function testURLImageSourceBadProtocol(): void
     {
         $filename = realpath(__DIR__ . '/../../../data/Reader/XLSX/urlImage.bad.xlsx');