Merge remote-tracking branch 'origin/master'

src/Domain/Teams/Actions/SetTeamFolderPropertyForAllChildrenAction.php

@@ -1,9 +1,8 @@
 <?php
-
 namespace Domain\Teams\Actions;
 
-use Domain\Folders\Models\Folder;
 use Illuminate\Support\Arr;
+use Domain\Folders\Models\Folder;
 use Illuminate\Support\Facades\DB;
 
 class SetTeamFolderPropertyForAllChildrenAction
@@ -20,4 +19,4 @@ class SetTeamFolderPropertyForAllChildrenAction
             ->whereIn('id', Arr::flatten(filter_folders_ids($childrenFolderIds)))
             ->update(['team_folder' => $isTeamFolder]);
     }
-}
+}

src/Domain/Teams/Controllers/ConvertFolderIntoTeamFolderController.php

@@ -1,8 +1,6 @@
 <?php
 namespace Domain\Teams\Controllers;
 
-use Domain\Teams\Actions\SetTeamFolderPropertyForAllChildrenAction;
-use Illuminate\Support\Arr;
 use Illuminate\Http\Response;
 use Domain\Folders\Models\Folder;
 use Illuminate\Support\Facades\DB;
@@ -10,6 +8,7 @@ use App\Http\Controllers\Controller;
 use Illuminate\Contracts\Routing\ResponseFactory;
 use Domain\Teams\Requests\ConvertIntoTeamFolderRequest;
 use Domain\Teams\Actions\InviteMembersIntoTeamFolderAction;
+use Domain\Teams\Actions\SetTeamFolderPropertyForAllChildrenAction;
 
 class ConvertFolderIntoTeamFolderController extends Controller
 {

src/Domain/Teams/Controllers/TeamFoldersController.php

@@ -1,7 +1,6 @@
 <?php
 namespace Domain\Teams\Controllers;
 
-use Domain\Teams\Actions\SetTeamFolderPropertyForAllChildrenAction;
 use Illuminate\Support\Str;
 use Domain\Files\Models\File;
 use Illuminate\Http\Response;
@@ -19,6 +18,7 @@ use Illuminate\Contracts\Routing\ResponseFactory;
 use Domain\Teams\Requests\CreateTeamFolderRequest;
 use Domain\Teams\Requests\UpdateTeamFolderMembersRequest;
 use Domain\Teams\Actions\InviteMembersIntoTeamFolderAction;
+use Domain\Teams\Actions\SetTeamFolderPropertyForAllChildrenAction;
 
 class TeamFoldersController extends Controller
 {

tests/Domain/Teams/TeamManagementTest.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace Tests\Domain\Teams;
 
 use Domain\Files\Models\File;