1
1
<?php
2
2
3
+ declare (strict_types=1 );
4
+
3
5
namespace App \EventSubscriber ;
4
6
5
7
use App \Entity \ScreenUser ;
@@ -22,9 +24,7 @@ public function __construct(
22
24
private readonly EntityManagerInterface $ entityManager ,
23
25
private readonly bool $ trackScreenInfo = false ,
24
26
private readonly int $ trackScreenInfoUpdateIntervalSeconds = 5 * 60 ,
25
- )
26
- {
27
- }
27
+ ) {}
28
28
29
29
/**
30
30
* @throws InvalidArgumentException
@@ -39,11 +39,11 @@ public function onKernelRequest(RequestEvent $event): void
39
39
if ($ user instanceof ScreenUser) {
40
40
$ key = $ user ->getId ()?->jsonSerialize() ?? null ;
41
41
42
- if ($ key === null ) {
42
+ if (null === $ key ) {
43
43
return ;
44
44
}
45
45
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 ));
47
47
}
48
48
}
49
49
}
@@ -57,7 +57,7 @@ private function createCacheEntry(CacheItemInterface $item, RequestEvent $event,
57
57
$ request = $ event ->getRequest ();
58
58
$ referer = $ request ->headers ->get ('referer ' ) ?? '' ;
59
59
$ url = parse_url ($ referer );
60
- $ queryString = $ url ['query ' ] ?? "" ;
60
+ $ queryString = $ url ['query ' ] ?? '' ;
61
61
$ queryArray = [];
62
62
63
63
if (!empty ($ queryString )) {
@@ -74,7 +74,7 @@ private function createCacheEntry(CacheItemInterface $item, RequestEvent $event,
74
74
75
75
$ userAgent = $ request ->headers ->get ('user-agent ' ) ?? '' ;
76
76
$ ip = $ request ->getClientIp ();
77
- $ host = preg_replace ("/\?.*$/i " , "" , $ referer );
77
+ $ host = preg_replace ("/\?.*$/i " , '' , $ referer );
78
78
79
79
$ clientMeta = [
80
80
'host ' => $ host ,
@@ -83,14 +83,17 @@ private function createCacheEntry(CacheItemInterface $item, RequestEvent $event,
83
83
];
84
84
85
85
$ 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 ();
90
86
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 ();
92
92
93
- $ clientMeta ['tokenExpired ' ] = $ tokenExpired ;
93
+ $ tokenExpired = $ expireDateTime < $ now ;
94
+
95
+ $ clientMeta ['tokenExpired ' ] = $ tokenExpired ;
96
+ }
94
97
95
98
$ screenUser ->setClientMeta ($ clientMeta );
96
99
0 commit comments