Apply fixes from StyleCI

[ci skip] [skip ci]

Author: patrickbrouwers

tests/Concerns/FromQueryTest.php

@@ -4,7 +4,6 @@
 
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\DB;
-use Maatwebsite\Excel\Tests\TestCase;
 use Maatwebsite\Excel\Tests\Data\Stubs\Database\Group;
 use Maatwebsite\Excel\Tests\Data\Stubs\Database\User;
 use Maatwebsite\Excel\Tests\Data\Stubs\FromGroupUsersQueuedQueryExport;
@@ -13,6 +12,7 @@
 use Maatwebsite\Excel\Tests\Data\Stubs\FromUsersQueryExport;
 use Maatwebsite\Excel\Tests\Data\Stubs\FromUsersQueryExportWithEagerLoad;
 use Maatwebsite\Excel\Tests\Data\Stubs\FromUsersQueryExportWithPrepareRows;
+use Maatwebsite\Excel\Tests\TestCase;
 
 class FromQueryTest extends TestCase
 {
@@ -227,26 +227,6 @@ public function can_export_from_query_with_batch_caching()
         $this->assertEquals($allUsers, $contents);
     }
 
-    protected function format_nested_arrays_expected_data($groups)
-    {
-        $expected = [];
-        foreach ($groups as $group) {
-            $group_row = [$group->name, ''];
-
-            foreach ($group->users as $key => $user) {
-                if ($key === 0) {
-                    $group_row[1] = $user->email;
-                    $expected[]   = $group_row;
-                    continue;
-                }
-
-                $expected[] = ['', $user->email];
-            }
-        }
-
-        return $expected;
-    }
-
     /**
      * @test
      */
@@ -270,4 +250,24 @@ public function can_export_from_query_with_prepare_rows()
 
         $this->assertEquals($allUsers, $contents);
     }
+
+    protected function format_nested_arrays_expected_data($groups)
+    {
+        $expected = [];
+        foreach ($groups as $group) {
+            $group_row = [$group->name, ''];
+
+            foreach ($group->users as $key => $user) {
+                if ($key === 0) {
+                    $group_row[1] = $user->email;
+                    $expected[]   = $group_row;
+                    continue;
+                }
+
+                $expected[] = ['', $user->email];
+            }
+        }
+
+        return $expected;
+    }
 }

tests/Data/Stubs/FromUsersQueryExportWithPrepareRows.php

@@ -4,8 +4,8 @@
 
 use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Collection;
-use Maatwebsite\Excel\Concerns\FromQuery;
 use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
 use Maatwebsite\Excel\Concerns\WithCustomChunkSize;
 use Maatwebsite\Excel\Tests\Data\Stubs\Database\User;