mirror of
https://github.com/VueFileManager/vuefilemanager.git
synced 2026-04-18 00:02:15 +00:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -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;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
|
||||
@@ -29,7 +28,8 @@ class TransferContentOwnershipToTeamFolderOwnerAction
|
||||
->whereIn('parent_id', $teamFolderIds)
|
||||
->where('user_id', $leavingUserId)
|
||||
->cursor()
|
||||
->each(fn ($file) =>
|
||||
->each(
|
||||
fn ($file) =>
|
||||
$this->move_files_to_the_new_destination($file, $folder)
|
||||
);
|
||||
|
||||
@@ -52,21 +52,21 @@ class TransferContentOwnershipToTeamFolderOwnerAction
|
||||
{
|
||||
// Move image thumbnails
|
||||
if ($file->type === 'image') {
|
||||
|
||||
// Get image thumbnail list
|
||||
$thumbnailList = get_thumbnail_file_list($file->basename);
|
||||
|
||||
// move thumbnails to the new location
|
||||
$thumbnailList->each(function ($basename) use ($file, $folder) {
|
||||
|
||||
$oldPath = "files/$file->user_id/$basename";
|
||||
$newPath = "files/$folder->user_id/$basename";
|
||||
|
||||
if (Storage::exists($oldPath)) Storage::move($oldPath, $newPath);
|
||||
if (Storage::exists($oldPath)) {
|
||||
Storage::move($oldPath, $newPath);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// Move single file
|
||||
Storage::move("files/$file->user_id/$file->basename", "files/$folder->user_id/$file->basename");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
<?php
|
||||
|
||||
namespace Domain\Teams\Controllers;
|
||||
|
||||
use Auth;
|
||||
@@ -15,7 +14,8 @@ class LeaveTeamFolderController extends Controller
|
||||
{
|
||||
public function __construct(
|
||||
public TransferContentOwnershipToTeamFolderOwnerAction $transferContentOwnership,
|
||||
) {}
|
||||
) {
|
||||
}
|
||||
|
||||
public function __invoke(Folder $folder): Response|Application|ResponseFactory
|
||||
{
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
<?php
|
||||
namespace Tests\Domain\Teams;
|
||||
|
||||
use Domain\Files\Models\File;
|
||||
use Illuminate\Http\UploadedFile;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
use Str;
|
||||
use Notification;
|
||||
use Tests\TestCase;
|
||||
use App\Users\Models\User;
|
||||
use Domain\Files\Models\File;
|
||||
use Domain\Folders\Models\Folder;
|
||||
use Illuminate\Http\UploadedFile;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
use Domain\Teams\Models\TeamFolderInvitation;
|
||||
use Domain\Teams\Notifications\InvitationIntoTeamFolder;
|
||||
|
||||
@@ -641,7 +641,7 @@ class TeamManagementTest extends TestCase
|
||||
|
||||
// Create fake image
|
||||
$fakeFile = UploadedFile::fake()
|
||||
->create("fake-image.jpeg", 2000, 'image/jpeg');
|
||||
->create('fake-image.jpeg', 2000, 'image/jpeg');
|
||||
|
||||
// Put fake image into correct directory
|
||||
Storage::putFileAs("files/$member->id", $fakeFile, $fakeFile->name);
|
||||
@@ -649,7 +649,6 @@ class TeamManagementTest extends TestCase
|
||||
// Create fake image thumbnails
|
||||
collect(config('vuefilemanager.image_sizes'))
|
||||
->each(function ($item) use ($member) {
|
||||
|
||||
$fakeFile = UploadedFile::fake()
|
||||
->create("{$item['name']}-fake-image.jpeg", 2000, 'image/jpeg');
|
||||
|
||||
|
||||
Reference in New Issue
Block a user