Merge branch '4.4' into 5.2

* 4.4:
  Fix usage of str_contains()
  fix intersection types in tests

Author: nicolas-grekas

Tests/Command/SetupTransportsCommandTest.php

@@ -24,7 +24,7 @@ class SetupTransportsCommandTest extends TestCase
     public function testReceiverNames()
     {
         // mock a service locator
-        /** @var MockObject|ServiceLocator $serviceLocator */
+        /** @var MockObject&ServiceLocator $serviceLocator */
         $serviceLocator = $this->createMock(ServiceLocator::class);
         // get method must be call twice and will return consecutively a setup-able transport and a non setup-able transport
         $serviceLocator->expects($this->exactly(2))
@@ -49,7 +49,7 @@ public function testReceiverNames()
     public function testReceiverNameArgument()
     {
         // mock a service locator
-        /** @var MockObject|ServiceLocator $serviceLocator */
+        /** @var MockObject&ServiceLocator $serviceLocator */
         $serviceLocator = $this->createMock(ServiceLocator::class);
         // get method must be call twice and will return consecutively a setup-able transport and a non setup-able transport
         $serviceLocator->expects($this->exactly(1))
@@ -74,7 +74,7 @@ public function testReceiverNameArgumentNotFound()
         $this->expectException(\RuntimeException::class);
         $this->expectExceptionMessage('The "not_found" transport does not exist.');
         // mock a service locator
-        /** @var MockObject|ServiceLocator $serviceLocator */
+        /** @var MockObject&ServiceLocator $serviceLocator */
         $serviceLocator = $this->createMock(ServiceLocator::class);
         // get method must be call twice and will return consecutively a setup-able transport and a non setup-able transport
         $serviceLocator->expects($this->exactly(0))

Transport/Serialization/PhpSerializer.php

@@ -29,7 +29,7 @@ public function decode(array $encodedEnvelope): Envelope
             throw new MessageDecodingFailedException('Encoded envelope should have at least a "body".');
         }
 
-        if (!str_contains($encodedEnvelope['body'], '}', -1)) {
+        if (str_ends_with($encodedEnvelope['body'], '}')) {
             $encodedEnvelope['body'] = base64_decode($encodedEnvelope['body']);
         }