mirror of
https://github.com/PHPOffice/PhpSpreadsheet.git
synced 2026-09-02 13:41:21 +00:00
oleibman
5c3ae52446
Fix #4241. Some security batches caused a minor break in Drawings, forcing `setWorksheet` to come after `setPath`. Although the problem is easily fixed in user code, this was not an intended change. Some slight recoding restores the earlier functionality where the order of calls was not important, without sacrificing the security gains. This change will be back-ported to the other active branches to which the security patch had been applied.
85 lines
3.2 KiB
PHP
85 lines
3.2 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace PhpOffice\PhpSpreadsheetTests\Worksheet;
|
|
|
|
use PhpOffice\PhpSpreadsheet\Spreadsheet;
|
|
use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
|
|
use PHPUnit\Framework\TestCase;
|
|
|
|
class Issue4241Test extends TestCase
|
|
{
|
|
public function testIssue4241(): void
|
|
{
|
|
// setWorksheet needed to come after setPath
|
|
$badPath = 'tests/data/Writer/XLSX/xgreen_square.gif';
|
|
$goodPath = 'tests/data/Writer/XLSX/green_square.gif';
|
|
$spreadsheet = new Spreadsheet();
|
|
$sheet = $spreadsheet->getActiveSheet();
|
|
$drawing = new Drawing();
|
|
$drawing->setName('Green Square');
|
|
$drawing->setWorksheet($sheet);
|
|
$drawings = $sheet->getDrawingCollection();
|
|
self::assertCount(1, $drawings);
|
|
$drawing0 = $drawings[0];
|
|
self::assertInstanceOf(Drawing::class, $drawing0);
|
|
self::assertSame('', $drawing0->getPath());
|
|
self::assertSame('A1', $drawing0->getCoordinates());
|
|
$maxRow = $sheet->getHighestDataRow();
|
|
$maxCol = $sheet->getHighestDataColumn();
|
|
self::assertSame(1, $maxRow);
|
|
self::assertSame('A', $maxCol);
|
|
|
|
$drawing->setCoordinates('E5');
|
|
$drawings = $sheet->getDrawingCollection();
|
|
self::assertCount(1, $drawings);
|
|
$drawing0 = $drawings[0];
|
|
self::assertInstanceOf(Drawing::class, $drawing0);
|
|
self::assertSame('', $drawing0->getPath());
|
|
self::assertSame('E5', $drawing0->getCoordinates());
|
|
$maxRow = $sheet->getHighestDataRow();
|
|
$maxCol = $sheet->getHighestDataColumn();
|
|
self::assertSame(1, $maxRow);
|
|
self::assertSame('A', $maxCol);
|
|
|
|
$drawing->setPath($badPath, false);
|
|
$drawings = $sheet->getDrawingCollection();
|
|
self::assertCount(1, $drawings);
|
|
$drawing0 = $drawings[0];
|
|
self::assertInstanceOf(Drawing::class, $drawing0);
|
|
self::assertSame('', $drawing0->getPath());
|
|
self::assertSame('E5', $drawing0->getCoordinates());
|
|
$maxRow = $sheet->getHighestDataRow();
|
|
$maxCol = $sheet->getHighestDataColumn();
|
|
self::assertSame(1, $maxRow);
|
|
self::assertSame('A', $maxCol);
|
|
|
|
$drawing->setPath($goodPath);
|
|
$drawings = $sheet->getDrawingCollection();
|
|
self::assertCount(1, $drawings);
|
|
$drawing0 = $drawings[0];
|
|
self::assertInstanceOf(Drawing::class, $drawing0);
|
|
self::assertSame($goodPath, $drawing0->getPath());
|
|
self::assertSame('E5', $drawing0->getCoordinates());
|
|
$maxRow = $sheet->getHighestDataRow();
|
|
$maxCol = $sheet->getHighestDataColumn();
|
|
self::assertSame(5, $maxRow);
|
|
self::assertSame('E', $maxCol);
|
|
|
|
$drawing->setCoordinates('G3');
|
|
$drawings = $sheet->getDrawingCollection();
|
|
self::assertCount(1, $drawings);
|
|
$drawing0 = $drawings[0];
|
|
self::assertInstanceOf(Drawing::class, $drawing0);
|
|
self::assertSame($goodPath, $drawing0->getPath());
|
|
self::assertSame('G3', $drawing0->getCoordinates());
|
|
$maxRow = $sheet->getHighestDataRow();
|
|
$maxCol = $sheet->getHighestDataColumn();
|
|
self::assertSame(5, $maxRow);
|
|
self::assertSame('G', $maxCol);
|
|
|
|
$spreadsheet->disconnectWorksheets();
|
|
}
|
|
}
|