Fixed SkipsEmptyRows support with the WithColumnLimit concern (#3455)

* Fixed SkipsEmptyRows support with the WithColumnLimit concern * Fixed Code Style * Added spaces in the PHPDoc related to the isEmpty function Co-authored-by: Francesco Silvestro <francy891@hotmai.it>
SpartnerNL · Dec 22, 2021 · ad981fd · ad981fd
1 parent 1e3a1f6
commit ad981fd
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+### Fixed
+
+- Fix `SkipsEmptyRows` support with the `WithColumnLimit` concern
 - formatColumn added range support
 
 ## [3.1.34] - 2021-12-2

diff --git a/src/Row.php b/src/Row.php
@@ -99,11 +99,13 @@ public function toArray($nullValue = null, $calculateFormulas = false, $formatDa
     }
 
     /**
+     * @param  bool  $calculateFormulas
+     * @param  string|null  $endColumn
      * @return bool
      */
-    public function isEmpty($calculateFormulas = false): bool
+    public function isEmpty($calculateFormulas = false, ?string $endColumn = null): bool
     {
-        return count(array_filter($this->toArray(null, $calculateFormulas, false))) === 0;
+        return count(array_filter($this->toArray(null, $calculateFormulas, false, $endColumn))) === 0;
     }
 
     /**

diff --git a/src/Sheet.php b/src/Sheet.php
@@ -340,7 +340,7 @@ public function toArray($import, int $startRow = null, $nullValue = null, $calcu
         foreach ($this->worksheet->getRowIterator($startRow, $endRow) as $index => $row) {
             $row = new Row($row, $headingRow);
 
-            if ($import instanceof SkipsEmptyRows && $row->isEmpty($calculateFormulas)) {
+            if ($import instanceof SkipsEmptyRows && $row->isEmpty($calculateFormulas, $endColumn)) {
                 continue;
             }
 

diff --git a/tests/Concerns/WithColumnLimitTest.php b/tests/Concerns/WithColumnLimitTest.php
@@ -3,6 +3,7 @@
 namespace Maatwebsite\Excel\Tests\Concerns;
 
 use Maatwebsite\Excel\Concerns\Importable;
+use Maatwebsite\Excel\Concerns\SkipsEmptyRows;
 use Maatwebsite\Excel\Concerns\ToArray;
 use Maatwebsite\Excel\Concerns\WithColumnLimit;
 use Maatwebsite\Excel\Tests\TestCase;
@@ -52,4 +53,49 @@ public function endColumn(): string
 
         $import->import('import-users.xlsx');
     }
+
+    /**
+     * @test
+     */
+    public function can_import_to_array_with_column_limit_and_skips_empty_rows()
+    {
+        $import = new class implements ToArray, WithColumnLimit, SkipsEmptyRows
+        {
+            use Importable;
+
+            /**
+             * @param  array  $array
+             */
+            public function array(array $array)
+            {
+                Assert::assertEquals([
+                    [
+                        'Test1',
+                        'Test2',
+                        null,
+                        null,
+                    ],
+                    [
+                        'Test3',
+                        'Test4',
+                        null,
+                        null,
+                    ],
+                    [
+                        'Test5',
+                        'Test6',
+                        null,
+                        null,
+                    ],
+                ], $array);
+            }
+
+            public function endColumn(): string
+            {
+                return 'D';
+            }
+        };
+
+        $import->import('import-empty-rows.xlsx');
+    }
 }