Skip to content

[11.x] Fix error handling for uniqueVia() when wrong type is returned #54392

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

Closed
wants to merge 2 commits into from
Closed

[11.x] Fix error handling for uniqueVia() when wrong type is returned #54392

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb23364
fix better error handling for uniqueVia() when wrong type is returned
zackAJ Jan 28, 2025
e74a82a
formatting
zackAJ Jan 28, 2025
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
25 changes: 22 additions & 3 deletions src/Illuminate/Foundation/Queue/InteractsWithUniqueJobs.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
namespace Illuminate\Foundation\Queue;

use Illuminate\Bus\UniqueLock;
use Illuminate\Contracts\Cache\Repository;
use Illuminate\Contracts\Queue\ShouldBeUnique;
use Illuminate\Support\Facades\Context;
use UnexpectedValueException;

trait InteractsWithUniqueJobs
{
Expand Down Expand Up @@ -45,11 +47,28 @@ public function removeUniqueJobInformationFromContext($job): void
*
* @param mixed $job
* @return string|null
*
* @throws UnexpectedValueException
*/
protected function getUniqueJobCacheStore($job): ?string
{
return method_exists($job, 'uniqueVia')
? $job->uniqueVia()->getName()
: config('cache.default');
if (! method_exists($job, 'uniqueVia')) {
return config('cache.default');
}

/** @var Repository $repository */
$repository = $job->uniqueVia();

if (! $repository instanceof Repository) {
$message = sprintf(
'Method uniqueVia() of %s must return an implementation of %s interface',
$job::class,
Repository::class
);

throw new UnexpectedValueException($message);
}

return $job->uniqueVia()->getName();
}
}