Clientbase
/
PhpSpreadsheet
mirror of https://github.com/basemaster/PhpSpreadsheet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2764 from PHPOffice/CellCollection-Performance-Tweaks 

Performance tweaks to cell collection
This commit is contained in:
Mark Baker 2022-04-22 10:03:17 +02:00 committed by GitHub
parent ee24f59af1 b5e11b1307
commit f48044cb94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/PhpSpreadsheet/Collection/Cells.php
View File

@ -172,9 +172,9 @@ class Cells
// Lookup highest column and highest row
$col = ['A' => '1A'];
$row = [1];
$c = '';
$r = 0;
foreach ($this->getCoordinates() as $coord) {
$c = '';
$r = 0;
sscanf($coord, '%[A-Z]%d', $c, $r);
$row[$r] = $r;
$col[$c] = strlen($c) . $c;
@ -241,24 +241,21 @@ class Cells
public function getHighestColumn($row = null)
{
if ($row === null) {
$colRow = $this->getHighestRowAndColumn();
return $colRow['column'];
return $this->getHighestRowAndColumn()['column'];
}
$columnList = [1];
$maxColumn = '1A';
$c = '';
$r = 0;
foreach ($this->getCoordinates() as $coord) {
$c = '';
$r = 0;
sscanf($coord, '%[A-Z]%d', $c, $r);
if ($r != $row) {
continue;
}
$columnList[] = Coordinate::columnIndexFromString($c);
$maxColumn = max($maxColumn, strlen($c) . $c);
}
return Coordinate::stringFromColumnIndex((int) @max($columnList));
return substr($maxColumn, 1);
}
/**
@ -272,24 +269,21 @@ class Cells
public function getHighestRow($column = null)
{
if ($column === null) {
$colRow = $this->getHighestRowAndColumn();
return $colRow['row'];
return $this->getHighestRowAndColumn()['row'];
}
$rowList = [0];
$maxRow = 1;
$c = '';
$r = 0;
foreach ($this->getCoordinates() as $coord) {
$c = '';
$r = 0;
sscanf($coord, '%[A-Z]%d', $c, $r);
if ($c != $column) {
continue;
}
$rowList[] = $r;
$maxRow = max($maxRow, $r);
}
return max($rowList);
return $maxRow;
}
/**
@ -347,10 +341,9 @@ class Cells
*/
public function removeRow($row): void
{
$c = '';
$r = 0;
foreach ($this->getCoordinates() as $coord) {
$c = '';
$r = 0;
sscanf($coord, '%[A-Z]%d', $c, $r);
if ($r == $row) {
$this->delete($coord);
@ -365,10 +358,9 @@ class Cells
*/
public function removeColumn($column): void
{
$c = '';
$r = 0;
foreach ($this->getCoordinates() as $coord) {
$c = '';
$r = 0;
sscanf($coord, '%[A-Z]%d', $c, $r);
if ($c == $column) {
$this->delete($coord);