Skip to content

Add getAvailablePathRelativeToRoot() method #3877

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

Open
adriaanzon wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add getAvailablePathRelativeToRoot() method #3877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions src/MediaCollections/Models/Media.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,19 @@ public function getAvailablePath(array $conversionNames): string
return $this->getPath();
}

public function getAvailablePathRelativeToRoot(array $conversionNames): string
{
foreach ($conversionNames as $conversionName) {
if (! $this->hasGeneratedConversion($conversionName)) {
continue;
}

return $this->getPathRelativeToRoot($conversionName);
}

return $this->getPathRelativeToRoot();
}

protected function type(): Attribute
{
return Attribute::get(
Expand Down
4 changes: 4 additions & 0 deletions tests/Feature/Media/GetAvailableUrlTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,21 @@
expect($media->getAvailableUrl(['small', 'medium', 'large']))->toEqual("/media/{$media->id}/conversions/test-large.jpg");
expect($media->getAvailableFullUrl(['small', 'medium', 'large']))->toEqual("http://localhost/media/{$media->id}/conversions/test-large.jpg");
expect($media->getAvailablePath(['small', 'medium', 'large']))->toEqual($this->makePathOsSafe($this->getMediaDirectory()."/{$media->id}/conversions/test-large.jpg"));
expect($media->getAvailablePathRelativeToRoot(['small', 'medium', 'large']))->toEqual("{$media->id}/conversions/test-large.jpg");

$media->markAsConversionGenerated('medium');

expect($media->getAvailableUrl(['small', 'medium', 'large']))->toEqual("/media/{$media->id}/conversions/test-medium.jpg");
expect($media->getAvailableFullUrl(['small', 'medium', 'large']))->toEqual("http://localhost/media/{$media->id}/conversions/test-medium.jpg");
expect($media->getAvailablePath(['small', 'medium', 'large']))->toEqual($this->makePathOsSafe($this->getMediaDirectory()."/{$media->id}/conversions/test-medium.jpg"));
expect($media->getAvailablePathRelativeToRoot(['small', 'medium', 'large']))->toEqual("{$media->id}/conversions/test-medium.jpg");

$media->markAsConversionGenerated('small');

expect($media->getAvailableUrl(['small', 'medium', 'large']))->toEqual("/media/{$media->id}/conversions/test-small.jpg");
expect($media->getAvailableFullUrl(['small', 'medium', 'large']))->toEqual("http://localhost/media/{$media->id}/conversions/test-small.jpg");
expect($media->getAvailablePath(['small', 'medium', 'large']))->toEqual($this->makePathOsSafe($this->getMediaDirectory()."/{$media->id}/conversions/test-small.jpg"));
expect($media->getAvailablePathRelativeToRoot(['small', 'medium', 'large']))->toEqual("{$media->id}/conversions/test-small.jpg");
});

it('uses original url if no conversion has been generated yet', function () {
Expand All @@ -33,4 +36,5 @@
expect($media->getAvailableUrl(['small', 'medium', 'large']))->toEqual("/media/{$media->id}/test.jpg");
expect($media->getAvailableFullUrl(['small', 'medium', 'large']))->toEqual("http://localhost/media/{$media->id}/test.jpg");
expect($media->getAvailablePath(['small', 'medium', 'large']))->toEqual($this->makePathOsSafe($this->getMediaDirectory()."/{$media->id}/test.jpg"));
expect($media->getAvailablePathRelativeToRoot(['small', 'medium', 'large']))->toEqual("{$media->id}/test.jpg");
});
Loading