From cdaad931bb49e65cf1683665666ef529cbaeb4a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=8Carodej?= Date: Wed, 3 Nov 2021 17:34:46 +0100 Subject: [PATCH] format --- config/vuefilemanager.php | 2 +- routes/api.php | 2 +- routes/teams.php | 5 ++- .../Console/Commands/SetupDevEnvironment.php | 31 +++++++------------ src/App/Providers/AuthServiceProvider.php | 4 +-- .../UpdateProfileSettingsController.php | 4 +-- src/App/Users/Models/UserSettings.php | 2 -- .../UpdateUserProfileSettingsRequest.php | 1 - .../Actions/CreateImageThumbnailAction.php | 5 --- .../Files/Actions/DownloadThumbnailAction.php | 1 - src/Domain/Files/Actions/UploadFileAction.php | 2 +- .../FileAccess/GetFileController.php | 4 +-- .../FileAccess/GetThumbnailController.php | 4 +-- .../Controllers/VisitorShowFileController.php | 4 +-- src/Domain/Files/Models/File.php | 4 --- src/Domain/Files/Resources/FileResource.php | 7 ++--- .../Controllers/NavigationTreeController.php | 3 +- .../Items/Actions/MoveFileOrFolderAction.php | 3 +- .../VisitorDeleteFileOrFolderController.php | 1 - .../VisitorMoveFileOrFolderController.php | 1 - .../BrowseSharedWithMeController.php | 11 +++---- .../ConvertFolderIntoTeamFolderController.php | 3 +- .../Controllers/InvitationsController.php | 2 +- .../Controllers/LeaveTeamFolderController.php | 13 ++++---- .../Controllers/NavigationTreeController.php | 2 +- .../Controllers/TeamFoldersController.php | 1 - .../Teams/Models/TeamFolderInvitation.php | 2 +- .../Resources/TeamInvitationResource.php | 3 +- src/Support/helpers.php | 3 +- tests/App/Users/UserAccountTest.php | 3 +- tests/Domain/Admin/AdminTest.php | 5 +-- tests/Domain/Browsing/BrowseTest.php | 1 - tests/Domain/Files/ContentAccessTest.php | 2 -- tests/Domain/Files/FileTest.php | 3 +- tests/Domain/Homepage/HomepageTest.php | 1 - tests/Domain/SetupWizard/SetupWizardTest.php | 3 +- .../Sharing/VisitorAccessToItemsTest.php | 7 ++--- tests/Domain/Spotlight/SearchTest.php | 14 ++++----- tests/Domain/Teams/TeamManagementTest.php | 11 +++---- tests/Domain/Teams/TeamsTest.php | 1 - 40 files changed, 69 insertions(+), 112 deletions(-) diff --git a/config/vuefilemanager.php b/config/vuefilemanager.php index abe71252..11b9afe0 100644 --- a/config/vuefilemanager.php +++ b/config/vuefilemanager.php @@ -49,5 +49,5 @@ return [ 'size' => 120, 'name' => 'xs', ], - ] + ], ]; diff --git a/routes/api.php b/routes/api.php index 7e4071cb..112fdee4 100644 --- a/routes/api.php +++ b/routes/api.php @@ -13,6 +13,7 @@ use Domain\Plans\Controllers\ActivePlansController; use Domain\Folders\Controllers\CreateFolderController; use Domain\Browsing\Controllers\BrowseFolderController; use Domain\Sharing\Controllers\ShareViaEmailController; +use Domain\Folders\Controllers\NavigationTreeController; use Domain\Items\Controllers\MoveFileOrFolderController; use Domain\Items\Controllers\DeleteFileOrFolderController; use Domain\Items\Controllers\RenameFileOrFolderController; @@ -22,7 +23,6 @@ use Domain\Browsing\Controllers\BrowseLatestFilesController; use Domain\Browsing\Controllers\BrowseSharedItemsController; use Domain\Browsing\Controllers\BrowseTrashContentController; use Domain\Homepage\Controllers\SendContactMessageController; -use Domain\Folders\Controllers\NavigationTreeController; use Domain\Browsing\Controllers\SearchFilesAndFoldersController; // Pages diff --git a/routes/teams.php b/routes/teams.php index 660f7464..9939a6a7 100644 --- a/routes/teams.php +++ b/routes/teams.php @@ -1,16 +1,15 @@ ['auth:sanctum']], function () { - Route::apiResource('/folders', TeamFoldersController::class); Route::post('/folders/{folder}/convert', ConvertFolderIntoTeamFolderController::class); diff --git a/src/App/Console/Commands/SetupDevEnvironment.php b/src/App/Console/Commands/SetupDevEnvironment.php index 5b2984a7..70b36383 100644 --- a/src/App/Console/Commands/SetupDevEnvironment.php +++ b/src/App/Console/Commands/SetupDevEnvironment.php @@ -1,5 +1,4 @@ setUpFaker(); } @@ -636,7 +634,6 @@ class SetupDevEnvironment extends Command 'demo/images/memes/You Are My Sunshine.jpg', ]) ->each(function ($file) use ($user) { - $thumbnail = $this->generate_thumbnails($file, $user); // Create file record @@ -664,7 +661,6 @@ class SetupDevEnvironment extends Command 'demo/images/apartments/Kitchen Island.jpg', ]) ->each(function ($file) use ($user, $apartments) { - $thumbnail = $this->generate_thumbnails($file, $user); // Create file record @@ -696,7 +692,6 @@ class SetupDevEnvironment extends Command 'demo/images/nature/Yellow Animal Eyes Fur.jpg', ]) ->each(function ($file) use ($user, $nature) { - $thumbnail = $this->generate_thumbnails($file, $user); // Create file record @@ -753,7 +748,7 @@ class SetupDevEnvironment extends Command collect([$members[0]->id, $members[1]->id]) ->each( - fn($id) => DB::table('team_folder_members') + fn ($id) => DB::table('team_folder_members') ->insert([ 'parent_id' => $companyProjectFolder->id, 'user_id' => $id, @@ -763,7 +758,7 @@ class SetupDevEnvironment extends Command collect([$members[2]->id, $members[3]->id]) ->each( - fn($id) => DB::table('team_folder_members') + fn ($id) => DB::table('team_folder_members') ->insert([ 'parent_id' => $financeDocumentsFolder->id, 'user_id' => $id, @@ -774,7 +769,7 @@ class SetupDevEnvironment extends Command // Create invitations collect([$members[4], $members[5]]) ->each( - fn($user) => TeamFolderInvitation::factory() + fn ($user) => TeamFolderInvitation::factory() ->create([ 'email' => $user->email, 'parent_id' => $companyProjectFolder->id, @@ -833,7 +828,7 @@ class SetupDevEnvironment extends Command 'parent_id' => $folder->id, 'user_id' => $johan->id, 'permission' => 'owner', - ] + ], ]); // Get meme gallery @@ -879,7 +874,6 @@ class SetupDevEnvironment extends Command ]); }); - collect([ 'demo/images/memes/Eggcited bro.jpg', 'demo/images/memes/Get a Rest.jpg', @@ -1112,8 +1106,7 @@ class SetupDevEnvironment extends Command // Generate avatar collect(config('vuefilemanager.avatar_sizes')) - ->each(function ($size) use ($img, $image, $avatar_name) { - + ->each(function ($size) use ($img , $avatar_name) { // fit thumbnail $img->fit($size['size'], $size['size'])->stream(); @@ -1145,12 +1138,10 @@ class SetupDevEnvironment extends Command // Generate avatar sizes collect(config('vuefilemanager.image_sizes')) ->each(function ($size) use ($intervention, $file_name, $user) { - // Create thumbnail only if image is larger than predefined image sizes if ($intervention->getWidth() > $size['size']) { - // Generate thumbnail - $intervention->resize($size['size'], null, fn($constraint) => $constraint->aspectRatio())->stream(); + $intervention->resize($size['size'], null, fn ($constraint) => $constraint->aspectRatio())->stream(); // Store thumbnail to disk Storage::put("files/$user->id/{$size['name']}-{$file_name}", $intervention); diff --git a/src/App/Providers/AuthServiceProvider.php b/src/App/Providers/AuthServiceProvider.php index 96468b54..659a76c7 100644 --- a/src/App/Providers/AuthServiceProvider.php +++ b/src/App/Providers/AuthServiceProvider.php @@ -1,8 +1,8 @@ id === $item->user_id; }); diff --git a/src/App/Users/Controllers/Account/UpdateProfileSettingsController.php b/src/App/Users/Controllers/Account/UpdateProfileSettingsController.php index e1258c06..c2b13a37 100644 --- a/src/App/Users/Controllers/Account/UpdateProfileSettingsController.php +++ b/src/App/Users/Controllers/Account/UpdateProfileSettingsController.php @@ -1,12 +1,10 @@ attributes['avatar'] && ! is_storage_driver('local')) { - foreach (config('vuefilemanager.avatar_sizes') as $item) { $filePath = "avatars/{$item['name']}-{$this->attributes['avatar']}"; @@ -36,7 +35,6 @@ class UserSettings extends Model // Get avatar from local storage if ($this->attributes['avatar']) { - foreach (config('vuefilemanager.avatar_sizes') as $item) { $link[$item['name']] = url("/avatars/{$item['name']}-{$this->attributes['avatar']}"); } diff --git a/src/App/Users/Requests/UpdateUserProfileSettingsRequest.php b/src/App/Users/Requests/UpdateUserProfileSettingsRequest.php index 579446e7..5d29835d 100644 --- a/src/App/Users/Requests/UpdateUserProfileSettingsRequest.php +++ b/src/App/Users/Requests/UpdateUserProfileSettingsRequest.php @@ -1,5 +1,4 @@ getClientMimeType(), $this->availableFormats)) { - // Create intervention image $intervention = Image::make($file)->orientate(); // Generate avatar sizes collect(config('vuefilemanager.image_sizes')) ->each(function ($size) use ($intervention, $file_name, $user_id) { - // Create thumbnail only if image is larger than predefined image sizes if ($intervention->getWidth() > $size['size']) { - // Generate thumbnail $intervention->resize($size['size'], null, fn ($constraint) => $constraint->aspectRatio())->stream(); diff --git a/src/Domain/Files/Actions/DownloadThumbnailAction.php b/src/Domain/Files/Actions/DownloadThumbnailAction.php index 6d137b48..8161e962 100644 --- a/src/Domain/Files/Actions/DownloadThumbnailAction.php +++ b/src/Domain/Files/Actions/DownloadThumbnailAction.php @@ -19,7 +19,6 @@ class DownloadThumbnailAction // Check if file exist if (! Storage::exists($path)) { - // Get original file path $substituteFilePath = "/files/$file->user_id/$file->basename"; diff --git a/src/Domain/Files/Actions/UploadFileAction.php b/src/Domain/Files/Actions/UploadFileAction.php index 9c64743c..4a8334bd 100644 --- a/src/Domain/Files/Actions/UploadFileAction.php +++ b/src/Domain/Files/Actions/UploadFileAction.php @@ -1,6 +1,7 @@ where('basename', $filename) ->firstOrFail(); diff --git a/src/Domain/Files/Controllers/FileAccess/GetThumbnailController.php b/src/Domain/Files/Controllers/FileAccess/GetThumbnailController.php index 3f9b11bf..b4127cba 100644 --- a/src/Domain/Files/Controllers/FileAccess/GetThumbnailController.php +++ b/src/Domain/Files/Controllers/FileAccess/GetThumbnailController.php @@ -13,13 +13,13 @@ class GetThumbnailController extends Controller { public function __construct( private DownloadThumbnailAction $downloadThumbnail, - ) {} + ) { + } public function __invoke( Request $request, string $filename, ): FileNotFoundException | StreamedResponse { - $originalFileName = substr($filename, 3); $file = File::withTrashed() diff --git a/src/Domain/Files/Controllers/VisitorShowFileController.php b/src/Domain/Files/Controllers/VisitorShowFileController.php index 6cda06c3..062fd017 100644 --- a/src/Domain/Files/Controllers/VisitorShowFileController.php +++ b/src/Domain/Files/Controllers/VisitorShowFileController.php @@ -1,12 +1,11 @@ user_id) ->whereId($shared->item_id) ->firstOrFail(); diff --git a/src/Domain/Files/Models/File.php b/src/Domain/Files/Models/File.php index fa549c03..f7a72195 100644 --- a/src/Domain/Files/Models/File.php +++ b/src/Domain/Files/Models/File.php @@ -94,9 +94,7 @@ class File extends Model // Generate thumbnail link for external storage service if ($this->type === 'image' && ! is_storage_driver(['local'])) { - foreach (config('vuefilemanager.image_sizes') as $item) { - $filePath = "files/{$this->user_id}/{$item['name']}-{$this->basename}"; $links[$item['name']] = Storage::temporaryUrl($filePath, now()->addHour()); @@ -107,9 +105,7 @@ class File extends Model // Generate thumbnail link for local storage if ($this->type === 'image') { - foreach (config('vuefilemanager.image_sizes') as $item) { - $route = route('thumbnail', ['name' => $item['name'] . '-' . $this->basename]); if ($this->public_access) { diff --git a/src/Domain/Files/Resources/FileResource.php b/src/Domain/Files/Resources/FileResource.php index 773c2e56..b0dd600c 100644 --- a/src/Domain/Files/Resources/FileResource.php +++ b/src/Domain/Files/Resources/FileResource.php @@ -1,5 +1,4 @@ [ - $this->mergeWhen($this->shared, fn() => [ + $this->mergeWhen($this->shared, fn () => [ 'shared' => new ShareResource($this->shared), ]), - $this->mergeWhen($this->parent, fn() => [ + $this->mergeWhen($this->parent, fn () => [ 'parent' => [ 'data' => [ 'type' => 'folder', @@ -59,7 +58,7 @@ class FileResource extends JsonResource ], ], ]), - $this->mergeWhen($this->owner, fn() => [ + $this->mergeWhen($this->owner, fn () => [ 'user' => [ 'data' => [ 'type' => 'user', diff --git a/src/Domain/Folders/Controllers/NavigationTreeController.php b/src/Domain/Folders/Controllers/NavigationTreeController.php index 8ae1a79b..283b90b3 100644 --- a/src/Domain/Folders/Controllers/NavigationTreeController.php +++ b/src/Domain/Folders/Controllers/NavigationTreeController.php @@ -1,10 +1,9 @@ input('items') as $item) { - $item = get_item($item['type'], $item['id']); Gate::authorize('can-edit', [$item, $share]); diff --git a/src/Domain/Items/Controllers/VisitorDeleteFileOrFolderController.php b/src/Domain/Items/Controllers/VisitorDeleteFileOrFolderController.php index d15781f8..af092c21 100644 --- a/src/Domain/Items/Controllers/VisitorDeleteFileOrFolderController.php +++ b/src/Domain/Items/Controllers/VisitorDeleteFileOrFolderController.php @@ -6,7 +6,6 @@ use Domain\Sharing\Models\Share; use App\Http\Controllers\Controller; use Domain\Items\Requests\DeleteItemRequest; use Domain\Items\Actions\DeleteFileOrFolderAction; -use Domain\Sharing\Actions\ProtectShareRecordAction; use Domain\Sharing\Actions\VerifyAccessToItemAction; /** diff --git a/src/Domain/Items/Controllers/VisitorMoveFileOrFolderController.php b/src/Domain/Items/Controllers/VisitorMoveFileOrFolderController.php index f360f50b..afa6d86e 100644 --- a/src/Domain/Items/Controllers/VisitorMoveFileOrFolderController.php +++ b/src/Domain/Items/Controllers/VisitorMoveFileOrFolderController.php @@ -7,7 +7,6 @@ use Domain\Sharing\Models\Share; use App\Http\Controllers\Controller; use Domain\Items\Requests\MoveItemRequest; use Domain\Items\Actions\MoveFileOrFolderAction; -use Domain\Sharing\Actions\ProtectShareRecordAction; use Domain\Sharing\Actions\VerifyAccessToItemAction; /** diff --git a/src/Domain/Teams/Controllers/BrowseSharedWithMeController.php b/src/Domain/Teams/Controllers/BrowseSharedWithMeController.php index 103dba19..50cad2c0 100644 --- a/src/Domain/Teams/Controllers/BrowseSharedWithMeController.php +++ b/src/Domain/Teams/Controllers/BrowseSharedWithMeController.php @@ -1,16 +1,15 @@ get(); } - if (!$id) { + if (! $id) { $sharedFolderIds = DB::table('team_folder_members') ->where('user_id', Auth::id()) ->whereIn('permission', ['can-edit', 'can-view']) diff --git a/src/Domain/Teams/Controllers/ConvertFolderIntoTeamFolderController.php b/src/Domain/Teams/Controllers/ConvertFolderIntoTeamFolderController.php index 8989a09b..e6ae4af2 100644 --- a/src/Domain/Teams/Controllers/ConvertFolderIntoTeamFolderController.php +++ b/src/Domain/Teams/Controllers/ConvertFolderIntoTeamFolderController.php @@ -1,14 +1,13 @@ $this->permission, ], 'relationships' => [ - $this->mergeWhen($this->inviter, fn() => [ + $this->mergeWhen($this->inviter, fn () => [ 'inviter' => [ 'data' => [ 'type' => 'user', diff --git a/src/Support/helpers.php b/src/Support/helpers.php index a2d0c272..9d491272 100644 --- a/src/Support/helpers.php +++ b/src/Support/helpers.php @@ -325,7 +325,7 @@ if (! function_exists('store_avatar')) { function store_avatar($request, $name): ?string { // Check if file exist in http request - if (!$request->hasFile($name)) { + if (! $request->hasFile($name)) { return null; } @@ -346,7 +346,6 @@ if (! function_exists('store_avatar')) { // Generate avatar sizes collect(config('vuefilemanager.avatar_sizes')) ->each(function ($size) use ($intervention, $avatar_name) { - // fit thumbnail $intervention->fit($size['size'], $size['size'])->stream(); diff --git a/tests/App/Users/UserAccountTest.php b/tests/App/Users/UserAccountTest.php index 33c1a4e8..33955013 100644 --- a/tests/App/Users/UserAccountTest.php +++ b/tests/App/Users/UserAccountTest.php @@ -115,7 +115,8 @@ class UserAccountTest extends TestCase ])->assertStatus(204); collect(config('vuefilemanager.avatar_sizes')) - ->each(fn ($size) => + ->each( + fn ($size) => Storage::disk('local') ->assertExists("avatars/{$size['name']}-{$user->settings->getRawOriginal('avatar')}") ); diff --git a/tests/Domain/Admin/AdminTest.php b/tests/Domain/Admin/AdminTest.php index fc8f5d44..1c4df4ad 100644 --- a/tests/Domain/Admin/AdminTest.php +++ b/tests/Domain/Admin/AdminTest.php @@ -236,10 +236,11 @@ class AdminTest extends TestCase 'name' => 'John Doe', ]); - $avatar = User::whereEmail('john@doe.com')->first()->settings->getRawOriginal('avatar'); + $avatar = User::whereEmail('john@doe.com')->first()->settings->getRawOriginal('avatar'); collect(config('vuefilemanager.avatar_sizes')) - ->each(fn ($size) => + ->each( + fn ($size) => Storage::disk('local') ->assertExists("avatars/{$size['name']}-{$avatar}") ); diff --git a/tests/Domain/Browsing/BrowseTest.php b/tests/Domain/Browsing/BrowseTest.php index 71b4550c..edd2f3e0 100644 --- a/tests/Domain/Browsing/BrowseTest.php +++ b/tests/Domain/Browsing/BrowseTest.php @@ -1,5 +1,4 @@ each(fn ($item) => + ->each( + fn ($item) => $disk->assertExists( "files/{$user->id}/{$item['name']}-{$file->basename}" ) diff --git a/tests/Domain/Homepage/HomepageTest.php b/tests/Domain/Homepage/HomepageTest.php index 83a29234..fdbb6780 100644 --- a/tests/Domain/Homepage/HomepageTest.php +++ b/tests/Domain/Homepage/HomepageTest.php @@ -1,5 +1,4 @@ assertNotNull($avatar); collect(config('vuefilemanager.avatar_sizes')) - ->each(fn ($size) => + ->each( + fn ($size) => Storage::disk('local') ->assertExists("avatars/{$size['name']}-{$avatar}") ); diff --git a/tests/Domain/Sharing/VisitorAccessToItemsTest.php b/tests/Domain/Sharing/VisitorAccessToItemsTest.php index 96c96526..12678b17 100644 --- a/tests/Domain/Sharing/VisitorAccessToItemsTest.php +++ b/tests/Domain/Sharing/VisitorAccessToItemsTest.php @@ -1,5 +1,4 @@ assertStatus(200); } - if (!$is_protected) { + if (! $is_protected) { // Get shared file $this->get("/file/$document->name/$share->token") ->assertStatus(200); @@ -136,7 +135,7 @@ class VisitorAccessToItemsTest extends TestCase ->assertStatus(200); } - if (!$is_protected) { + if (! $is_protected) { $this->get("/share/$share->token") ->assertStatus(200); } @@ -189,7 +188,7 @@ class VisitorAccessToItemsTest extends TestCase ->assertStatus(200); } - if (!$is_protected) { + if (! $is_protected) { $this->get("/thumbnail/xs-$fileName/$share->token") ->assertStatus(200); } diff --git a/tests/Domain/Spotlight/SearchTest.php b/tests/Domain/Spotlight/SearchTest.php index 8ce9fc62..3f544de5 100644 --- a/tests/Domain/Spotlight/SearchTest.php +++ b/tests/Domain/Spotlight/SearchTest.php @@ -37,13 +37,13 @@ class SearchTest extends TestCase collect([$english, $russian, $turkish]) ->each( fn ($file) => $this - ->actingAs($user) - ->getJson('/api/browse/search?query=' . mb_strtolower(mb_substr($file->name, 0, 3))) - ->assertStatus(200) - ->assertJsonFragment([ - 'id' => $file->id, - 'name' => $file->name, - ]) + ->actingAs($user) + ->getJson('/api/browse/search?query=' . mb_strtolower(mb_substr($file->name, 0, 3))) + ->assertStatus(200) + ->assertJsonFragment([ + 'id' => $file->id, + 'name' => $file->name, + ]) ); } diff --git a/tests/Domain/Teams/TeamManagementTest.php b/tests/Domain/Teams/TeamManagementTest.php index 2587c1cc..e7937692 100644 --- a/tests/Domain/Teams/TeamManagementTest.php +++ b/tests/Domain/Teams/TeamManagementTest.php @@ -1,15 +1,14 @@ assertDatabaseCount('team_folder_members', 2) ->assertDatabaseCount('team_folder_invitations', 1); } -} \ No newline at end of file +} diff --git a/tests/Domain/Teams/TeamsTest.php b/tests/Domain/Teams/TeamsTest.php index 2e25044b..57315b78 100644 --- a/tests/Domain/Teams/TeamsTest.php +++ b/tests/Domain/Teams/TeamsTest.php @@ -7,7 +7,6 @@ use App\Users\Models\User; use Domain\Files\Models\File; use Domain\Folders\Models\Folder; use Illuminate\Support\Facades\DB; -use Domain\Teams\Models\TeamFolderInvitation; use Domain\Teams\Notifications\InvitationIntoTeamFolder; class TeamsTest extends TestCase