Merge branch '6.0' into 6.1

nicolas-grekas · nicolas-grekas · commit 9ae74e40fde3 · 2022-09-08T11:34:40.000+02:00
* 6.0:
  [HttpClient] Fix computing retry delay when using RetryableHttpClient
  [Uid] Fix validating UUID variant bits
  [Validator][UID] Stop to first ULID format violation
  [Bridge] Fix mkdir() race condition in ProxyCacheWarmer
  [Cache] update readme
  Bug #42343 [Security] Fix valid remember-me token exposure to the second consequent request
  Prevent exception if request stack is empty
  Psr18Client ignore invalid HTTP headers
  skip a transient test on AppVeyor
diff --git a/README.md b/README.md
@@ -1,13 +1,13 @@
 Symfony PSR-6 implementation for caching
 ========================================
 
-The Cache component provides an extended
-[PSR-6](http://www.php-fig.org/psr/psr-6/) implementation for adding cache to
+The Cache component provides extended
+[PSR-6](https://www.php-fig.org/psr/psr-6/) implementations for adding cache to
 your applications. It is designed to have a low overhead so that caching is
-fastest. It ships with a few caching adapters for the most widespread and
-suited to caching backends. It also provides a `doctrine/cache` proxy adapter
-to cover more advanced caching needs and a proxy adapter for greater
-interoperability between PSR-6 implementations.
+fastest. It ships with adapters for the most widespread caching backends.
+It also provides a [PSR-16](https://www.php-fig.org/psr/psr-16/) adapter,
+and implementations for [symfony/cache-contracts](https://github.com/symfony/cache-contracts)'
+`CacheInterface` and `TagAwareCacheInterface`.
 
 Resources
 ---------
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "symfony/cache",
     "type": "library",
-    "description": "Provides an extended PSR-6, PSR-16 (and tags) implementation",
+    "description": "Provides extended PSR-6, PSR-16 (and tags) implementations",
     "keywords": ["caching", "psr6"],
     "homepage": "https://symfony.com",
     "license": "MIT",

Original file line num 6895 ber	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "symfony/cache",`
`3`	`3`	`"type": "library",`
`4`		`- "description": "Provides an extended PSR-6, PSR-16 (and tags) implementation",`
	`4`	`+ "description": "Provides extended PSR-6, PSR-16 (and tags) implementations",`
`5`	`5`	`"keywords": ["caching", "psr6"],`
`6`	`6`	`"homepage": "https://symfony.com",`
`7`	`7`	`"license": "MIT",`