From 99d49554e2cd066a68f1f9315202ab5c41507e41 Mon Sep 17 00:00:00 2001 From: oleibman <10341515+oleibman@users.noreply.github.com> Date: Thu, 20 Apr 2023 14:26:38 -0700 Subject: [PATCH 1/7] WIP Removing Rows or Columns that Include Edge Ranges This PR will probably remain in draft status for some time. It needs updates, and I need more time to understand exactly what it is doing. It is a replacement for PR #2096, intended as a fix for issue #1449. That PR has been stuck, with a good deal of acrimony, for over 2 years. In the interim, all the parameters for the functions involved were renamed, the functions were refactored to have fewer parameters with new class properties replacing the missing parameters, special code was added for absolute references, and code was refactored putting some of the methods involved in a new class under a new method name. In addition, the original PR was not Php8-compliant (one of the sticking points regarding implementing it), and there were a great many formatting problems (another sticking point). This has made it very difficult to figure out exactly what was intended in the original PR. This PR (a) addresses some of the issues associated with the original issue (deleting columns/rows at the end of a range passed to a formula *on the same sheet*), and (b) does not cause any existing tests to fail. Many more unit tests are needed (another sticking point); in particular, there are changes involving data validations, comments, defined names, and other elements which are not adequately tested. Aside from those, PhpSpreadsheet does not adjust formulas on a different sheet which involve deleted rows/columns, and it should, as Excel does. Similarly, it appears that Excel doesn't do anything extraordinary when the right/bottom part of the range is deleted, but when the left/top part is deleted, it converts the range to #REF! at least some of the time. This needs more research; if confirmed, it needs to be added to PhpSpreadsheet. --- src/PhpSpreadsheet/CellReferenceHelper.php | 56 ++++++++++++++- src/PhpSpreadsheet/ReferenceHelper.php | 77 ++++++++++++--------- tests/PhpSpreadsheetTests/Issue1449Test.php | 72 +++++++++++++++++++ 3 files changed, 168 insertions(+), 37 deletions(-) create mode 100644 tests/PhpSpreadsheetTests/Issue1449Test.php diff --git a/src/PhpSpreadsheet/CellReferenceHelper.php b/src/PhpSpreadsheet/CellReferenceHelper.php index 0e164543b4..2e4737d140 100644 --- a/src/PhpSpreadsheet/CellReferenceHelper.php +++ b/src/PhpSpreadsheet/CellReferenceHelper.php @@ -17,6 +17,15 @@ class CellReferenceHelper */ protected $beforeColumn; + /** @var string */ + protected $beforeColumnString; + + /** @var bool */ + protected $beforeColumnAbsolute = false; + + /** @var bool */ + protected $beforeRowAbsolute = false; + /** * @var int */ @@ -34,12 +43,15 @@ class CellReferenceHelper public function __construct(string $beforeCellAddress = 'A1', int $numberOfColumns = 0, int $numberOfRows = 0) { + $this->beforeColumnAbsolute = $beforeCellAddress[0] === '$'; + $this->beforeRowAbsolute = strpos($beforeCellAddress, '$', 1) !== false; $this->beforeCellAddress = str_replace('$', '', $beforeCellAddress); $this->numberOfColumns = $numberOfColumns; $this->numberOfRows = $numberOfRows; // Get coordinate of $beforeCellAddress [$beforeColumn, $beforeRow] = Coordinate::coordinateFromString($beforeCellAddress); + $this->beforeColumnString = $beforeColumn; $this->beforeColumn = (int) Coordinate::columnIndexFromString($beforeColumn); $this->beforeRow = (int) $beforeRow; } @@ -56,7 +68,7 @@ public function refreshRequired(string $beforeCellAddress, int $numberOfColumns, $this->numberOfRows !== $numberOfRows; } - public function updateCellReference(string $cellReference = 'A1', bool $includeAbsoluteReferences = false): string + public function updateCellReference(string $cellReference = 'A1', bool $includeAbsoluteReferences = false, ?bool $topLeft = null): string { if (Coordinate::coordinateIsRange($cellReference)) { throw new Exception('Only single cell references may be passed to this method.'); @@ -74,8 +86,46 @@ public function updateCellReference(string $cellReference = 'A1', bool $includeA $updateColumn = (($absoluteColumn !== '$') && $newColumnIndex >= $this->beforeColumn); $updateRow = (($absoluteRow !== '$') && $newRowIndex >= $this->beforeRow); } else { - $updateColumn = ($newColumnIndex >= $this->beforeColumn); - $updateRow = ($newRowIndex >= $this->beforeRow); + // A special case is removing the left/top or bottom/right edge of a range + // $topLeft is null if we aren't adjusting a range at all. + if ( + $topLeft !== null + && $this->numberOfColumns < 0 + && $newColumnIndex >= $this->beforeColumn + $this->numberOfColumns + && $newColumnIndex <= $this->beforeColumn - 1 + ) { + if ($topLeft) { + $newColumnIndex = $this->beforeColumn + $this->numberOfColumns; + $newColumn = Coordinate::stringFromColumnIndex($newColumnIndex); + } else { + $newColumnIndex = $this->beforeColumn + $this->numberOfColumns - 1; + } + } elseif ($newColumnIndex >= $this->beforeColumn) { + // Create new column reference + $newColumnIndex += $this->numberOfColumns; + } + $newColumn = $absoluteColumn . Coordinate::stringFromColumnIndex($newColumnIndex); + //$updateColumn = ($newColumnIndex >= $this->beforeColumn); + $updateColumn = false; + // A special case is removing the left/top or bottom/right edge of a range + // $topLeft is null if we aren't adjusting a range at all. + if ( + $topLeft !== null + && $this->numberOfRows < 0 + && $newRowIndex >= $this->beforeRow + $this->numberOfRows + && $newRowIndex <= $this->beforeRow - 1 + ) { + if ($topLeft) { + $newRowIndex = $this->beforeRow + $this->numberOfRows; + } else { + $newRowIndex = $this->beforeRow + $this->numberOfRows - 1; + } + } elseif ($newRowIndex >= $this->beforeRow) { + $newRowIndex = $newRowIndex + $this->numberOfRows; + } + $newRow = $absoluteRow . $newRowIndex; + //$updateRow = ($newRowIndex >= $this->beforeRow); + $updateRow = false; } // Create new column reference diff --git a/src/PhpSpreadsheet/ReferenceHelper.php b/src/PhpSpreadsheet/ReferenceHelper.php index 90eee534db..a245b0571e 100644 --- a/src/PhpSpreadsheet/ReferenceHelper.php +++ b/src/PhpSpreadsheet/ReferenceHelper.php @@ -154,7 +154,7 @@ protected function adjustPageBreaks(Worksheet $worksheet, int $numberOfColumns, } else { // Otherwise update any affected breaks by inserting a new break at the appropriate point // and removing the old affected break - $newReference = $this->updateCellReference($cellAddress); + $newReference = $this->updateCellReference($cellAddress, false, null); if ($cellAddress !== $newReference) { $worksheet->setBreak($newReference, $value) ->setBreak($cellAddress, Worksheet::BREAK_NONE); @@ -177,7 +177,7 @@ protected function adjustComments(Worksheet $worksheet): void // Any comments inside a deleted range will be ignored if ($this->cellReferenceHelper->cellAddressInDeleteRange($cellAddress) === false) { // Otherwise build a new array of comments indexed by the adjusted cell reference - $newReference = $this->updateCellReference($cellAddress); + $newReference = $this->updateCellReference($cellAddress, false, null); $aNewComments[$newReference] = $value; } } @@ -200,12 +200,14 @@ protected function adjustHyperlinks(Worksheet $worksheet, int $numberOfColumns, : uksort($aHyperlinkCollection, [self::class, 'cellSort']); foreach ($aHyperlinkCollection as $cellAddress => $value) { - $newReference = $this->updateCellReference($cellAddress); + $newReference = $this->updateCellReference($cellAddress, false, null); if ($this->cellReferenceHelper->cellAddressInDeleteRange($cellAddress) === true) { $worksheet->setHyperlink($cellAddress, null); } elseif ($cellAddress !== $newReference) { - $worksheet->setHyperlink($newReference, $value); $worksheet->setHyperlink($cellAddress, null); + if ($newReference) { + $worksheet->setHyperlink($newReference, $value); + } } } } @@ -226,7 +228,7 @@ protected function adjustConditionalFormatting(Worksheet $worksheet, int $number foreach ($aStyles as $cellAddress => $cfRules) { $worksheet->removeConditionalStyles($cellAddress); - $newReference = $this->updateCellReference($cellAddress); + $newReference = $this->updateCellReference($cellAddress, false, null); foreach ($cfRules as &$cfRule) { /** @var Conditional $cfRule */ @@ -264,11 +266,13 @@ protected function adjustDataValidations(Worksheet $worksheet, int $numberOfColu : uksort($aDataValidationCollection, [self::class, 'cellSort']); foreach ($aDataValidationCollection as $cellAddress => $dataValidation) { - $newReference = $this->updateCellReference($cellAddress); + $newReference = $this->updateCellReference($cellAddress, false, null); if ($cellAddress !== $newReference) { $dataValidation->setSqref($newReference); - $worksheet->setDataValidation($newReference, $dataValidation); $worksheet->setDataValidation($cellAddress, null); + if ($newReference) { + $worksheet->setDataValidation($newReference, $dataValidation); + } } } } @@ -283,8 +287,10 @@ protected function adjustMergeCells(Worksheet $worksheet): void $aMergeCells = $worksheet->getMergeCells(); $aNewMergeCells = []; // the new array of all merge cells foreach ($aMergeCells as $cellAddress => &$value) { - $newReference = $this->updateCellReference($cellAddress); - $aNewMergeCells[$newReference] = $newReference; + $newReference = $this->updateCellReference($cellAddress, false, null); + if ($newReference) { + $aNewMergeCells[$newReference] = $newReference; + } } $worksheet->setMergeCells($aNewMergeCells); // replace the merge cells array } @@ -303,10 +309,12 @@ protected function adjustProtectedCells(Worksheet $worksheet, int $numberOfColum ? uksort($aProtectedCells, [self::class, 'cellReverseSort']) : uksort($aProtectedCells, [self::class, 'cellSort']); foreach ($aProtectedCells as $cellAddress => $value) { - $newReference = $this->updateCellReference($cellAddress); + $newReference = $this->updateCellReference($cellAddress, false, null); if ($cellAddress !== $newReference) { - $worksheet->protectCells($newReference, $value, true); $worksheet->unprotectCells($cellAddress); + if ($newReference) { + $worksheet->protectCells($newReference, $value, true); + } } } } @@ -321,7 +329,7 @@ protected function adjustColumnDimensions(Worksheet $worksheet): void $aColumnDimensions = array_reverse($worksheet->getColumnDimensions(), true); if (!empty($aColumnDimensions)) { foreach ($aColumnDimensions as $objColumnDimension) { - $newReference = $this->updateCellReference($objColumnDimension->getColumnIndex() . '1'); + $newReference = $this->updateCellReference($objColumnDimension->getColumnIndex() . '1', false, null); [$newReference] = Coordinate::coordinateFromString($newReference); if ($objColumnDimension->getColumnIndex() !== $newReference) { $objColumnDimension->setColumnIndex($newReference); @@ -344,7 +352,7 @@ protected function adjustRowDimensions(Worksheet $worksheet, $beforeRow, $number $aRowDimensions = array_reverse($worksheet->getRowDimensions(), true); if (!empty($aRowDimensions)) { foreach ($aRowDimensions as $objRowDimension) { - $newReference = $this->updateCellReference('A' . $objRowDimension->getRowIndex()); + $newReference = $this->updateCellReference('A' . $objRowDimension->getRowIndex(), false, null); [, $newReference] = Coordinate::coordinateFromString($newReference); $newRoweference = (int) $newReference; if ($objRowDimension->getRowIndex() !== $newRoweference) { @@ -434,7 +442,8 @@ function ($coordinate) use ($cellCollection) { $cell = $worksheet->getCell($coordinate); $cellIndex = Coordinate::columnIndexFromString($cell->getColumn()); - if ($cellIndex - 1 + $numberOfColumns < 0) { + // Don't update cells that are being removed + if ($numberOfColumns < 0 && $cellIndex >= $beforeColumn + $numberOfColumns && $cellIndex < $beforeColumn) { continue; } @@ -518,8 +527,8 @@ function ($coordinate) use ($cellCollection) { $splitCell = $worksheet->getFreezePane(); $topLeftCell = $worksheet->getTopLeftCell() ?? ''; - $splitCell = $this->updateCellReference($splitCell); - $topLeftCell = $this->updateCellReference($topLeftCell); + $splitCell = $this->updateCellReference($splitCell, false, null); + $topLeftCell = $this->updateCellReference($topLeftCell, false, null); $worksheet->freezePane($splitCell, $topLeftCell); } @@ -527,19 +536,19 @@ function ($coordinate) use ($cellCollection) { // Page setup if ($worksheet->getPageSetup()->isPrintAreaSet()) { $worksheet->getPageSetup()->setPrintArea( - $this->updateCellReference($worksheet->getPageSetup()->getPrintArea()) + $this->updateCellReference($worksheet->getPageSetup()->getPrintArea(), false, null) ); } // Update worksheet: drawings $aDrawings = $worksheet->getDrawingCollection(); foreach ($aDrawings as $objDrawing) { - $newReference = $this->updateCellReference($objDrawing->getCoordinates()); + $newReference = $this->updateCellReference($objDrawing->getCoordinates(), false, null); if ($objDrawing->getCoordinates() != $newReference) { $objDrawing->setCoordinates($newReference); } if ($objDrawing->getCoordinates2() !== '') { - $newReference = $this->updateCellReference($objDrawing->getCoordinates2()); + $newReference = $this->updateCellReference($objDrawing->getCoordinates2(), false, null); if ($objDrawing->getCoordinates2() != $newReference) { $objDrawing->setCoordinates2($newReference); } @@ -596,8 +605,8 @@ public function updateFormulaReferences( foreach ($matches as $match) { $fromString = ($match[2] > '') ? $match[2] . '!' : ''; $fromString .= $match[3] . ':' . $match[4]; - $modified3 = substr($this->updateCellReference('$A' . $match[3], $includeAbsoluteReferences), 2); - $modified4 = substr($this->updateCellReference('$A' . $match[4], $includeAbsoluteReferences), 2); + $modified3 = substr($this->updateCellReference('$A' . $match[3], $includeAbsoluteReferences, true), 2); + $modified4 = substr($this->updateCellReference('$A' . $match[4], $includeAbsoluteReferences, false), 2); if ($match[3] . ':' . $match[4] !== $modified3 . ':' . $modified4) { if (($match[2] == '') || (trim($match[2], "'") == $worksheetName)) { @@ -621,8 +630,8 @@ public function updateFormulaReferences( foreach ($matches as $match) { $fromString = ($match[2] > '') ? $match[2] . '!' : ''; $fromString .= $match[3] . ':' . $match[4]; - $modified3 = substr($this->updateCellReference($match[3] . '$1', $includeAbsoluteReferences), 0, -2); - $modified4 = substr($this->updateCellReference($match[4] . '$1', $includeAbsoluteReferences), 0, -2); + $modified3 = substr($this->updateCellReference($match[3] . '$1', $includeAbsoluteReferences, true), 0, -2); + $modified4 = substr($this->updateCellReference($match[4] . '$1', $includeAbsoluteReferences, false), 0, -2); if ($match[3] . ':' . $match[4] !== $modified3 . ':' . $modified4) { if (($match[2] == '') || (trim($match[2], "'") == $worksheetName)) { @@ -646,8 +655,8 @@ public function updateFormulaReferences( foreach ($matches as $match) { $fromString = ($match[2] > '') ? $match[2] . '!' : ''; $fromString .= $match[3] . ':' . $match[4]; - $modified3 = $this->updateCellReference($match[3], $includeAbsoluteReferences); - $modified4 = $this->updateCellReference($match[4], $includeAbsoluteReferences); + $modified3 = $this->updateCellReference($match[3], $includeAbsoluteReferences, true); + $modified4 = $this->updateCellReference($match[4], $includeAbsoluteReferences, false); if ($match[3] . $match[4] !== $modified3 . $modified4) { if (($match[2] == '') || (trim($match[2], "'") == $worksheetName)) { @@ -674,7 +683,7 @@ public function updateFormulaReferences( $fromString = ($match[2] > '') ? $match[2] . '!' : ''; $fromString .= $match[3]; - $modified3 = $this->updateCellReference($match[3], $includeAbsoluteReferences); + $modified3 = $this->updateCellReference($match[3], $includeAbsoluteReferences, null); if ($match[3] !== $modified3) { if (($match[2] == '') || (trim($match[2], "'") == $worksheetName)) { $toString = ($match[2] > '') ? $match[2] . '!' : ''; @@ -854,7 +863,7 @@ private function updateRowRangesAllWorksheets(string $formula, int $numberOfRows * * @return string Updated cell range */ - private function updateCellReference($cellReference = 'A1', bool $includeAbsoluteReferences = false) + private function updateCellReference($cellReference = 'A1', bool $includeAbsoluteReferences = false, ?bool $topLeft = null) { // Is it in another worksheet? Will not have to update anything. if (strpos($cellReference, '!') !== false) { @@ -863,7 +872,7 @@ private function updateCellReference($cellReference = 'A1', bool $includeAbsolut // Is it a range or a single cell? if (!Coordinate::coordinateIsRange($cellReference)) { // Single cell - return $this->cellReferenceHelper->updateCellReference($cellReference, $includeAbsoluteReferences); + return $this->cellReferenceHelper->updateCellReference($cellReference, $includeAbsoluteReferences, $topLeft); } // Range @@ -925,7 +934,7 @@ private function updateNamedRange(DefinedName $definedName, Worksheet $worksheet $formula = $this->updateFormulaReferences($cellAddress, $beforeCellAddress, $numberOfColumns, $numberOfRows, $worksheet->getTitle(), true); $definedName->setValue($formula); } else { - $definedName->setValue($this->updateCellReference(ltrim($cellAddress, '='), true)); + $definedName->setValue($this->updateCellReference(ltrim($cellAddress, '='), true, null)); } } } @@ -967,14 +976,14 @@ private function updateCellRange(string $cellRange = 'A1:A1', bool $includeAbsol for ($j = 0; $j < $jc; ++$j) { if (ctype_alpha($range[$i][$j])) { $range[$i][$j] = Coordinate::coordinateFromString( - $this->cellReferenceHelper->updateCellReference($range[$i][$j] . '1', $includeAbsoluteReferences) + $this->cellReferenceHelper->updateCellReference($range[$i][$j] . '1', $includeAbsoluteReferences, null) )[0]; } elseif (ctype_digit($range[$i][$j])) { $range[$i][$j] = Coordinate::coordinateFromString( - $this->cellReferenceHelper->updateCellReference('A' . $range[$i][$j], $includeAbsoluteReferences) + $this->cellReferenceHelper->updateCellReference('A' . $range[$i][$j], $includeAbsoluteReferences, null) )[1]; } else { - $range[$i][$j] = $this->cellReferenceHelper->updateCellReference($range[$i][$j], $includeAbsoluteReferences); + $range[$i][$j] = $this->cellReferenceHelper->updateCellReference($range[$i][$j], $includeAbsoluteReferences, null); } } } @@ -1052,7 +1061,7 @@ private function adjustAutoFilter(Worksheet $worksheet, string $beforeCellAddres } $worksheet->setAutoFilter( - $this->updateCellReference($autoFilterRange) + $this->updateCellReference($autoFilterRange, false, null) ); } } @@ -1131,7 +1140,7 @@ private function adjustTable(Worksheet $worksheet, string $beforeCellAddress, in } } - $table->setRange($this->updateCellReference($tableRange)); + $table->setRange($this->updateCellReference($tableRange, false, null)); } } } diff --git a/tests/PhpSpreadsheetTests/Issue1449Test.php b/tests/PhpSpreadsheetTests/Issue1449Test.php new file mode 100644 index 0000000000..d00b10f6ed --- /dev/null +++ b/tests/PhpSpreadsheetTests/Issue1449Test.php @@ -0,0 +1,72 @@ +getActiveSheet(); + $sheet2 = $spreadsheet->createSheet(); + $sheet1->setTitle('Sheet1'); + $sheet2->setTitle('Sheet2'); + $sheet1->fromArray( + [ + [3, 1, 2, 33, 1, 10, 20, 30, 40], + [4, 2, 3, 23, 2, 10, 20, 30, 40], + [5, 3, 4, 1, 3, 10, 20, 30, 40], + [6, 4, 6, 4, 3, 10, 20, 30, 40], + [7, 6, 6, 2, 2, 10, 20, 30, 40], + ], + null, + 'C1', + true + ); + $sheet1->getCell('A1')->setValue('=SUM(C4:F7)'); + $sheet2->getCell('A1')->setValue('=SUM(Sheet1!C3:G5)'); + $sheet1->removeColumn('F', 4); + self::assertSame('=SUM(C4:E7)', $sheet1->getCell('A1')->getValue()); + if (!$this->skipTests) { + // References on another sheet not working yet. + self::assertSame('=Sheet1!SUM(C3:E5)', $sheet2->getCell('A1')->getValue()); + } + $spreadsheet->disconnectWorksheets(); + } + + public function testDeleteRows(): void + { + $spreadsheet = new Spreadsheet(); + $sheet1 = $spreadsheet->getActiveSheet(); + $sheet2 = $spreadsheet->createSheet(); + $sheet1->setTitle('Sheet1'); + $sheet2->setTitle('Sheet2'); + $sheet1->fromArray( + [ + [3, 1, 2, 33, 1, 10, 20, 30, 40], + [4, 2, 3, 23, 2, 10, 20, 30, 40], + [5, 3, 4, 1, 3, 10, 20, 30, 40], + [6, 4, 6, 4, 3, 10, 20, 30, 40], + [7, 6, 6, 2, 2, 10, 20, 30, 40], + ], + null, + 'C1', + true + ); + $sheet1->getCell('A1')->setValue('=SUM(C4:F7)'); + $sheet2->getCell('A1')->setValue('=SUM(Sheet1!C3:G5)'); + $sheet1->removeRow(4, 2); + self::assertSame('=SUM(C4:F5)', $sheet1->getCell('A1')->getValue()); + if (!$this->skipTests) { + // References on another sheet not working yet. + self::assertSame('=Sheet1!SUM(C3:G3)', $sheet2->getCell('A1')->getValue()); + } + $spreadsheet->disconnectWorksheets(); + } +} From 9296381694c96a7becad32bc1735d0e524e3b3e1 Mon Sep 17 00:00:00 2001 From: oleibman <10341515+oleibman@users.noreply.github.com> Date: Thu, 20 Apr 2023 15:03:42 -0700 Subject: [PATCH 2/7] Scrutinizer Correctly identified an unneeded statement. --- src/PhpSpreadsheet/CellReferenceHelper.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/PhpSpreadsheet/CellReferenceHelper.php b/src/PhpSpreadsheet/CellReferenceHelper.php index 2e4737d140..e1c6d53f6b 100644 --- a/src/PhpSpreadsheet/CellReferenceHelper.php +++ b/src/PhpSpreadsheet/CellReferenceHelper.php @@ -96,7 +96,6 @@ public function updateCellReference(string $cellReference = 'A1', bool $includeA ) { if ($topLeft) { $newColumnIndex = $this->beforeColumn + $this->numberOfColumns; - $newColumn = Coordinate::stringFromColumnIndex($newColumnIndex); } else { $newColumnIndex = $this->beforeColumn + $this->numberOfColumns - 1; } From d1e466d1546748f12071beb68c5923ac41e308f3 Mon Sep 17 00:00:00 2001 From: oleibman <10341515+oleibman@users.noreply.github.com> Date: Wed, 11 Dec 2024 05:28:48 -0800 Subject: [PATCH 3/7] Update HtmlImage2Test.php --- tests/PhpSpreadsheetTests/Reader/Html/HtmlImage2Test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/PhpSpreadsheetTests/Reader/Html/HtmlImage2Test.php b/tests/PhpSpreadsheetTests/Reader/Html/HtmlImage2Test.php index 33dee3108a..90eefb03af 100644 --- a/tests/PhpSpreadsheetTests/Reader/Html/HtmlImage2Test.php +++ b/tests/PhpSpreadsheetTests/Reader/Html/HtmlImage2Test.php @@ -15,7 +15,7 @@ public function testCanInsertImageGoodProtocol(): 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/01-03-filter-icon-1.png'; + $imagePath = 'https://phpspreadsheet.readthedocs.io/en/stable/topics/images/01-03-filter-icon-1.png'; $html = ' From be87f2d09ec9afbef49582f738943c80dbfb3e2c Mon Sep 17 00:00:00 2001 From: oleibman <10341515+oleibman@users.noreply.github.com> Date: Fri, 7 Feb 2025 18:07:55 -0800 Subject: [PATCH 4/7] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d640a0b8e8..e3a194d985 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,7 @@ jobs: uses: actions/checkout@v4 - name: Install locales - run: sudo apt-get install -y language-pack-fr language-pack-de + run: sudo apt-get update && sudo apt-get install -y language-pack-fr language-pack-de - name: Install single-byte locale run: sudo sed -i -e 's/# de_DE@euro/de_DE@euro/g' /etc/locale.gen && sudo locale-gen de_DE@euro From 8abd795bdedab3305bda27d9b78d0c3a71c7eee5 Mon Sep 17 00:00:00 2001 From: oleibman <10341515+oleibman@users.noreply.github.com> Date: Fri, 7 Feb 2025 18:18:04 -0800 Subject: [PATCH 5/7] Update ReferenceHelper.php --- src/PhpSpreadsheet/ReferenceHelper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PhpSpreadsheet/ReferenceHelper.php b/src/PhpSpreadsheet/ReferenceHelper.php index f53548d923..4e66089832 100644 --- a/src/PhpSpreadsheet/ReferenceHelper.php +++ b/src/PhpSpreadsheet/ReferenceHelper.php @@ -337,7 +337,7 @@ protected function adjustProtectedCells(Worksheet $worksheet, int $numberOfColum if ($cellAddress !== $newReference) { $worksheet->unprotectCells($cellAddress); if ($newReference) { - $worksheet->protectCells($newReference, $value, true); + $worksheet->protectCells($newReference, $protectedRange->getPassword(), true); } } } From 62e2259d969f78eb9a12e95ff733b67cf175fecf Mon Sep 17 00:00:00 2001 From: oleibman <10341515+oleibman@users.noreply.github.com> Date: Sat, 22 Feb 2025 13:33:11 -0800 Subject: [PATCH 6/7] A Bit of Refactoring in CellReferenceHelper --- src/PhpSpreadsheet/CellReferenceHelper.php | 83 +++++++++++++--------- 1 file changed, 48 insertions(+), 35 deletions(-) diff --git a/src/PhpSpreadsheet/CellReferenceHelper.php b/src/PhpSpreadsheet/CellReferenceHelper.php index f1241184a3..a8d20f695f 100644 --- a/src/PhpSpreadsheet/CellReferenceHelper.php +++ b/src/PhpSpreadsheet/CellReferenceHelper.php @@ -71,44 +71,12 @@ public function updateCellReference(string $cellReference = 'A1', bool $includeA $updateColumn = (($absoluteColumn !== '$') && $newColumnIndex >= $this->beforeColumn); $updateRow = (($absoluteRow !== '$') && $newRowIndex >= $this->beforeRow); } else { - // A special case is removing the left/top or bottom/right edge of a range - // $topLeft is null if we aren't adjusting a range at all. - if ( - $topLeft !== null - && $this->numberOfColumns < 0 - && $newColumnIndex >= $this->beforeColumn + $this->numberOfColumns - && $newColumnIndex <= $this->beforeColumn - 1 - ) { - if ($topLeft) { - $newColumnIndex = $this->beforeColumn + $this->numberOfColumns; - } else { - $newColumnIndex = $this->beforeColumn + $this->numberOfColumns - 1; - } - } elseif ($newColumnIndex >= $this->beforeColumn) { - // Create new column reference - $newColumnIndex += $this->numberOfColumns; - } + $newColumnIndex = $this->computeNewColumnIndex($newColumnIndex, $topLeft); $newColumn = $absoluteColumn . Coordinate::stringFromColumnIndex($newColumnIndex); - //$updateColumn = ($newColumnIndex >= $this->beforeColumn); $updateColumn = false; - // A special case is removing the left/top or bottom/right edge of a range - // $topLeft is null if we aren't adjusting a range at all. - if ( - $topLeft !== null - && $this->numberOfRows < 0 - && $newRowIndex >= $this->beforeRow + $this->numberOfRows - && $newRowIndex <= $this->beforeRow - 1 - ) { - if ($topLeft) { - $newRowIndex = $this->beforeRow + $this->numberOfRows; - } else { - $newRowIndex = $this->beforeRow + $this->numberOfRows - 1; - } - } elseif ($newRowIndex >= $this->beforeRow) { - $newRowIndex = $newRowIndex + $this->numberOfRows; - } + + $newRowIndex = $this->computeNewRowIndex($newRowIndex, $topLeft); $newRow = $absoluteRow . $newRowIndex; - //$updateRow = ($newRowIndex >= $this->beforeRow); $updateRow = false; } @@ -126,6 +94,51 @@ public function updateCellReference(string $cellReference = 'A1', bool $includeA return "{$newColumn}{$newRow}"; } + public function computeNewColumnIndex(int $newColumnIndex, ?bool $topLeft): int + { + // A special case is removing the left/top or bottom/right edge of a range + // $topLeft is null if we aren't adjusting a range at all. + if ( + $topLeft !== null + && $this->numberOfColumns < 0 + && $newColumnIndex >= $this->beforeColumn + $this->numberOfColumns + && $newColumnIndex <= $this->beforeColumn - 1 + ) { + if ($topLeft) { + $newColumnIndex = $this->beforeColumn + $this->numberOfColumns; + } else { + $newColumnIndex = $this->beforeColumn + $this->numberOfColumns - 1; + } + } elseif ($newColumnIndex >= $this->beforeColumn) { + // Create new column reference + $newColumnIndex += $this->numberOfColumns; + } + + return $newColumnIndex; + } + + public function computeNewRowIndex(int $newRowIndex, ?bool $topLeft): int + { + // A special case is removing the left/top or bottom/right edge of a range + // $topLeft is null if we aren't adjusting a range at all. + if ( + $topLeft !== null + && $this->numberOfRows < 0 + && $newRowIndex >= $this->beforeRow + $this->numberOfRows + && $newRowIndex <= $this->beforeRow - 1 + ) { + if ($topLeft) { + $newRowIndex = $this->beforeRow + $this->numberOfRows; + } else { + $newRowIndex = $this->beforeRow + $this->numberOfRows - 1; + } + } elseif ($newRowIndex >= $this->beforeRow) { + $newRowIndex = $newRowIndex + $this->numberOfRows; + } + + return $newRowIndex; + } + public function cellAddressInDeleteRange(string $cellAddress): bool { [$cellColumn, $cellRow] = Coordinate::coordinateFromString($cellAddress); From 1e2c86bdbb3624349cb44788a6a3418833120780 Mon Sep 17 00:00:00 2001 From: oleibman <10341515+oleibman@users.noreply.github.com> Date: Tue, 25 Feb 2025 21:00:46 -0800 Subject: [PATCH 7/7] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 483fe65d66..1572e96869 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,7 @@ and this project adheres to [Semantic Versioning](https://semver.org). - Refactor Helper/Html. [PR #4359](https://github.com/PHPOffice/PhpSpreadsheet/pull/4359) - Ignore ignoredErrors when not applicable. [Issue #4375](https://github.com/PHPOffice/PhpSpreadsheet/issues/4375) [PR #4377](https://github.com/PHPOffice/PhpSpreadsheet/pull/4377) - Better handling of defined names on sheets whose titles include apostrophes. [Issue #4356](https://github.com/PHPOffice/PhpSpreadsheet/issues/4356) [Issue #4362](https://github.com/PHPOffice/PhpSpreadsheet/issues/4362) [Issue #4376](https://github.com/PHPOffice/PhpSpreadsheet/issues/4376) [PR #4360](https://github.com/PHPOffice/PhpSpreadsheet/pull/4360) +- Partial solution for removing rows or columns that include edge ranges. [Issue #1449](https://github.com/PHPOffice/PhpSpreadsheet/issues/1449) [PR #3528](https://github.com/PHPOffice/PhpSpreadsheet/pull/3528) ## 2025-02-08 - 4.0.0
test image voilà