added test for getRecordsCount, format code

src/Domain/Browsing/Controllers/BrowseFolderController.php

@@ -5,7 +5,9 @@ use Str;
 use Domain\Files\Models\File;
 use Domain\Folders\Models\Folder;
 use Illuminate\Support\Facades\Auth;
+use Domain\Files\Resources\FilesCollection;
 use Domain\Folders\Resources\FolderResource;
+use Domain\Folders\Resources\FolderCollection;
 
 class BrowseFolderController
 {
@@ -18,16 +20,16 @@ class BrowseFolderController
             'parent_id'   => $root_id,
             'team_folder' => false,
             'user_id'     => Auth::id(),
-            'deleted_at'  => null
+            'deleted_at'  => null,
         ];
 
         $fileQuery = [
             'parent_id'   => $root_id,
             'user_id'     => Auth::id(),
-            'deleted_at'  => null
+            'deleted_at'  => null,
         ];
 
-        list($foldersTake, $foldersSkip, $filesTake, $filesSkip, $totalItemsCount) = getRecordsCount($folderQuery, $fileQuery);
+        list($foldersTake, $foldersSkip, $filesTake, $filesSkip, $totalItemsCount) = getRecordsCount($folderQuery, $fileQuery, request()->input('page'));
 
         $folders = Folder::with(['parent:id,name', 'shared:token,id,item_id,permission,is_protected,expire_in'])
             ->where($folderQuery)
@@ -42,16 +44,21 @@ class BrowseFolderController
             ->skip($filesSkip)
             ->take($filesTake)
             ->get();
+        
+        $entries = collect([
+            $folders ? json_decode((new FolderCollection($folders))->toJson(), true) : null,
+            $files ? json_decode((new FilesCollection($files))->toJson(), true) : null,
+        ])->collapse();
             
-        list($data, $paginate, $links) = groupPaginate($folders, $files, $totalItemsCount);
+        list($paginate, $links) = generatePaginationCounts($totalItemsCount);
 
         return [
-            'data'  => $data,
+            'data'  => $entries,
             'links' => $links,
             'meta'  => [
                 'paginate' => $paginate,
                 'root'     => $root_id ? new FolderResource(Folder::findOrFail($root_id)) : null,
-            ]
+            ],
         ];
     }
 }

src/Domain/Browsing/Controllers/BrowseLatestFilesController.php

@@ -2,8 +2,8 @@
 namespace Domain\Browsing\Controllers;
 
 use App\Users\Models\User;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
 class BrowseLatestFilesController
 {
@@ -23,7 +23,7 @@ class BrowseLatestFilesController
             'meta'  => [
                 'paginate' => $paginate,
                 'root'     => null,
-            ]
+            ],
         ];
     }
 }

src/Domain/Browsing/Controllers/BrowseSharedItemsController.php

@@ -1,11 +1,11 @@
 <?php
 namespace Domain\Browsing\Controllers;
 
+use Illuminate\Http\Request;
 use Domain\Files\Models\File;
 use Domain\Sharing\Models\Share;
 use Domain\Folders\Models\Folder;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Http\Request;
 
 class BrowseSharedItemsController
 {
@@ -44,7 +44,7 @@ class BrowseSharedItemsController
             'meta'  => [
                 'paginate' => $paginate,
                 'root'     => null,
-            ]
+            ],
         ];
     }
 }

src/Domain/Browsing/Controllers/BrowseTrashContentController.php

@@ -1,10 +1,10 @@
 <?php
 namespace Domain\Browsing\Controllers;
 
+use Illuminate\Http\Request;
 use Domain\Files\Models\File;
 use Domain\Folders\Models\Folder;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Http\Request;
 
 class BrowseTrashContentController
 {
@@ -27,14 +27,12 @@ class BrowseTrashContentController
                 ->where('parent_id', $root_id)
                 ->sortable()
                 ->get();
-
-
         } else {
             // Get folders and files
             $folders_trashed = Folder::onlyTrashed()
-            ->with(['trashedFolders', 'parent'])
-            ->where('user_id', $user_id)
-            ->get(['parent_id', 'id', 'name']);
+                ->with(['trashedFolders', 'parent'])
+                ->where('user_id', $user_id)
+                ->get(['parent_id', 'id', 'name']);
 
             $folders = Folder::onlyTrashed()
                 ->with(['parent'])
@@ -64,7 +62,7 @@ class BrowseTrashContentController
             'meta'  => [
                 'paginate' => $paginate,
                 'root'     => $requestedFolder,
-            ]
+            ],
         ];
     }
 }

src/Domain/Browsing/Controllers/VisitorBrowseFolderController.php

@@ -1,13 +1,13 @@
 <?php
 namespace Domain\Browsing\Controllers;
 
+use Illuminate\Http\Request;
 use Domain\Files\Models\File;
 use Domain\Sharing\Models\Share;
 use Domain\Folders\Models\Folder;
 use Domain\Folders\Resources\FolderResource;
 use Domain\Sharing\Actions\ProtectShareRecordAction;
 use Domain\Sharing\Actions\VerifyAccessToItemAction;
-use Illuminate\Http\Request;
 
 /**
  * Browse shared folder
@@ -56,7 +56,7 @@ class VisitorBrowseFolderController
             'meta'  => [
                 'paginate' => $paginate,
                 'root'     => new FolderResource($requestedFolder),
-            ]
+            ],
         ];
     }
 }

src/Domain/Files/Actions/GenerateImageThumbnailAction.php

@@ -19,7 +19,6 @@ class GenerateImageThumbnailAction
         collect(config("vuefilemanager.image_sizes.$execution"))
             ->each(function ($size) use ($userId, $fileName, $imageWidth) {
                 if ($imageWidth > $size['size']) {
-
                     // Create intervention image
                     $intervention = Image::make(
                         Storage::disk('local')->path("temp/$userId/$fileName")

src/Domain/Files/Controllers/UploadFileController.php

@@ -2,7 +2,6 @@
 namespace Domain\Files\Controllers;
 
 use Domain\Files\Models\File;
-use Illuminate\Http\Response;
 use App\Http\Controllers\Controller;
 use Domain\Files\Requests\UploadRequest;
 use Domain\Files\Resources\FileResource;
@@ -21,7 +20,8 @@ class UploadFileController extends Controller
     /**
      * Upload file for authenticated master|editor user
      */
-    public function __invoke(UploadRequest $request)  {
+    public function __invoke(UploadRequest $request)
+    {
         if (is_demo_account()) {
             return ($this->fakeUploadFile)($request);
         }

src/Domain/Files/Requests/UploadRequest.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace Domain\Files\Requests;
 
 use Domain\Admin\Rules\DisabledMimetypes;

src/Domain/Items/Controllers/RenameFileOrFolderController.php

@@ -1,10 +1,10 @@
 <?php
 namespace Domain\Items\Controllers;
 
-use App\Http\Controllers\Controller;
 use Domain\Files\Models\File;
-use Domain\Files\Resources\FileResource;
 use Domain\Folders\Models\Folder;
+use App\Http\Controllers\Controller;
+use Domain\Files\Resources\FileResource;
 use Domain\Folders\Resources\FolderResource;
 use Domain\Items\Requests\RenameItemRequest;
 use Domain\Items\Actions\RenameFileOrFolderAction;

src/Domain/SetupWizard/Controllers/CreateAdminAccountController.php

@@ -3,7 +3,6 @@ namespace Domain\SetupWizard\Controllers;
 
 use Artisan;
 use App\Users\Models\User;
-use Domain\SetupWizard\Actions\CreateDiskDirectoriesAction;
 use Illuminate\Http\Response;
 use Domain\Settings\Models\Setting;
 use App\Http\Controllers\Controller;
@@ -12,6 +11,7 @@ use Domain\Pages\Actions\SeedDefaultPagesAction;
 use Domain\Settings\Actions\SeedDefaultSettingsAction;
 use Domain\SetupWizard\Requests\StoreAdminAccountRequest;
 use Domain\Localization\Actions\SeedDefaultLanguageAction;
+use Domain\SetupWizard\Actions\CreateDiskDirectoriesAction;
 
 /**
  * Create and login admin account

src/Domain/Teams/Controllers/BrowseSharedWithMeController.php

@@ -53,8 +53,8 @@ class BrowseSharedWithMeController
             'links'      => $links,
             'meta'       => [
                 'paginate' => $paginate,
-                'root'     => $id ? new FolderResource(Folder::findOrFail($id)) : null
-            ]
+                'root'     => $id ? new FolderResource(Folder::findOrFail($id)) : null,
+            ],
         ];
     }
 }

src/Domain/Teams/Controllers/TeamFoldersController.php

@@ -61,7 +61,7 @@ class TeamFoldersController extends Controller
             'meta'       => [
                 'paginate'   => $paginate,
                 'root'       => $id ? new FolderResource(Folder::findOrFail($id)) : null,
-            ]
+            ],
         ];
     }
 

src/Domain/Teams/Notifications/InvitationIntoTeamFolder.php

@@ -61,7 +61,7 @@ class InvitationIntoTeamFolder extends Notification implements ShouldQueue
         return [
             'category'    => 'team-invitation',
             'title'       => __t('new_team_invitation'),
-            'description' => __t('x_invite_to_join_team', ['name' => $this->invitation->inviter->settings->name,]),
+            'description' => __t('x_invite_to_join_team', ['name' => $this->invitation->inviter->settings->name, ]),
             'action'      => [
                 'type'   => 'invitation',
                 'params' => [

src/Domain/UploadRequest/Notifications/UploadRequestFulfilledNotification.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace Domain\UploadRequest\Notifications;
 
 use Illuminate\Bus\Queueable;
@@ -19,7 +18,8 @@ class UploadRequestFulfilledNotification extends Notification implements ShouldQ
      */
     public function __construct(
         public UploadRequest $uploadRequest
-    ) {}
+    ) {
+    }
 
     /**
      * Get the notification's delivery channels.
@@ -50,7 +50,7 @@ class UploadRequestFulfilledNotification extends Notification implements ShouldQ
         return [
             'category'    => 'file-request',
             'title'       => __t('file_request_filled'),
-            'description' => __t('file_request_filled_desc', ['name' => $this->uploadRequest->parent->name,]),
+            'description' => __t('file_request_filled_desc', ['name' => $this->uploadRequest->parent->name, ]),
             'action'      => [
                 'type'   => 'route',
                 'params' => [