Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit 8d5489c10ef9 · 2020-09-02T18:08:58.000+02:00
* 3.4:
  Enable "native_constant_invocation" CS rule
  Make AbstractPhpFileCacheWarmer public
diff --git a/CacheTrait.php b/CacheTrait.php
@@ -48,14 +48,14 @@ private function doGet(CacheItemPoolInterface $pool, string $key, callable $call
         }
 
         $item = $pool->getItem($key);
-        $recompute = !$item->isHit() || INF === $beta;
+        $recompute = !$item->isHit() || \INF === $beta;
         $metadata = $item instanceof ItemInterface ? $item->getMetadata() : [];
 
         if (!$recompute && $metadata) {
             $expiry = $metadata[ItemInterface::METADATA_EXPIRY] ?? false;
             $ctime = $metadata[ItemInterface::METADATA_CTIME] ?? false;
 
-            if ($recompute = $ctime && $expiry && $expiry <= ($now = microtime(true)) - $ctime / 1000 * $beta * log(random_int(1, PHP_INT_MAX) / PHP_INT_MAX)) {
+            if ($recompute = $ctime && $expiry && $expiry <= ($now = microtime(true)) - $ctime / 1000 * $beta * log(random_int(1, \PHP_INT_MAX) / \PHP_INT_MAX)) {
                 // force applying defaultLifetime to expiry
                 $item->expiresAt(null);
                 $logger && $logger->info('Item "{key}" elected for early recomputation {delta}s before its expiration', [
