From 6d8390cba88656298d5fd2abbf9ad9928207d82a Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 24 Apr 2019 18:31:14 +0200
Subject: [PATCH 1/2] [Cache] Update for 4.3

---
 components/cache/psr6_psr16_adapters.rst | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/components/cache/psr6_psr16_adapters.rst b/components/cache/psr6_psr16_adapters.rst
index 4dc676e8b9c..b110c5dab3b 100644
--- a/components/cache/psr6_psr16_adapters.rst
+++ b/components/cache/psr6_psr16_adapters.rst
@@ -11,6 +11,10 @@ standard, but need to pass it to an object that expects a :ref:`PSR-6 <cache-com
 cache adapter. Or, you might have the opposite situation. The cache component contains
 two classes for bidirectional interoperability between PSR-6 and PSR-16 caches.
 
+.. versionadded:: 4.3
+
+    The ``Psr16Adapter`` and ``Psr16Cache`` classes mentionned below were added in Symfony 4.3.
+
 Using a PSR-16 Cache Object as a PSR-6 Cache
 --------------------------------------------
 
@@ -33,17 +37,15 @@ example::
 
 But, you already have a PSR-16 cache object, and you'd like to pass this to the class
 instead. No problem! The Cache component provides the
-:class:`Symfony\\Component\\Cache\\Adapter\\SimpleCacheAdapter` class for exactly
+:class:`Symfony\\Component\\Cache\\Adapter\\Psr16Adapter` class for exactly
 this use-case::
 
-    use Symfony\Component\Cache\Adapter\SimpleCacheAdapter;
-    use Symfony\Component\Cache\Simple\FilesystemCache;
+    use Symfony\Component\Cache\Adapter\Psr16Adapter;
 
-    // the PSR-16 cache object that you want to use
-    $psr16Cache = new FilesystemCache();
+    // $psr16Cache is the PSR-16 object that you want to use as a PSR-6 one
 
     // a PSR-6 cache that uses your cache internally!
-    $psr6Cache = new SimpleCacheAdapter($psr16Cache);
+    $psr6Cache = new Psr16Adapter($psr16Cache);
 
     // now use this wherever you want
     $githubApiClient = new GitHubApiClient($psr6Cache);
@@ -70,11 +72,11 @@ example::
 
 But, you already have a PSR-6 cache pool object, and you'd like to pass this to
 the class instead. No problem! The Cache component provides the
-:class:`Symfony\\Component\\Cache\\Simple\\Psr6Cache` class for exactly
+:class:`Symfony\\Component\\Cache\\Psr16Cache` class for exactly
 this use-case::
 
     use Symfony\Component\Cache\Adapter\FilesystemAdapter;
-    use Symfony\Component\Cache\Simple\Psr6Cache;
+    use Symfony\Component\Cache\Psr16Cache;
 
     // the PSR-6 cache object that you want to use
     $psr6Cache = new FilesystemAdapter();

From 7402bfbaf61fb95e9049772f3b7f67ae80ce9338 Mon Sep 17 00:00:00 2001
From: Ryan Weaver <weaverryan+github@gmail.com>
Date: Thu, 25 Apr 2019 09:07:07 -0400
Subject: [PATCH 2/2] minor tweak

---
 components/cache/psr6_psr16_adapters.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/cache/psr6_psr16_adapters.rst b/components/cache/psr6_psr16_adapters.rst
index b110c5dab3b..5bf355d5e93 100644
--- a/components/cache/psr6_psr16_adapters.rst
+++ b/components/cache/psr6_psr16_adapters.rst
@@ -13,7 +13,7 @@ two classes for bidirectional interoperability between PSR-6 and PSR-16 caches.
 
 .. versionadded:: 4.3
 
-    The ``Psr16Adapter`` and ``Psr16Cache`` classes mentionned below were added in Symfony 4.3.
+    The ``Psr16Adapter`` and ``Psr16Cache`` classes mentioned below were added in Symfony 4.3.
 
 Using a PSR-16 Cache Object as a PSR-6 Cache
 --------------------------------------------