Merge pull request #2767 from PHPOffice/CellCollection-Last-Loop-Adjust

Performance tweaks to cell collection

Author: MarkBaker

phpstan-baseline.neon

@@ -1175,11 +1175,6 @@ parameters:
 			count: 1
 			path: src/PhpSpreadsheet/Cell/Coordinate.php
 
-		-
-			message: "#^Cannot use array destructuring on array\\|null\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Cell/Coordinate.php
-
 		-
 			message: "#^Parameter \\#4 \\$currentRow of static method PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\Coordinate\\:\\:validateRange\\(\\) expects int, string given\\.$#"
 			count: 1
@@ -3120,11 +3115,6 @@ parameters:
 			count: 1
 			path: src/PhpSpreadsheet/Reader/Xml/Style.php
 
-		-
-			message: "#^Cannot use array destructuring on array\\|null\\.$#"
-			count: 4
-			path: src/PhpSpreadsheet/ReferenceHelper.php
-
 		-
 			message: "#^Elseif condition is always true\\.$#"
 			count: 1

src/PhpSpreadsheet/Cell/Coordinate.php

@@ -383,7 +383,7 @@ private static function sortCellReferenceArray(array $cellList): array
         //    Sort the result by column and row
         $sortKeys = [];
         foreach ($cellList as $coord) {
-            [$column, $row] = sscanf($coord, '%[A-Z]%d');
+            sscanf($coord, '%[A-Z]%d', $column, $row);
             $sortKeys[sprintf('%3s%09d', $column, $row)] = $coord;
         }
         ksort($sortKeys);

src/PhpSpreadsheet/Collection/Cells.php

@@ -4,7 +4,6 @@
 
 use Generator;
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
-use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
 use PhpOffice\PhpSpreadsheet\Settings;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
@@ -152,8 +151,6 @@ public function getSortedCoordinates()
     {
         $sortKeys = [];
         foreach ($this->getCoordinates() as $coord) {
-            $column = '';
-            $row = 0;
             sscanf($coord, '%[A-Z]%d', $column, $row);
             $sortKeys[sprintf('%09d%3s', $row, $column)] = $coord;
         }
@@ -172,8 +169,6 @@ public function getHighestRowAndColumn()
         // Lookup highest column and highest row
         $col = ['A' => '1A'];
         $row = [1];
-        $c = '';
-        $r = 0;
         foreach ($this->getCoordinates() as $coord) {
             sscanf($coord, '%[A-Z]%d', $c, $r);
             $row[$r] = $r;
@@ -207,9 +202,6 @@ public function getCurrentCoordinate()
      */
     public function getCurrentColumn()
     {
-        $column = '';
-        $row = 0;
-
         sscanf($this->currentCoordinate ?? '', '%[A-Z]%d', $column, $row);
 
         return $column;
@@ -222,9 +214,6 @@ public function getCurrentColumn()
      */
     public function getCurrentRow()
     {
-        $column = '';
-        $row = 0;
-
         sscanf($this->currentCoordinate ?? '', '%[A-Z]%d', $column, $row);
 
         return (int) $row;
@@ -245,8 +234,6 @@ public function getHighestColumn($row = null)
         }
 
         $maxColumn = '1A';
-        $c = '';
-        $r = 0;
         foreach ($this->getCoordinates() as $coord) {
             sscanf($coord, '%[A-Z]%d', $c, $r);
             if ($r != $row) {
@@ -273,8 +260,6 @@ public function getHighestRow($column = null)
         }
 
         $maxRow = 1;
-        $c = '';
-        $r = 0;
         foreach ($this->getCoordinates() as $coord) {
             sscanf($coord, '%[A-Z]%d', $c, $r);
             if ($c != $column) {
@@ -341,8 +326,6 @@ public function cloneCellCollection(Worksheet $worksheet)
      */
     public function removeRow($row): void
     {
-        $c = '';
-        $r = 0;
         foreach ($this->getCoordinates() as $coord) {
             sscanf($coord, '%[A-Z]%d', $c, $r);
             if ($r == $row) {
@@ -358,8 +341,6 @@ public function removeRow($row): void
      */
     public function removeColumn($column): void
     {
-        $c = '';
-        $r = 0;
         foreach ($this->getCoordinates() as $coord) {
             sscanf($coord, '%[A-Z]%d', $c, $r);
             if ($c == $column) {

src/PhpSpreadsheet/ReferenceHelper.php

@@ -90,8 +90,8 @@ public static function columnReverseSort($a, $b)
      */
     public static function cellSort($a, $b)
     {
-        [$ac, $ar] = sscanf($a, '%[A-Z]%d');
-        [$bc, $br] = sscanf($b, '%[A-Z]%d');
+        sscanf($a, '%[A-Z]%d', $ac, $ar);
+        sscanf($b, '%[A-Z]%d', $bc, $br);
 
         if ($ar === $br) {
             return strcasecmp(strlen($ac) . $ac, strlen($bc) . $bc);
@@ -111,8 +111,8 @@ public static function cellSort($a, $b)
      */
     public static function cellReverseSort($a, $b)
     {
-        [$ac, $ar] = sscanf($a, '%[A-Z]%d');
-        [$bc, $br] = sscanf($b, '%[A-Z]%d');
+        sscanf($a, '%[A-Z]%d', $ac, $ar);
+        sscanf($b, '%[A-Z]%d', $bc, $br);
 
         if ($ar === $br) {
             return -strcasecmp(strlen($ac) . $ac, strlen($bc) . $bc);