Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added check to see if disk implements a default visibility #164

Merged
merged 4 commits into from
Mar 6, 2024
Merged

Added check to see if disk implements a default visibility #164

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d038681
Added check to see if disk implements a default visibility
jaxwilko Jan 24, 2024
26160fa
Fixed incorrect exception usage
jaxwilko Jan 24, 2024
e50f0bd
Added phpstan suggestion
jaxwilko Jan 24, 2024
3630de1
Merge branch 'develop' into wip/fix-default-visibility
bennothommo Jan 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/Database/Attach/File.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,9 @@ public function fromPost($uploadedFile)
? $uploadedFile->getPath() . DIRECTORY_SEPARATOR . $uploadedFile->getFileName()
: $uploadedFile->getRealPath();

$this->putFile($realPath, $this->disk_name);
if (!$this->putFile($realPath, $this->disk_name)) {
throw new ApplicationException('The file failed to be stored');
LukeTowers marked this conversation as resolved.
Show resolved Hide resolved
}

return $this;
}
Expand Down Expand Up @@ -1008,7 +1010,11 @@ protected function copyStorageToLocal($storagePath, $localPath)
*/
protected function copyLocalToStorage($localPath, $storagePath)
{
return $this->getDisk()->put($storagePath, FileHelper::get($localPath), $this->isPublic() ? 'public' : null);
return $this->getDisk()->put(
$storagePath,
FileHelper::get($localPath),
$this->isPublic() ? ($this->getDisk()->getConfig()['visibility'] ?? 'public') : null
);
}

//
Expand Down
Loading