Revert "Merge commit 'a2b6ce161274720e2358154fa16736aee86daf7e' into …

…features/with-grouped-headers" This reverts commit e4634e3, reversing changes made to 5dfdf05.
SpartnerNL · Mar 10, 2022 · e9f2552 · e9f2552
1 parent e4634e3
commit e9f2552
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 72 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,6 @@ All notable changes to this project will be documented in this file.
 ## [Unreleased]
 
 - Adds concern `WithGroupedHeadingRow` to allow imported sheets to group the values of columns with the same header in an array
-- Added failing test for `prepareForValidation` callback not being called when using `SkipsEmptyRows`
 
 ## [3.1.37] - 2022-02-28
 

diff --git a/src/Sheet.php b/src/Sheet.php
@@ -292,12 +292,9 @@ public function import($import, int $startRow = 1)
             foreach ($this->worksheet->getRowIterator()->resetStart($startRow ?? 1) as $row) {
                 $sheetRow = new Row($row, $headingRow, $headerIsGrouped);
 
-                if ($import instanceof WithValidation) {
-                    $sheetRow->setPreparationCallback($preparationCallback);
-                }
-
                 if (!$import instanceof SkipsEmptyRows || ($import instanceof SkipsEmptyRows && !$sheetRow->isEmpty($calculatesFormulas))) {
                     if ($import instanceof WithValidation) {
+                        $sheetRow->setPreparationCallback($preparationCallback);
                         $toValidate = [$sheetRow->getIndex() => $sheetRow->toArray(null, $import instanceof WithCalculatedFormulas, $import instanceof WithFormatData, $endColumn)];
 
                         try {

diff --git a/tests/Concerns/WithValidationTest.php b/tests/Concerns/WithValidationTest.php
@@ -8,7 +8,6 @@
 use Illuminate\Validation\Validator;
 use Maatwebsite\Excel\Concerns\Importable;
 use Maatwebsite\Excel\Concerns\OnEachRow;
-use Maatwebsite\Excel\Concerns\SkipsEmptyRows;
 use Maatwebsite\Excel\Concerns\ToArray;
 use Maatwebsite\Excel\Concerns\ToCollection;
 use Maatwebsite\Excel\Concerns\ToModel;
@@ -891,72 +890,6 @@ public function onRow(Row $row)
         $this->assertInstanceOf(ValidationException::class, $e ?? null);
     }
 
-    /**
-     * @test
-     */
-    public function can_prepare_using_skipsemptyrows()
-    {
-        $import = new class implements OnEachRow, WithValidation, SkipsEmptyRows
-        {
-            use Importable;
-
-            /**
-             * @return array
-             */
-            public function rules(): array
-            {
-                return [
-                    '1' => 'email',
-                ];
-            }
-
-            /**
-             * Prepare the data for validation.
-             *
-             * @param  array  $row
-             * @param  int  $index
-             * @return array
-             */
-            public function prepareForValidation(array $row, int $index)
-            {
-                if ($index === 2) {
-                    $row[1] = 'not an email';
-                }
-
-                return $row;
-            }
-
-            /**
-             * @param  \Maatwebsite\Excel\Row  $row
-             * @return void
-             */
-            public function onRow(Row $row)
-            {
-                User::query()->create([
-                    'name'     => $row[0],
-                    'email'    => $row[1],
-                    'password' => 'secret',
-                ]);
-            }
-        };
-
-        try {
-            $import->import('import-users.xlsx');
-        } catch (ValidationException $e) {
-            $this->validateFailure($e, 2, '1', [
-                'The 1 must be a valid email address.',
-            ]);
-
-            $this->assertEquals([
-                [
-                    'There was an error on row 2. The 1 must be a valid email address.',
-                ],
-            ], $e->errors());
-        }
-
-        $this->assertInstanceOf(ValidationException::class, $e ?? null);
-    }
-
     /**
      * @param  ValidationException  $e
      * @param  int  $row