Merge branch '5.4' into 6.4

derrabus · derrabus · commit 9183bb85e180 · 2024-05-02T10:32:52.000+02:00
* 5.4:
  fix compatibility with Twig 3.10
  [Strings][EnglishInflector] Fix incorrect pluralisation of 'Album'
  handle union and intersection types for cascaded validations
  move wiring of the property info extractor to the ObjectNormalizer
  move Process component dep to require-dev
  Remove calls to `onConsecutiveCalls()`
  fix: remove unwanted type cast
  accept AbstractAsset instances when filtering schemas
  better distinguish URL schemes and windows drive letters
  convert empty CSV header names into numeric keys
diff --git a/Tests/Transport/AmazonSqsSenderTest.php b/Tests/Transport/AmazonSqsSenderTest.php
@@ -31,7 +31,7 @@ public function testSend()
         $connection->expects($this->once())->method('send')->with($encoded['body'], $encoded['headers']);
 
         $serializer = $this->createMock(SerializerInterface::class);
-        $serializer->method('encode')->with($envelope)->willReturnOnConsecutiveCalls($encoded);
+        $serializer->method('encode')->with($envelope)->willReturn($encoded);
 
         $sender = new AmazonSqsSender($connection, $serializer);
         $sender->send($envelope);
@@ -49,7 +49,7 @@ public function testSendWithAmazonSqsFifoStamp()
             ->with($encoded['body'], $encoded['headers'], 0, $stamp->getMessageGroupId(), $stamp->getMessageDeduplicationId());
 
         $serializer = $this->createMock(SerializerInterface::class);
-        $serializer->method('encode')->with($envelope)->willReturnOnConsecutiveCalls($encoded);
+        $serializer->method('encode')->with($envelope)->willReturn($encoded);
 
         $sender = new AmazonSqsSender($connection, $serializer);
         $sender->send($envelope);
@@ -67,7 +67,7 @@ public function testSendWithAmazonSqsXrayTraceHeaderStamp()
             ->with($encoded['body'], $encoded['headers'], 0, null, null, $stamp->getTraceId());
 
         $serializer = $this->createMock(SerializerInterface::class);
-        $serializer->method('encode')->with($envelope)->willReturnOnConsecutiveCalls($encoded);
+        $serializer->method('encode')->with($envelope)->willReturn($encoded);
 
         $sender = new AmazonSqsSender($connection, $serializer);
         $sender->send($envelope);
