Fix: Row::toArray() respecting end column

CHANGELOG.md

@@ -5,11 +5,11 @@ All notable changes to this project will be documented in this file.
 ## [Unreleased]
 
 ### Fixed
-- Bug preventing WithChunkReading from working with multiple sheets when using ToCollection or ToArray  
+- Bug preventing WithChunkReading from working with multiple sheets when using ToCollection or ToArray   
+- Row::toArray() now always respects the endColumn
 - Bug that could delete the import file before all the jobs had finished when using WithChunkReading and ShouldQueueWithoutChain
 - Fixed issue where isEmptyWhen was not being called when using OnEachRow
 
-
 ## [3.1.47] - 2023-02-16
 
 - Support Laravel 10

src/Row.php

@@ -42,6 +42,11 @@ class Row implements ArrayAccess
      */
     protected $rowCacheFormatData;
 
+    /**
+     * @var string|null
+     */
+    protected $rowCacheEndColumn;
+
     /**
      * @param  SpreadsheetRow  $row
      * @param  array  $headingRow
@@ -83,7 +88,7 @@ public function toCollection($nullValue = null, $calculateFormulas = false, $for
      */
     public function toArray($nullValue = null, $calculateFormulas = false, $formatData = true, ?string $endColumn = null)
     {
-        if (is_array($this->rowCache) && ($this->rowCacheFormatData === $formatData)) {
+        if (is_array($this->rowCache) && ($this->rowCacheFormatData === $formatData) && ($this->rowCacheEndColumn === $endColumn)) {
             return $this->rowCache;
         }
 
@@ -112,6 +117,7 @@ public function toArray($nullValue = null, $calculateFormulas = false, $formatDa
 
         $this->rowCache           = $cells;
         $this->rowCacheFormatData = $formatData;
+        $this->rowCacheEndColumn  = $endColumn;
 
         return $cells;
     }

tests/Concerns/OnEachRowTest.php

@@ -44,4 +44,32 @@ public function onRow(Row $row)
 
         $this->assertEquals(2, $import->called);
     }
+
+    /**
+     * @test
+     */
+    public function it_respects_the_end_column()
+    {
+        $import = new class implements OnEachRow
+        {
+            use Importable;
+
+            /**
+             * @param  Row  $row
+             */
+            public function onRow(Row $row)
+            {
+                // Accessing a row as an array calls toArray() without an end
+                // column. This saves the row in the cache, so we have to
+                // invalidate the cache once the end column changes
+                $row[0];
+
+                Assert::assertEquals([
+                    'test',
+                ], $row->toArray(null, false, true, 'A'));
+            }
+        };
+
+        $import->import('import.xlsx');
+    }
 }