Skip to content

Commit 90273a1

Browse files
committed
1241: Applied coding standards
1 parent 6a4f19b commit 90273a1

File tree

2 files changed

+18
-15
lines changed

2 files changed

+18
-15
lines changed

src/Entity/ScreenUser.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ class ScreenUser extends AbstractTenantScopedEntity implements UserInterface, Te
2121
{
2222
final public const string ROLE_SCREEN = Roles::ROLE_SCREEN;
2323

24-
#[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, length: 180, unique: true)]
24+
#[ORM\Column(type: Types::STRING, length: 180, unique: true)]
2525
private string $username;
2626

27-
#[ORM\Column(type: \Doctrine\DBAL\Types\Types::JSON)]
27+
#[ORM\Column(type: Types::JSON)]
2828
private array $roles = [];
2929

3030
#[ORM\OneToOne(inversedBy: 'screenUser', targetEntity: Screen::class)]

src/EventSubscriber/ScreenUserRequestSubscriber.php

+16-13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace App\EventSubscriber;
46

57
use App\Entity\ScreenUser;
@@ -22,9 +24,7 @@ public function __construct(
2224
private readonly EntityManagerInterface $entityManager,
2325
private readonly bool $trackScreenInfo = false,
2426
private readonly int $trackScreenInfoUpdateIntervalSeconds = 5 * 60,
25-
)
26-
{
27-
}
27+
) {}
2828

2929
/**
3030
* @throws InvalidArgumentException
@@ -39,11 +39,11 @@ public function onKernelRequest(RequestEvent $event): void
3939
if ($user instanceof ScreenUser) {
4040
$key = $user->getId()?->jsonSerialize() ?? null;
4141

42-
if ($key === null) {
42+
if (null === $key) {
4343
return;
4444
}
4545

46-
$this->screenStatusCache->get($key, fn(CacheItemInterface $item) => $this->createCacheEntry($item, $event, $user));
46+
$this->screenStatusCache->get($key, fn (CacheItemInterface $item) => $this->createCacheEntry($item, $event, $user));
4747
}
4848
}
4949
}
@@ -57,7 +57,7 @@ private function createCacheEntry(CacheItemInterface $item, RequestEvent $event,
5757
$request = $event->getRequest();
5858
$referer = $request->headers->get('referer') ?? '';
5959
$url = parse_url($referer);
60-
$queryString = $url['query'] ?? "";
60+
$queryString = $url['query'] ?? '';
6161
$queryArray = [];
6262

6363
if (!empty($queryString)) {
@@ -74,7 +74,7 @@ private function createCacheEntry(CacheItemInterface $item, RequestEvent $event,
7474

7575
$userAgent = $request->headers->get('user-agent') ?? '';
7676
$ip = $request->getClientIp();
77-
$host = preg_replace("/\?.*$/i", "", $referer);
77+
$host = preg_replace("/\?.*$/i", '', $referer);
7878

7979
$clientMeta = [
8080
'host' => $host,
@@ -83,14 +83,17 @@ private function createCacheEntry(CacheItemInterface $item, RequestEvent $event,
8383
];
8484

8585
$token = $this->security->getToken();
86-
$decodedToken = $this->tokenManager->decode($token);
87-
$expire = $decodedToken['exp'] ?? 0;
88-
$expireDateTime = (new \DateTime())->setTimestamp($expire);
89-
$now = new \DateTime();
9086

91-
$tokenExpired = $expireDateTime < $now;
87+
if (null !== $token) {
88+
$decodedToken = $this->tokenManager->decode($token);
89+
$expire = $decodedToken['exp'] ?? 0;
90+
$expireDateTime = (new \DateTime())->setTimestamp($expire);
91+
$now = new \DateTime();
9292

93-
$clientMeta['tokenExpired'] = $tokenExpired;
93+
$tokenExpired = $expireDateTime < $now;
94+
95+
$clientMeta['tokenExpired'] = $tokenExpired;
96+
}
9497

9598
$screenUser->setClientMeta($clientMeta);
9699

0 commit comments

Comments
 (0)