Merge branch '4.4' into 5.3

* 4.4:
  Remove wrong parameter in MockHub
  The Doctrine adapter is not a database adapter
  Fix confusion of HttpKernel and Kernel

Author: javiereguiluz

components/cache/adapters/filesystem_adapter.rst

@@ -45,8 +45,7 @@ and cache root path as constructor parameters::
     choices. If throughput is paramount, the in-memory adapters
     (:ref:`Apcu <apcu-adapter>`, :ref:`Memcached <memcached-adapter>`, and
     :ref:`Redis <redis-adapter>`) or the database adapters
-    (:ref:`Doctrine <doctrine-adapter>` and :ref:`PDO <pdo-doctrine-adapter>`)
-    are recommended.
+    (:ref:`PDO <pdo-doctrine-adapter>`) are recommended.
 
 .. note::
 

components/dependency_injection/workflow.rst

@@ -21,7 +21,7 @@ Working with a Cached Container
 -------------------------------
 
 Before building it, the kernel checks to see if a cached version of the
-container exists. The HttpKernel has a debug setting and if this is false,
+container exists. The kernel has a debug setting and if this is false,
 the cached version is used if it exists. If debug is true then the kernel
 :doc:`checks to see if configuration is fresh </components/config/caching>`
 and if it is, the cached version of the container is used. If not then the

mercure.rst

@@ -577,7 +577,7 @@ You can instead make use of the `MockHub`::
     {
         public function testPublishing()
         {
-            $hub = new MockHub('default', 'https://internal/.well-known/mercure', new StaticTokenProvider('foo'), function(Update $update): string {
+            $hub = new MockHub('https://internal/.well-known/mercure', new StaticTokenProvider('foo'), function(Update $update): string {
                 // $this->assertTrue($update->isPrivate());
 
                 return 'id';