alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
MarkBaker 2019-10-28 18:52:26 +01:00
parent e469b00508 89066d2568
commit bc8dd75030
3 changed files with 54 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
### Fixed ### Fixed
- Call garbage collector after removing a column to prevent stale cached values - Call garbage collector after removing a column to prevent stale cached values
- Trying to remove a column that doesn't exist deletes the latest column
## [1.9.0] - 2019-08-17 ## [1.9.0] - 2019-08-17

33
src/PhpSpreadsheet/Worksheet/Worksheet.php
View File

@ -2145,20 +2145,31 @@ class Worksheet implements IComparable
*/ */
public function removeColumn($pColumn, $pNumCols = 1) public function removeColumn($pColumn, $pNumCols = 1)
{ {
if (!is_numeric($pColumn)) { if (is_numeric($pColumn)) {
$highestColumn = $this->getHighestDataColumn();
$pColumn = Coordinate::stringFromColumnIndex(Coordinate::columnIndexFromString($pColumn) + $pNumCols);
$objReferenceHelper = ReferenceHelper::getInstance();
$objReferenceHelper->insertNewBefore($pColumn . '1', -$pNumCols, 0, $this);
for ($c = 0; $c < $pNumCols; ++$c) {
$this->getCellCollection()->removeColumn($highestColumn);
$highestColumn = Coordinate::stringFromColumnIndex(Coordinate::columnIndexFromString($highestColumn) - 1);
}
$this->garbageCollect();
} else {
throw new Exception('Column references should not be numeric.'); throw new Exception('Column references should not be numeric.');
} }
$highestColumn = $this->getHighestDataColumn();
$highestColumnIndex = Coordinate::columnIndexFromString($highestColumn);
$pColumnIndex = Coordinate::columnIndexFromString($pColumn);
if ($pColumnIndex > $highestColumnIndex) {
return $this;
}
$pColumn = Coordinate::stringFromColumnIndex($pColumnIndex + $pNumCols);
$objReferenceHelper = ReferenceHelper::getInstance();
$objReferenceHelper->insertNewBefore($pColumn . '1', -$pNumCols, 0, $this);
$maxPossibleColumnsToBeRemoved = $highestColumnIndex - $pColumnIndex + 1;
for ($c = 0, $n = min($maxPossibleColumnsToBeRemoved, $pNumCols); $c < $n; ++$c) {
$this->getCellCollection()->removeColumn($highestColumn);
$highestColumn = Coordinate::stringFromColumnIndex(Coordinate::columnIndexFromString($highestColumn) - 1);
}
$this->garbageCollect();
return $this; return $this;
} }

32
tests/PhpSpreadsheetTests/Worksheet/WorksheetTest.php
View File

@ -191,6 +191,7 @@ class WorksheetTest extends TestCase
['A2', 'B2', 'C2'], ['A2', 'B2', 'C2'],
], ],
'A', 'A',
1,
[ [
['B1', 'C1'], ['B1', 'C1'],
['B2', 'C2'], ['B2', 'C2'],
@ -203,6 +204,7 @@ class WorksheetTest extends TestCase
['A2', 'B2', 'C2'], ['A2', 'B2', 'C2'],
], ],
'B', 'B',
1,
[ [
['A1', 'C1'], ['A1', 'C1'],
['A2', 'C2'], ['A2', 'C2'],
@ -215,12 +217,39 @@ class WorksheetTest extends TestCase
['A2', 'B2', 'C2'], ['A2', 'B2', 'C2'],
], ],
'C', 'C',
1,
[ [
['A1', 'B1'], ['A1', 'B1'],
['A2', 'B2'], ['A2', 'B2'],
], ],
'B', 'B',
], ],
'Remove a column out of range' => [
[
['A1', 'B1', 'C1'],
['A2', 'B2', 'C2'],
],
'D',
1,
[
['A1', 'B1', 'C1'],
['A2', 'B2', 'C2'],
],
'C',
],
'Remove multiple columns' => [
[
['A1', 'B1', 'C1'],
['A2', 'B2', 'C2'],
],
'B',
5,
[
['A1'],
['A2'],
],
'A',
],
]; ];
} }
@ -230,6 +259,7 @@ class WorksheetTest extends TestCase
public function testRemoveColumn( public function testRemoveColumn(
array $initialData, array $initialData,
string $columnToBeRemoved, string $columnToBeRemoved,
int $columnsToBeRemoved,
array $expectedData, array $expectedData,
string $expectedHighestColumn string $expectedHighestColumn
) { ) {
@ -237,7 +267,7 @@ class WorksheetTest extends TestCase
$worksheet = $spreadsheet->getActiveSheet(); $worksheet = $spreadsheet->getActiveSheet();
$worksheet->fromArray($initialData); $worksheet->fromArray($initialData);
$worksheet->removeColumn($columnToBeRemoved); $worksheet->removeColumn($columnToBeRemoved, $columnsToBeRemoved);
self::assertSame($expectedHighestColumn, $worksheet->getHighestColumn()); self::assertSame($expectedHighestColumn, $worksheet->getHighestColumn());
self::assertSame($expectedData, $worksheet->toArray()); self::assertSame($expectedData, $worksheet->toArray());