From b5d76132efeba20d26838f0f279454f0d281c3c9 Mon Sep 17 00:00:00 2001 From: Bruno Pereira Date: Mon, 11 Nov 2024 21:34:05 +0000 Subject: [PATCH 1/2] Update CanImportRecords.php Fixed bug on windows where puts \ instead of / while forming the s3 url --- packages/actions/src/Concerns/CanImportRecords.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/actions/src/Concerns/CanImportRecords.php b/packages/actions/src/Concerns/CanImportRecords.php index 4d6492eb44..78e1078664 100644 --- a/packages/actions/src/Concerns/CanImportRecords.php +++ b/packages/actions/src/Concerns/CanImportRecords.php @@ -397,7 +397,8 @@ trait CanImportRecords $s3Adapter = Storage::disk($fileDisk)->getAdapter(); invade($s3Adapter)->client->registerStreamWrapper(); /** @phpstan-ignore-line */ - $fileS3Path = 's3://' . config("filesystems.disks.{$fileDisk}.bucket") . '/' . $filePath; + + $fileS3Path = str_replace('\\','/','s3://' . config("filesystems.disks.{$fileDisk}.bucket") . '/' . $filePath); $resource = fopen($fileS3Path, mode: 'r', context: stream_context_create([ 's3' => [ From aecbc3f9af2ef7cb64f43f4658c5edddd589fe7b Mon Sep 17 00:00:00 2001 From: Dan Harrin Date: Tue, 12 Nov 2024 09:36:59 +0000 Subject: [PATCH 2/2] Update packages/actions/src/Concerns/CanImportRecords.php --- packages/actions/src/Concerns/CanImportRecords.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/actions/src/Concerns/CanImportRecords.php b/packages/actions/src/Concerns/CanImportRecords.php index 78e1078664..d98af879cc 100644 --- a/packages/actions/src/Concerns/CanImportRecords.php +++ b/packages/actions/src/Concerns/CanImportRecords.php @@ -398,7 +398,7 @@ trait CanImportRecords invade($s3Adapter)->client->registerStreamWrapper(); /** @phpstan-ignore-line */ - $fileS3Path = str_replace('\\','/','s3://' . config("filesystems.disks.{$fileDisk}.bucket") . '/' . $filePath); + $fileS3Path = (string) str('s3://' . config("filesystems.disks.{$fileDisk}.bucket") . '/' . $filePath)->replace('\\', '/'); $resource = fopen($fileS3Path, mode: 'r', context: stream_context_create([ 's3' => [