Merge pull request #4417 from oleibman/issue4415

Ignore Fractional Part of Drawing Shadow Alpha

Author: oleibman

CHANGELOG.md

@@ -34,6 +34,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Fixed
 
+- Ignore fractional part of Drawing Shadow Alpha. [Issue #4415](https://github.com/PHPOffice/PhpSpreadsheet/issues/4415) [PR #4417](https://github.com/PHPOffice/PhpSpreadsheet/pull/4417)
 - BIN2DEC, OCT2DEC, and HEX2DEC return numbers rather than strings. [Issue #4383](https://github.com/PHPOffice/PhpSpreadsheet/issues/4383) [PR #4389](https://github.com/PHPOffice/PhpSpreadsheet/pull/4389)
 - Fix TREND_BEST_FIT_NO_POLY. [Issue #4400](https://github.com/PHPOffice/PhpSpreadsheet/issues/4400) [PR #4339](https://github.com/PHPOffice/PhpSpreadsheet/pull/4339)
 - Better handling of Chart DisplayBlanksAs. [Issue #4411](https://github.com/PHPOffice/PhpSpreadsheet/issues/4411) [PR #4414](https://github.com/PHPOffice/PhpSpreadsheet/pull/4414)

src/PhpSpreadsheet/Reader/Xlsx.php

@@ -1492,7 +1492,13 @@ protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
                                                         $shadow->setAlignment(self::getArrayItemString(self::getAttributes($outerShdw), 'algn'));
                                                         $clr = $outerShdw->srgbClr ?? $outerShdw->prstClr;
                                                         $shadow->getColor()->setRGB(self::getArrayItemString(self::getAttributes($clr), 'val'));
-                                                        $shadow->setAlpha(self::getArrayItem(self::getAttributes($clr->alpha), 'val') / 1000); // @phpstan-ignore-line
+                                                        if ($clr->alpha) {
+                                                            $alpha = StringHelper::convertToString(self::getArrayItem(self::getAttributes($clr->alpha), 'val'));
+                                                            if (is_numeric($alpha)) {
+                                                                $alpha = (int) ($alpha / 1000);
+                                                                $shadow->setAlpha($alpha);
+                                                            }
+                                                        }
                                                     }
 
                                                     $this->readHyperLinkDrawing($objDrawing, $oneCellAnchor, $hyperlinks);
@@ -1597,7 +1603,13 @@ protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
                                                         $shadow->setAlignment(self::getArrayItemString(self::getAttributes($outerShdw), 'algn'));
                                                         $clr = $outerShdw->srgbClr ?? $outerShdw->prstClr;
                                                         $shadow->getColor()->setRGB(self::getArrayItemString(self::getAttributes($clr), 'val'));
-                                                        $shadow->setAlpha(self::getArrayItem(self::getAttributes($clr->alpha), 'val') / 1000); // @phpstan-ignore-line
+                                                        if ($clr->alpha) {
+                                                            $alpha = StringHelper::convertToString(self::getArrayItem(self::getAttributes($clr->alpha), 'val'));
+                                                            if (is_numeric($alpha)) {
+                                                                $alpha = (int) ($alpha / 1000);
+                                                                $shadow->setAlpha($alpha);
+                                                            }
+                                                        }
                                                     }
 
                                                     $this->readHyperLinkDrawing($objDrawing, $twoCellAnchor, $hyperlinks);

tests/PhpSpreadsheetTests/Reader/Xlsx/Issue4415Test.php

@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx as XlsxReader;
+use PHPUnit\Framework\TestCase;
+
+class Issue4415Test extends TestCase
+{
+    private static string $file = 'tests/data/Reader/XLSX/issue.4415.xlsx';
+
+    public function testPreliminaries(): void
+    {
+        $file = 'zip://';
+        $file .= self::$file;
+        $file .= '#xl/drawings/drawing1.xml';
+        $data = file_get_contents($file) ?: '';
+        $expected = '<a:alpha val="72600"/>';
+        self::assertStringContainsString($expected, $data);
+        $expected = '<a:alpha val="90100"/>';
+        self::assertStringContainsString($expected, $data);
+        self::assertSame(2, substr_count($data, '<a:alpha '), 'number of drawings with alpha');
+        self::assertSame(2, substr_count($data, '<xdr:oneCellAnchor>'), 'first 2 drawings');
+        self::assertSame(1, substr_count($data, '<xdr:twoCellAnchor>'), 'third drawings');
+    }
+
+    public function testFractionalAlpha(): void
+    {
+        $file = self::$file;
+        $reader = new XlsxReader();
+        $spreadsheet = $reader->load($file);
+        $sheet = $spreadsheet->getActiveSheet();
+        $drawings = $sheet->getDrawingCollection();
+        self::assertCount(3, $drawings);
+        self::assertNotNull($drawings[0]);
+        self::assertNotNull($drawings[1]);
+        self::assertNotNull($drawings[2]);
+        self::assertSame(50, $drawings[0]->getShadow()->getAlpha());
+        self::assertSame(72, $drawings[1]->getShadow()->getAlpha());
+        self::assertSame('', $drawings[1]->getCoordinates2(), 'one cell anchor');
+        self::assertSame(90, $drawings[2]->getShadow()->getAlpha());
+        self::assertNotEquals('', $drawings[2]->getCoordinates2(), 'two cell anchor');
+        $spreadsheet->disconnectWorksheets();
+    }
+}