Merge branch '4.4' into 5.1

nicolas-grekas · nicolas-grekas · commit c448773b8e55 · 2020-09-02T18:23:27.000+02:00
* 4.4:
  Enable "native_constant_invocation" CS rule
  Make AbstractPhpFileCacheWarmer public
diff --git a/Firewall/ContextListener.php b/Firewall/ContextListener.php
@@ -96,15 +96,15 @@ public function authenticate(RequestEvent $event)
 
         if (null !== $session) {
             $usageIndexValue = $session instanceof Session ? $usageIndexReference = &$session->getUsageIndex() : 0;
-            $usageIndexReference = PHP_INT_MIN;
+            $usageIndexReference = \PHP_INT_MIN;
             $sessionId = $request->cookies->all()[$session->getName()] ?? null;
             $token = $session->get($this->sessionKey);
 
             // sessionId = true is used in the tests
             if ($this->sessionTrackerEnabler && \in_array($sessionId, [true, $session->getId()], true)) {
                 $usageIndexReference = $usageIndexValue;
             } else {
-                $usageIndexReference = $usageIndexReference - PHP_INT_MIN + $usageIndexValue;
+                $usageIndexReference = $usageIndexReference - \PHP_INT_MIN + $usageIndexValue;
             }
         }
 
diff --git a/HttpUtils.php b/HttpUtils.php
@@ -167,7 +167,7 @@ public function generateUri(Request $request, string $path)
         // fortunately, they all are, so we have to remove entire query string
         $position = strpos($url, '?');
         if (false !== $position) {
-            $fragment = parse_url($url, PHP_URL_FRAGMENT);
+            $fragment = parse_url($url, \PHP_URL_FRAGMENT);
             $url = substr($url, 0, $position);
             // fragment must be preserved
             if ($fragment) {
