Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 12 additions & 2 deletions src/Redirects/HandleRedirects.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,19 @@ private function findWildcardMatch(string $path, string $siteHandle): ?Redirect

private function recordError(string $path, string $siteHandle): void
{
if (config('statamic.seo-pro.redirects.errors.enabled')) {
RecordError::dispatch($path, $siteHandle);
if (! config('statamic.seo-pro.redirects.errors.enabled')) {
return;
}

RecordError::dispatch($path, $siteHandle)
->afterResponse($this->usingDeferredQueueDriver());
}

private function usingDeferredQueueDriver(): bool
{
$driver = config('queue.connections.'.config('queue.default').'.driver');

return in_array($driver, ['deferred', 'background']);
}

private function resolveDestination(Redirect $redirect, string $path, Request $request): string
Expand Down
32 changes: 32 additions & 0 deletions tests/Redirects/HandleRedirectsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace Tests\Redirects;

use Illuminate\Http\Request;
use Illuminate\Support\Facades\Bus;
use Illuminate\Support\Facades\Queue;
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\Attributes\Test;
Expand Down Expand Up @@ -313,6 +314,37 @@ public function it_dispatches_a_record_error_job_when_no_redirect_matches()
Queue::assertPushed(RecordError::class, fn ($job) => $job->url === '/nonexistent-url' && $job->site === 'default');
}

/**
* @see https://github.com/statamic/seo-pro/issues/685
*/
#[Test]
#[DataProvider('deferredQueueDriverProvider')]
public function it_dispatches_a_record_error_job_after_the_response_when_using_a_deferred_queue_driver(string $driver)
{
Bus::fake();

config([
'queue.default' => $driver,
"queue.connections.{$driver}" => ['driver' => $driver],
'statamic.seo-pro.redirects.errors.enabled' => true,
]);

$this->get('/nonexistent-url')->assertNotFound();

Bus::assertDispatchedAfterResponse(
RecordError::class,
fn ($job) => $job->url === '/nonexistent-url' && $job->site === 'default'
);
}

public static function deferredQueueDriverProvider(): array
{
return [
'deferred' => ['deferred'],
'background' => ['background'],
];
}

#[Test]
public function it_does_not_dispatch_a_record_error_job_when_errors_are_disabled()
{
Expand Down
Loading