A Little Less Hideous, A Little More Flexible

Author: oleibman

src/PhpSpreadsheet/Reader/Xlsx.php

@@ -901,10 +901,13 @@ protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
                                 $dir,
                                 $richData,
                                 $docSheet,
-                                "$dir/$fileWorksheet",
-                                $mainNS,
                                 $sharedStrings,
-                                $styles
+                                $styles,
+                                [
+                                    // this array can be expanded with additional entries to make it easier to extend
+                                    'mainNS' => $mainNS,
+                                    'fileWorksheetPath' => "$dir/$fileWorksheet",
+                                ],
                             );
 
                             $docSheet->setSelectedCells($holdSelectedCells);
@@ -1893,21 +1896,19 @@ protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
     /**
      * @param string[][] $richData
      * @param Worksheet $docSheet the worksheet to populate
-     * @param string $fileWorksheetPath path to worksheet XML within the zip
-     * @param string $mainNS the main spreadsheetml namespace
      * @param array<int, mixed> $sharedStrings shared string table
      * @param object[] $styles style objects array
+     * @param mixed[] $extraParameters maybe make it a little easier to extend
      */
     protected function loadSheetData(
         ?SimpleXMLElement $xmlSheetNS,
         string $filename,
         string $dir,
         array $richData,
         Worksheet $docSheet,
-        string $fileWorksheetPath,
-        string $mainNS,
         array $sharedStrings,
         array $styles,
+        array $extraParameters = [],
     ): void {
         if (!($xmlSheetNS && $xmlSheetNS->sheetData && $xmlSheetNS->sheetData->row)) {
             return; // @codeCoverageIgnore

tests/Benchmark/XlsxStreamingReadClass.php

@@ -19,22 +19,29 @@ class XlsxStreamingReadClass extends Xlsx
      *
      * @param string[][] $richData
      * @param Worksheet $docSheet the worksheet to populate
-     * @param string $fileWorksheetPath path to worksheet XML within the zip
-     * @param string $mainNS the main spreadsheetml namespace
      * @param array<int, mixed> $sharedStrings shared string table
      * @param object[] $styles style objects array
+     * @param mixed[] $extraParameters maybe make it a little easier to extend
      */
     protected function loadSheetData(
         ?SimpleXMLElement $xmlSheetNS,
         string $filename,
         string $dir,
         array $richData,
         Worksheet $docSheet,
-        string $fileWorksheetPath,
-        string $mainNS,
         array $sharedStrings,
         array $styles,
+        array $extraParameters = [],
     ): void {
+        if (!isset($extraParameters['mainNS'], $extraParameters['fileWorksheetPath'])) {
+            parent::loadSheetData($xmlSheetNS, $filename, $dir, $richData, $docSheet, $sharedStrings, $styles); // @codeCoverageIgnore
+
+            return; // @codeCoverageIgnore
+        }
+        /** @var string */
+        $fileWorksheetPath = $extraParameters['fileWorksheetPath']; // path to worksheet Xml within zip
+        /** @var string */
+        $mainNS = $extraParameters['mainNS']; // main spreadsheet namespace
         $xmlContent = $this->getFromZipArchive($this->zip, $fileWorksheetPath);
         if ($xmlContent === '') {
             return; // @codeCoverageIgnore