Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit 8b1bce2319a1 · 2022-06-26T18:34:50.000+02:00
* 5.4:
  [HttpKernel] Fix a PHP 8.1 deprecation notice in HttpCache
  Add an invariable word in french
  [Serializer] Fix denormalization union types with constructor
diff --git a/HttpCache/HttpCache.php b/HttpCache/HttpCache.php
@@ -694,7 +694,7 @@ private function mayServeStaleWhileRevalidate(Response $entry): bool
             $timeout = $this->options['stale_while_revalidate'];
         }
 
-        return abs($entry->getTtl()) < $timeout;
+        return abs($entry->getTtl() ?? 0) < $timeout;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -694,7 +694,7 @@ private function mayServeStaleWhileRevalidate(Response $entry): bool`
`694`	`694`	`$timeout = $this->options['stale_while_revalidate'];`
`695`	`695`	`}`
`696`	`696`
`697`		`- return abs($entry->getTtl()) < $timeout;`
	`697`	`+ return abs($entry->getTtl() ?? 0) < $timeout;`
`698`	`698`	`}`
`699`	`699`
`700`	`700`	`/**`