Merge branch '6.4' into 7.1

* 6.4:
  Mitigate PHPUnit deprecations
  [TwigBundle] Add support for resetting globals between HTTP requests
  Mitigate PHPUnit deprecations
  [Cache] Fix compatibility with Redis 6.1.0 pre-releases
  [Validator] Add Catalan and Spanish translation for `Week` constraint
  Don't use is_resource() on non-streams
  [Ldap] Fix extension deprecation

Tests/Command/SetupTransportsCommandTest.php

@@ -101,9 +101,7 @@ public function testThrowsExceptionOnTransportSetup()
         $serviceLocator = $this->createMock(ServiceLocator::class);
         $serviceLocator->expects($this->exactly(1))
             ->method('get')
-            ->will($this->onConsecutiveCalls(
-                $amqpTransport
-            ));
+            ->willReturn($amqpTransport);
         $serviceLocator
             ->method('has')
             ->willReturn(true);

Tests/Middleware/DispatchAfterCurrentBusMiddlewareTest.php

@@ -68,7 +68,7 @@ public function testEventsInNewTransactionAreHandledAfterMainMessage()
             ->with($this->callback(function (Envelope $envelope) use (&$series) {
                 return $envelope->getMessage() === array_shift($series);
             }))
-            ->will($this->willHandleMessage());
+            ->willReturnCallback($this->handleMessageCallback());
 
         $messageBus->dispatch($message);
     }
@@ -278,7 +278,7 @@ public function testDispatchOutOfAnotherHandlerDispatchesAndRemoveStamp()
         $handlingMiddleware
             ->method('handle')
             ->with($this->expectHandledMessage($event))
-            ->will($this->willHandleMessage());
+            ->willReturnCallback($this->handleMessageCallback());
 
         $eventBus = new MessageBus([
             $middleware,
@@ -295,9 +295,9 @@ private function expectHandledMessage($message): Callback
         return $this->callback(fn (Envelope $envelope) => $envelope->getMessage() === $message);
     }
 
-    private function willHandleMessage(): ReturnCallback
+    private function handleMessageCallback(): \Closure
     {
-        return $this->returnCallback(fn ($envelope, StackInterface $stack) => $stack->next()->handle($envelope, $stack));
+        return fn ($envelope, StackInterface $stack) => $stack->next()->handle($envelope, $stack);
     }
 }