Exclude heading row when limiting imported rows (#4217)

* Exclude heading row when limiting imported rows

* Compare array contents instead of length

* Add test for multiple limit import with heading row

Author: jivanf

src/Factories/ReaderFactory.php

@@ -4,6 +4,7 @@
 
 use Maatwebsite\Excel\Concerns\MapsCsvSettings;
 use Maatwebsite\Excel\Concerns\WithCustomCsvSettings;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
 use Maatwebsite\Excel\Concerns\WithLimit;
 use Maatwebsite\Excel\Concerns\WithReadFilter;
 use Maatwebsite\Excel\Concerns\WithStartRow;
@@ -61,8 +62,16 @@ public static function make($import, TemporaryFile $file, ?string $readerType =
         if ($import instanceof WithReadFilter) {
             $reader->setReadFilter($import->readFilter());
         } elseif ($import instanceof WithLimit) {
+            $startRow = 1;
+
+            if ($import instanceof WithStartRow) {
+                $startRow = $import->startRow();
+            } elseif ($import instanceof WithHeadingRow) {
+                $startRow = 2;
+            }
+
             $reader->setReadFilter(new LimitFilter(
-                $import instanceof WithStartRow ? $import->startRow() : 1,
+                $startRow,
                 $import->limit()
             ));
         }

tests/Concerns/WithLimitTest.php

@@ -6,6 +6,7 @@
 use Maatwebsite\Excel\Concerns\Importable;
 use Maatwebsite\Excel\Concerns\ToArray;
 use Maatwebsite\Excel\Concerns\ToModel;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
 use Maatwebsite\Excel\Concerns\WithLimit;
 use Maatwebsite\Excel\Concerns\WithStartRow;
 use Maatwebsite\Excel\Tests\Data\Stubs\Database\User;
@@ -104,6 +105,72 @@ public function limit(): int
         $import->import('import-users.xlsx');
     }
 
+    public function test_can_import_single_with_heading_row()
+    {
+        $import = new class implements ToArray, WithLimit, WithHeadingRow
+        {
+            use Importable;
+
+            /**
+             * @param  array  $array
+             */
+            public function array(array $array)
+            {
+                Assert::assertEquals([
+                    [
+                        'Patrick Brouwers',
+                        'patrick@maatwebsite.nl',
+                    ],
+                ], $array);
+            }
+
+            /**
+             * @return int
+             */
+            public function limit(): int
+            {
+                return 1;
+            }
+        };
+
+        $import->import('import-users-with-headings.xlsx');
+    }
+
+    public function test_can_import_multiple_with_heading_row()
+    {
+        $import = new class implements ToArray, WithLimit, WithHeadingRow
+        {
+            use Importable;
+
+            /**
+             * @param  array  $array
+             */
+            public function array(array $array)
+            {
+                Assert::assertEquals([
+                    [
+                        'Patrick Brouwers',
+                        'patrick@maatwebsite.nl',
+                    ],
+                    [
+                        'Taylor Otwell',
+                        'taylor@laravel.com',
+                    ],
+                ], $array);
+            }
+
+            /**
+             * @return int
+             */
+            public function limit(): int
+            {
+                return 2;
+            }
+        };
+
+        $import->import('import-users-with-headings.xlsx');
+    }
+
     public function test_can_set_limit_bigger_than_row_size()
     {
         $import = new class implements ToArray, WithLimit