Merge branch '5.4' into 6.4

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

Author: derrabus

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');