Potential improvements for insert/delete column/row for performance testing

Author: MarkBaker

src/PhpSpreadsheet/ReferenceHelper.php

@@ -367,7 +367,6 @@ public function insertNewBefore(
         Worksheet $worksheet
     ): void {
         $remove = ($numberOfColumns < 0 || $numberOfRows < 0);
-        $allCoordinates = $worksheet->getCoordinates();
 
         if (
             $this->cellReferenceHelper === null ||
@@ -394,12 +393,13 @@ public function insertNewBefore(
         }
 
         // Find missing coordinates. This is important when inserting column before the last column
+        $cellCollection = $worksheet->getCellCollection();
         $missingCoordinates = array_filter(
             array_map(function ($row) use ($highestColumn) {
                 return $highestColumn . $row;
             }, range(1, $highestRow)),
-            function ($coordinate) use ($allCoordinates) {
-                return in_array($coordinate, $allCoordinates, true) === false;
+            function ($coordinate) use ($cellCollection) {
+                return $cellCollection->has($coordinate) === false;
             }
         );
 
@@ -408,16 +408,15 @@ function ($coordinate) use ($allCoordinates) {
             foreach ($missingCoordinates as $coordinate) {
                 $worksheet->createNewCell($coordinate);
             }
-
-            // Refresh all coordinates
-            $allCoordinates = $worksheet->getCoordinates();
         }
 
-        // Loop through cells, bottom-up, and change cell coordinate
+        $allCoordinates = $worksheet->getCoordinates();
         if ($remove) {
             // It's faster to reverse and pop than to use unshift, especially with large cell collections
             $allCoordinates = array_reverse($allCoordinates);
         }
+
+        // Loop through cells, bottom-up, and change cell coordinate
         while ($coordinate = array_pop($allCoordinates)) {
             $cell = $worksheet->getCell($coordinate);
             $cellIndex = Coordinate::columnIndexFromString($cell->getColumn());
@@ -927,11 +926,7 @@ private function clearColumnStrips(int $highestRow, int $beforeColumn, int $numb
         for ($i = 1; $i <= $highestRow - 1; ++$i) {
             for ($j = $beforeColumn - 1 + $numberOfColumns; $j <= $beforeColumn - 2; ++$j) {
                 $coordinate = Coordinate::stringFromColumnIndex($j + 1) . $i;
-                $worksheet->removeConditionalStyles($coordinate);
-                if ($worksheet->cellExists($coordinate)) {
-                    $worksheet->getCell($coordinate)->setValueExplicit(null, DataType::TYPE_NULL);
-                    $worksheet->getCell($coordinate)->setXfIndex(0);
-                }
+                $this->clearStripCell($worksheet, $coordinate);
             }
         }
     }
@@ -943,15 +938,24 @@ private function clearRowStrips(string $highestColumn, int $beforeColumn, int $b
         for ($i = $beforeColumn - 1; $i <= $lastColumnIndex; ++$i) {
             for ($j = $beforeRow + $numberOfRows; $j <= $beforeRow - 1; ++$j) {
                 $coordinate = Coordinate::stringFromColumnIndex($i + 1) . $j;
-                $worksheet->removeConditionalStyles($coordinate);
-                if ($worksheet->cellExists($coordinate)) {
-                    $worksheet->getCell($coordinate)->setValueExplicit(null, DataType::TYPE_NULL);
-                    $worksheet->getCell($coordinate)->setXfIndex(0);
-                }
+                $this->clearStripCell($worksheet, $coordinate);
             }
         }
     }
 
+    private function clearStripCell(Worksheet $worksheet, string $coordinate)
+    {
+        // TODO - Should also clear down comments, but wait until after comment removal PR-2875 is merged
+        $worksheet->removeConditionalStyles($coordinate);
+        $worksheet->setHyperlink($coordinate);
+        $worksheet->setDataValidation($coordinate);
+
+        if ($worksheet->cellExists($coordinate)) {
+            $worksheet->getCell($coordinate)->setValueExplicit(null, DataType::TYPE_NULL);
+            $worksheet->getCell($coordinate)->setXfIndex(0);
+        }
+    }
+
     private function adjustAutoFilter(Worksheet $worksheet, string $beforeCellAddress, int $numberOfColumns): void
     {
         $autoFilter = $worksheet->getAutoFilter();