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

Jump to bottom

[5.x] Support glide urls with URL params #11003

Open
wants to merge 6 commits into
base: 5.x
Choose a base branch
from
Open

[5.x] Support glide urls with URL params #11003

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ad5fa11
Support glide urls with URL params
ryanmitchell Oct 23, 2024
b764f5c
Make sure to uniqify the qs
ryanmitchell Oct 24, 2024
c6c81f5
Fix bug
ryanmitchell Oct 24, 2024
5ef4f16
And here
ryanmitchell Oct 24, 2024
ff9c48e
Merge branch '5.x' into fix/support-glide-urls-with-params
ryanmitchell Oct 29, 2024
fb9a5f3
Add a test
ryanmitchell Oct 29, 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
7 changes: 7 additions & 0 deletions src/Imaging/GlideManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,13 @@ private function getCachePathCallable()
$hashCallable = $this->getHashCallable();

return function ($path, $params) use ($hashCallable) {
$qs = Str::contains($path, '?') ? Str::after($path, '?') : null;
$path = Str::before($path, '?');

if ($qs) {
$path = Str::replaceLast('.', '-'.md5($qs).'.', $path);
}

$sourcePath = $this->getSourcePath($path);

if ($this->sourcePathPrefix) {
Expand Down
3 changes: 2 additions & 1 deletion src/Imaging/ImageGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,14 @@ private function doGenerateByUrl($url, array $params)
$this->skip_validation = true;
$this->setParams($params);

$qs = Str::contains($url, '?') ? Str::after($url, '?') : null;
$parsed = $this->parseUrl($url);

$this->server->setSource($this->guzzleSourceFilesystem($parsed['base']));
$this->server->setSourcePathPrefix('/');
$this->server->setCachePathPrefix('http');

return $this->generate($parsed['path']);
return $this->generate($parsed['path'].($qs ? '?'.$qs : ''));
}

/**
Expand Down
Loading