Skip to content

[TASK] Improve request handling and add request type options #126

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
Kanti wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[TASK] Improve request handling and add request type options #126

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
27 changes: 18 additions & 9 deletions Classes/Integration/Typo3Integration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use Sentry\State\Scope;
use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Core\Http\ApplicationType;
use TYPO3\CMS\Core\Http\ServerRequestFactory;
use TYPO3\CMS\Core\Information\Typo3Version;

final class Typo3Integration implements IntegrationInterface
Expand Down Expand Up @@ -38,14 +39,9 @@ private function processEvent(Event $event): void
{
$request = $this->getServerRequest();
if ($request instanceof ServerRequestInterface) {
if (ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isFrontend()) {
$event->setTag('request_type', 'frontend');
$this->setUrl($event, $request);
} elseif (ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isBackend()) {
$event->setTag('request_type', 'backend');
$this->setUrl($event, $request);
}
} elseif (Environment::isCli()) {
$this->setUrl($event, $request);
$event->setTag('request_type', $this->getRequestType($request));
} else {
$event->setTag('request_type', 'cli');
}

Expand All @@ -66,6 +62,19 @@ protected function setUrl(Event $event, ServerRequestInterface $request): void

protected function getServerRequest(): ?ServerRequestInterface
{
return $GLOBALS['TYPO3_REQUEST'] ?? null;
if (Environment::isCli()) {
return null;
}
return $GLOBALS['TYPO3_REQUEST'] ?? ServerRequestFactory::fromGlobals();
}

private function getRequestType(ServerRequestInterface $request): string
{
try {
return ApplicationType::fromRequest($request)->value;
} catch (\RuntimeException $e) {
// ignore missing application type
return 'request';
}
}
}