Fix code, CS and add Unit Test

Author: Thomas Lallement

src/PhpSpreadsheet/Reader/Xlsx.php

@@ -784,6 +784,19 @@ protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
 
                     $charts = $chartDetails = [];
 
+                    // Add richData (contains relation of in-cell images)
+                    $richData = [];
+                    $relationsFileName = $dir . '/richData/_rels/richValueRel.xml.rels';
+                    if ($zip->locateName($relationsFileName)) {
+                        $relsWorksheet = $this->loadZip($relationsFileName, Namespaces::RELATIONSHIPS);
+                        foreach ($relsWorksheet->Relationship as $elex) {
+                            $ele = self::getAttributes($elex);
+                            if ($ele['Type'] == Namespaces::IMAGE) {
+                                $richData['image'][(string) $ele['Id']] = (string) $ele['Target'];
+                            }
+                        }
+                    }
+
                     $sheetCreated = false;
                     if ($xmlWorkbookNS->sheets) {
                         foreach ($xmlWorkbookNS->sheets->sheet as $eleSheet) {
@@ -940,34 +953,28 @@ protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
 
                                                 break;
                                             case DataType::TYPE_ERROR:
-                                                if (isset($cAttr->vm)) {
-                                                    $cell = $docSheet->getCell($r);
-                                                    if ($cell) {
- 
-                                                        $objDrawing = new \PhpOffice\PhpSpreadsheet\Worksheet\Drawing();
-                                                        $objDrawing->setName('');
-                                                        $objDrawing->setDescription('');
-                                                        $imagePath = 'xl/media/image' . $cAttr->vm . '.png';
-                                                        $objDrawing->setPath(
-                                                            'zip://' . File::realpath($filename) . '#' . $imagePath,
-                                                            false,
-                                                            $zip
-                                                        );
+                                                if (isset($cAttr->vm) && isset($richData['image']['rId' . $cAttr->vm]) && !$useFormula) {
+                                                    $imagePath = $dir . '/' . str_replace('../', '', $richData['image']['rId' . $cAttr->vm]);
+                                                    $objDrawing = new \PhpOffice\PhpSpreadsheet\Worksheet\Drawing();
+                                                    $objDrawing->setPath(
+                                                        'zip://' . File::realpath($filename) . '#' . $imagePath,
+                                                        false,
+                                                        $zip
+                                                    );
 
-                                                        $objDrawing->setCoordinates($r);
-                                                        $objDrawing->setOffsetX(0);
-                                                        $objDrawing->setOffsetY(0);
-                                                        $objDrawing->setResizeProportional(false);
-                                                        $objDrawing->setWorksheet($docSheet);
-                                                    }
+                                                    $objDrawing->setCoordinates($r);
+                                                    $objDrawing->setOffsetX(0);
+                                                    $objDrawing->setOffsetY(0);
+                                                    $objDrawing->setResizeProportional(false);
+                                                    $objDrawing->setWorksheet($docSheet);
 
                                                     $value = $objDrawing;
                                                     $cellDataType = DATATYPE::TYPE_NULL;
                                                     $c->t = DATATYPE::TYPE_NULL;
 
                                                     break;
                                                 }
-                                                
+
                                                 if (!$useFormula) {
                                                     $value = self::castToError($c);
                                                 } else {

tests/PhpSpreadsheetTests/Reader/Xlsx/DrawingInCell.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+use PhpOffice\PhpSpreadsheetTests\Calculation\Functions\Engineering\ImAbsTest;
+use PhpOffice\PhpSpreadsheetTests\Functional\AbstractFunctional;
+
+class DrawingInCell extends AbstractFunctional
+{
+    public function testPictureInCell(): void
+    {
+        $file = 'tests/data/Reader/XLSX/drawing_in_cell.xlsx';
+        $reader = new Xlsx();
+        $spreadsheet = $reader->load($file);
+
+        $reloadedSpreadsheet = $this->writeAndReload($spreadsheet, 'Xlsx');
+        $spreadsheet->disconnectWorksheets();
+        $sheet = $reloadedSpreadsheet->getActiveSheet();
+        $drawings = $sheet->getDrawingCollection();
+        self::assertCount(1, $drawings);
+        if ($drawings[0] === null) {
+            self::fail('Unexpected null drawing');
+        } else {
+            self::assertSame(IMAGETYPE_PNG, $drawings[0]->getType());
+            self::assertSame('B2', $drawings[0]->getCoordinates());
+            self::assertSame(0, $drawings[0]->getOffsetX());
+            self::assertSame(0, $drawings[0]->getOffsetY());
+            self::assertSame(296, $drawings[0]->getWidth());
+            self::assertSame(154, $drawings[0]->getHeight());
+            self::assertSame(296, $drawings[0]->getImageWidth());
+            self::assertSame(154, $drawings[0]->getImageHeight());
+        }
+
+        $reloadedSpreadsheet->disconnectWorksheets();
+    }
+}