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
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
namespace Ibexa\Bundle\Messenger\EventSubscriber;

use Ibexa\Contracts\Messenger\Stamp\SiteAccessStamp;
use Ibexa\Core\MVC\Symfony\SiteAccess;
use Ibexa\Core\MVC\Symfony\SiteAccess\SiteAccessServiceInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\Messenger\Event\SendMessageToTransportsEvent;
Expand All @@ -33,7 +34,7 @@ public static function getSubscribedEvents(): array
public function onSendMessageToTransport(SendMessageToTransportsEvent $event): void
{
$siteAccess = $this->siteAccessService->getCurrent();
if ($siteAccess === null) {
if ($siteAccess === null || $siteAccess->matchingType === SiteAccess::MATCHING_TYPE_UNINITIALIZED) {
return;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,23 @@ public function testOnSendMessageToTransportDoesNothingWhenNoSiteAccess(): void
self::assertNull($updatedEnvelope->last(SiteAccessStamp::class));
self::assertSame($envelope, $updatedEnvelope);
}

public function testOnSendMessageToTransportDoesNothingWhenSiteAccessIsUninitialized(): void
{
$siteAccess = new SiteAccess('default', SiteAccess::MATCHING_TYPE_UNINITIALIZED);
$envelope = new Envelope(new \stdClass());
$event = new SendMessageToTransportsEvent($envelope);

$this->siteAccessService
->expects(self::once())
->method('getCurrent')
->willReturn($siteAccess);

$this->subscriber->onSendMessageToTransport($event);

$updatedEnvelope = $event->getEnvelope();

self::assertNull($updatedEnvelope->last(SiteAccessStamp::class));
self::assertSame($envelope, $updatedEnvelope);
}
}
Loading