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

Author: derrabus

Tests/ArgumentResolver/EntityValueResolverTest.php

@@ -168,7 +168,7 @@ public function testResolveWithConversionFailedException()
         $repository->expects($this->once())
             ->method('find')
             ->with('test')
-            ->will($this->throwException(new ConversionException()));
+            ->willThrowException(new ConversionException());
 
         $manager->expects($this->once())
             ->method('getRepository')
@@ -453,7 +453,7 @@ public function testExpressionSyntaxErrorThrowsException()
 
         $language->expects($this->once())
             ->method('evaluate')
-            ->will($this->throwException(new SyntaxError('syntax error message', 10)));
+            ->willThrowException(new SyntaxError('syntax error message', 10));
 
         $this->expectException(\LogicException::class);
         $this->expectExceptionMessage('syntax error message around position 10');

Tests/Messenger/DoctrineCloseConnectionMiddlewareTest.php

@@ -63,7 +63,7 @@ public function testInvalidEntityManagerThrowsException()
         $managerRegistry
             ->method('getManager')
             ->with('unknown_manager')
-            ->will($this->throwException(new \InvalidArgumentException()));
+            ->willThrowException(new \InvalidArgumentException());
 
         $middleware = new DoctrineCloseConnectionMiddleware($managerRegistry, 'unknown_manager');
 

Tests/Messenger/DoctrinePingConnectionMiddlewareTest.php

@@ -101,7 +101,7 @@ public function testInvalidEntityManagerThrowsException()
         $managerRegistry
             ->method('getManager')
             ->with('unknown_manager')
-            ->will($this->throwException(new \InvalidArgumentException()));
+            ->willThrowException(new \InvalidArgumentException());
 
         $middleware = new DoctrinePingConnectionMiddleware($managerRegistry, 'unknown_manager');
 

Tests/Messenger/DoctrineTransactionMiddlewareTest.php

@@ -75,7 +75,7 @@ public function testInvalidEntityManagerThrowsException()
         $managerRegistry
             ->method('getManager')
             ->with('unknown_manager')
-            ->will($this->throwException(new \InvalidArgumentException()));
+            ->willThrowException(new \InvalidArgumentException());
 
         $middleware = new DoctrineTransactionMiddleware($managerRegistry, 'unknown_manager');