Skip to content

Commit c448773

Browse files
Merge branch '4.4' into 5.1
* 4.4: Enable "native_constant_invocation" CS rule Make AbstractPhpFileCacheWarmer public
2 parents 7741021 + eddcd6b commit c448773

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Firewall/ContextListener.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,15 @@ public function authenticate(RequestEvent $event)
9696

9797
if (null !== $session) {
9898
$usageIndexValue = $session instanceof Session ? $usageIndexReference = &$session->getUsageIndex() : 0;
99-
$usageIndexReference = PHP_INT_MIN;
99+
$usageIndexReference = \PHP_INT_MIN;
100100
$sessionId = $request->cookies->all()[$session->getName()] ?? null;
101101
$token = $session->get($this->sessionKey);
102102

103103
// sessionId = true is used in the tests
104104
if ($this->sessionTrackerEnabler && \in_array($sessionId, [true, $session->getId()], true)) {
105105
$usageIndexReference = $usageIndexValue;
106106
} else {
107-
$usageIndexReference = $usageIndexReference - PHP_INT_MIN + $usageIndexValue;
107+
$usageIndexReference = $usageIndexReference - \PHP_INT_MIN + $usageIndexValue;
108108
}
109109
}
110110

HttpUtils.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public function generateUri(Request $request, string $path)
167167
// fortunately, they all are, so we have to remove entire query string
168168
$position = strpos($url, '?');
169169
if (false !== $position) {
170-
$fragment = parse_url($url, PHP_URL_FRAGMENT);
170+
$fragment = parse_url($url, \PHP_URL_FRAGMENT);
171171
$url = substr($url, 0, $position);
172172
// fragment must be preserved
173173
if ($fragment) {

0 commit comments

Comments
 (0)