Merge branch '6.0' into 6.1

nicolas-grekas · nicolas-grekas · commit 36fcfd8cccdc · 2022-06-26T18:35:04.000+02:00
* 6.0:
  [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
@@ -692,7 +692,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
`@@ -692,7 +692,7 @@ private function mayServeStaleWhileRevalidate(Response $entry): bool`
`692`	`692`	`$timeout = $this->options['stale_while_revalidate'];`
`693`	`693`	`}`
`694`	`694`
`695`		`- return abs($entry->getTtl()) < $timeout;`
	`695`	`+ return abs($entry->getTtl() ?? 0) < $timeout;`
`696`	`696`	`}`
`697`	`697`
`698`	`698`	`/**`