Merge branch '5.4' into 6.0

* 5.4:
  [Console] fix tests
  [Cache] Fix phpdoc
  [Console] Fix typo in completion command help text
  [Messenger] Retain correlation id from \AmqpEnvelope when retrying a message

Test/ProviderTestCase.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Translation\Test;
 
-use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpClient\MockHttpClient;
@@ -55,17 +54,11 @@ protected function getClient(): MockHttpClient
         return $this->client ??= new MockHttpClient();
     }
 
-    /**
-     * @return LoaderInterface&MockObject
-     */
     protected function getLoader(): LoaderInterface
     {
         return $this->loader ??= $this->createMock(LoaderInterface::class);
     }
 
-    /**
-     * @return LoaderInterface&MockObject
-     */
     protected function getLogger(): LoggerInterface
     {
         return $this->logger ??= $this->createMock(LoggerInterface::class);
@@ -76,9 +69,6 @@ protected function getDefaultLocale(): string
         return $this->defaultLocale ??= 'en';
     }
 
-    /**
-     * @return LoaderInterface&MockObject
-     */
     protected function getXliffFileDumper(): XliffFileDumper
     {
         return $this->xliffFileDumper ??= $this->createMock(XliffFileDumper::class);