jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Next major version 2 with PHP 8.1, Symfony 6, Tabler UI, 2FA ... (#2902)

Browse Source
This commit is contained in:
Kevin Papst
2022-12-31 21:19:55 +01:00
committed by GitHub
parent 95e06746bd
commit 90a0fd8a22
2164 changed files with 83700 additions and 86426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/EventSubscriber/UserEnvironmentSubscriber.php
View File

@@ -18,19 +18,8 @@ use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
final class UserEnvironmentSubscriber implements EventSubscriberInterface
{
/**
* @var TokenStorageInterface
*/
private $storage;
/**
* @var AuthorizationCheckerInterface
*/
private $auth;
public function __construct(TokenStorageInterface $tokenStorage, AuthorizationCheckerInterface $auth)
public function __construct(private TokenStorageInterface $tokenStorage, private AuthorizationCheckerInterface $auth)
{
$this->storage = $tokenStorage;
$this->auth = $auth;
}
public static function getSubscribedEvents(): array
@@ -43,7 +32,7 @@ final class UserEnvironmentSubscriber implements EventSubscriberInterface
public function prepareEnvironment(RequestEvent $event): void
{
// ignore sub-requests
if (!$event->isMasterRequest()) {
if (!$event->isMainRequest()) {
return;
}
@@ -51,7 +40,7 @@ final class UserEnvironmentSubscriber implements EventSubscriberInterface
\Locale::setDefault($event->getRequest()->getLocale());
// ignore events like the toolbar where we do not have a token
if (null === ($token = $this->storage->getToken())) {
if (null === ($token = $this->tokenStorage->getToken())) {
return;
}