Add ArrayAccess to Row (SpartnerNL#2818)

Author: patrickbrouwers

src/Row.php

@@ -2,10 +2,11 @@
 
 namespace Maatwebsite\Excel;
 
+use ArrayAccess;
 use Illuminate\Support\Collection;
 use PhpOffice\PhpSpreadsheet\Worksheet\Row as SpreadsheetRow;
 
-class Row
+class Row implements ArrayAccess
 {
     use DelegatedMacroable;
 
@@ -17,7 +18,12 @@ class Row
     /**
      * @var SpreadsheetRow
      */
-    private $row;
+    protected $row;
+
+    /**
+     * @var array|null
+     */
+    protected $rowCache;
 
     /**
      * @param SpreadsheetRow $row
@@ -61,6 +67,10 @@ 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)) {
+            return $this->rowCache;
+        }
+
         $cells = [];
 
         $i = 0;
@@ -76,6 +86,8 @@ public function toArray($nullValue = null, $calculateFormulas = false, $formatDa
             $i++;
         }
 
+        $this->rowCache = $cells;
+
         return $cells;
     }
 
@@ -86,4 +98,24 @@ public function getIndex(): int
     {
         return $this->row->getRowIndex();
     }
+
+    public function offsetExists($offset)
+    {
+        return isset(($this->toArray())[$offset]);
+    }
+
+    public function offsetGet($offset)
+    {
+        return ($this->toArray())[$offset];
+    }
+
+    public function offsetSet($offset, $value)
+    {
+        //
+    }
+
+    public function offsetUnset($offset)
+    {
+        //
+    }
 }

tests/Concerns/OnEachRowTest.php

@@ -33,6 +33,8 @@ public function onRow(Row $row)
                     'test', 'test',
                 ], $row->toArray());
 
+                Assert::assertEquals('test', $row[0]);
+
                 $this->called++;
             }
         };