Revert "Exclude heading row when limiting imported rows (#4217)" (#4272)

This reverts commit 203d0cd.

Author: patrickbrouwers

src/Factories/ReaderFactory.php

@@ -4,7 +4,6 @@
 
 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;
@@ -62,16 +61,8 @@ 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(
-                $startRow,
+                $import instanceof WithStartRow ? $import->startRow() : 1,
                 $import->limit()
             ));
         }

tests/Concerns/WithLimitTest.php

@@ -6,7 +6,6 @@
 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;
@@ -105,72 +104,6 @@ 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',
-                        '[email protected]',
-                    ],
-                ], $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',
-                        '[email protected]',
-                    ],
-                    [
-                        'Taylor Otwell',
-                        '[email protected]',
-                    ],
-                ], $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