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

Wraps file extension comparison components in strtolower() #5096

Merged
merged 3 commits into from
Jul 14, 2024
+28 −1
Merged

Wraps file extension comparison components in strtolower() #5096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b0ef85
Wraps file extension comparison components in strtolower()
DanielGordonIT Jul 3, 2024
25f92ce
Add test to verify different case on extensions works
DanielGordonIT Jul 4, 2024
ca31096
Actually add the test this time
DanielGordonIT Jul 5, 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
2 changes: 1 addition & 1 deletion app/Uploads/ImageRepo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public function updateImageDetails(Image $image, $updateDetails): Image
*/
public function updateImageFile(Image $image, UploadedFile $file): void
{
if ($file->getClientOriginalExtension() !== pathinfo($image->path, PATHINFO_EXTENSION)) {
if (strtolower($file->getClientOriginalExtension()) !== strtolower(pathinfo($image->path, PATHINFO_EXTENSION))) {
throw new ImageUploadException(trans('errors.image_upload_replace_type'));
}

Expand Down
27 changes: 27 additions & 0 deletions tests/Uploads/ImageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,33 @@ public function test_image_file_update()
$this->files->deleteAtRelativePath($relPath);
}

public function test_image_file_update_allows_case_differences()
{
$page = $this->entities->page();
$this->asEditor();

$imgDetails = $this->files->uploadGalleryImageToPage($this, $page);
$relPath = $imgDetails['path'];

$newUpload = $this->files->uploadedImage('updated-image.PNG', 'compressed.png');
$this->assertFileEquals($this->files->testFilePath('test-image.png'), public_path($relPath));

$imageId = $imgDetails['response']->id;
$image = Image::findOrFail($imageId);
$image->updated_at = now()->subMonth();
$image->save();

$this->call('PUT', "/images/{$imageId}/file", [], [], ['file' => $newUpload])
->assertOk();

$this->assertFileEquals($this->files->testFilePath('compressed.png'), public_path($relPath));

$image->refresh();
$this->assertTrue($image->updated_at->gt(now()->subMinute()));

$this->files->deleteAtRelativePath($relPath);
}

public function test_image_file_update_does_not_allow_change_in_image_extension()
{
$page = $this->entities->page();
Expand Down