[Messenger] Remove Envelope::wrap

ogizanagi · ogizanagi · commit b3a67688e2bc · 2018-05-22T11:44:54.000+02:00
diff --git a/src/Symfony/Component/Messenger/Envelope.php b/src/Symfony/Component/Messenger/Envelope.php
@@ -35,16 +35,6 @@ public function __construct($message, array $items = array())
         }
     }
 
-    /**
-     * Wrap a message into an envelope if not already wrapped.
-     *
-     * @param Envelope|object $message
-     */
-    public static function wrap($message): self
-    {
-        return $message instanceof self ? $message : new self($message);
-    }
-
     /**
      * @return Envelope a new Envelope instance with additional item
      */
diff --git a/src/Symfony/Component/Messenger/MessageBus.php b/src/Symfony/Component/Messenger/MessageBus.php
@@ -44,7 +44,7 @@ public function dispatch($message)
             throw new InvalidArgumentException(sprintf('Invalid type for message argument. Expected object, but got "%s".', \gettype($message)));
         }
 
-        return \call_user_func($this->callableForNextMiddleware(0), Envelope::wrap($message));
+        return \call_user_func($this->callableForNextMiddleware(0), $message instanceof Envelope ? $message : new Envelope($message));
     }
 
     private function callableForNextMiddleware(int $index): callable
diff --git a/src/Symfony/Component/Messenger/Tests/Asynchronous/Middleware/SendMessageMiddlewareTest.php b/src/Symfony/Component/Messenger/Tests/Asynchronous/Middleware/SendMessageMiddlewareTest.php
@@ -25,7 +25,7 @@ class SendMessageMiddlewareTest extends TestCase
 {
     public function testItSendsTheMessageToAssignedSender()
     {
-        $envelope = Envelope::wrap(new DummyMessage('Hey'));
+        $envelope = new Envelope(new DummyMessage('Hey'));
         $sender = $this->getMockBuilder(SenderInterface::class)->getMock();
         $next = $this->createPartialMock(\stdClass::class, array('__invoke'));
 
@@ -39,7 +39,7 @@ public function testItSendsTheMessageToAssignedSender()
 
     public function testItAlsoCallsTheNextMiddlewareBasedOnTheMessageClass()
     {
-        $envelope = Envelope::wrap(new DummyMessage('Hey'));
+        $envelope = new Envelope(new DummyMessage('Hey'));
         $sender = $this->getMockBuilder(SenderInterface::class)->getMock();
         $next = $this->createPartialMock(\stdClass::class, array('__invoke'));
 
@@ -55,7 +55,7 @@ public function testItAlsoCallsTheNextMiddlewareBasedOnTheMessageClass()
 
     public function testItAlsoCallsTheNextMiddlewareBasedOnTheMessageParentClass()
     {
-        $envelope = Envelope::wrap(new ChildDummyMessage('Hey'));
+        $envelope = (new Envelope(new ChildDummyMessage('Hey')));
         $sender = $this->getMockBuilder(SenderInterface::class)->getMock();
         $next = $this->createPartialMock(\stdClass::class, array('__invoke'));
 
@@ -71,7 +71,7 @@ public function testItAlsoCallsTheNextMiddlewareBasedOnTheMessageParentClass()
 
     public function testItAlsoCallsTheNextMiddlewareBasedOnTheMessageInterface()
     {
-        $envelope = Envelope::wrap(new DummyMessage('Hey'));
+        $envelope = new Envelope(new DummyMessage('Hey'));
         $sender = $this->getMockBuilder(SenderInterface::class)->getMock();
         $next = $this->createPartialMock(\stdClass::class, array('__invoke'));
 
@@ -87,7 +87,7 @@ public function testItAlsoCallsTheNextMiddlewareBasedOnTheMessageInterface()
 
     public function testItAlsoCallsTheNextMiddlewareBasedOnWildcard()
     {
-        $envelope = Envelope::wrap(new DummyMessage('Hey'));
+        $envelope = new Envelope(new DummyMessage('Hey'));
         $sender = $this->getMockBuilder(SenderInterface::class)->getMock();
         $next = $this->createPartialMock(\stdClass::class, array('__invoke'));
 
@@ -103,7 +103,7 @@ public function testItAlsoCallsTheNextMiddlewareBasedOnWildcard()
 
     public function testItCallsTheNextMiddlewareWhenNoSenderForThisMessage()
     {
-        $envelope = Envelope::wrap(new DummyMessage('Hey'));
+        $envelope = new Envelope(new DummyMessage('Hey'));
         $next = $this->createPartialMock(\stdClass::class, array('__invoke'));
 
         $middleware = new SendMessageMiddleware(new InMemorySenderLocator(null));
@@ -115,7 +115,7 @@ public function testItCallsTheNextMiddlewareWhenNoSenderForThisMessage()
 
     public function testItSkipsReceivedMessages()
     {
-        $envelope = Envelope::wrap(new DummyMessage('Hey'))->with(new ReceivedMessage());
+        $envelope = (new Envelope(new DummyMessage('Hey')))->with(new ReceivedMessage());
 
         $sender = $this->getMockBuilder(SenderInterface::class)->getMock();
         $next = $this->createPartialMock(\stdClass::class, array('__invoke'));
diff --git a/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php b/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php
@@ -554,7 +554,7 @@ class DummyReceiver implements ReceiverInterface
     public function receive(callable $handler): void
     {
         for ($i = 0; $i < 3; ++$i) {
-            $handler(Envelope::wrap(new DummyMessage("Dummy $i")));
+            $handler(new Envelope(new DummyMessage("Dummy $i")));
         }
     }
 
diff --git a/src/Symfony/Component/Messenger/Tests/EnvelopeTest.php b/src/Symfony/Component/Messenger/Tests/EnvelopeTest.php
@@ -33,37 +33,24 @@ public function testConstruct()
         $this->assertSame($receivedConfig, $configs[ReceivedMessage::class]);
     }
 
-    public function testWrap()
-    {
-        $first = Envelope::wrap($dummy = new DummyMessage('dummy'));
-
-        $this->assertInstanceOf(Envelope::class, $first);
-        $this->assertSame($dummy, $first->getMessage());
-
-        $envelope = Envelope::wrap($first);
-        $this->assertSame($first, $envelope);
-    }
-
     public function testWithReturnsNewInstance()
     {
-        $envelope = Envelope::wrap($dummy = new DummyMessage('dummy'));
+        $envelope = new Envelope(new DummyMessage('dummy'));
 
         $this->assertNotSame($envelope, $envelope->with(new ReceivedMessage()));
     }
 
     public function testGet()
     {
-        $envelope = Envelope::wrap($dummy = new DummyMessage('dummy'))
-            ->with($config = new ReceivedMessage())
-        ;
+        $envelope = (new Envelope(new DummyMessage('dummy')))->with($config = new ReceivedMessage());
 
         $this->assertSame($config, $envelope->get(ReceivedMessage::class));
         $this->assertNull($envelope->get(ValidationConfiguration::class));
     }
 
     public function testAll()
     {
-        $envelope = Envelope::wrap($dummy = new DummyMessage('dummy'))
+        $envelope = (new Envelope(new DummyMessage('dummy')))
             ->with($receivedConfig = new ReceivedMessage())
             ->with($validationConfig = new ValidationConfiguration(array('foo')))
         ;
diff --git a/src/Symfony/Component/Messenger/Tests/MessageBusTest.php b/src/Symfony/Component/Messenger/Tests/MessageBusTest.php
@@ -41,7 +41,7 @@ public function testItDispatchInvalidMessageType()
     public function testItCallsMiddlewareAndChainTheReturnValue()
     {
         $message = new DummyMessage('Hello');
-        $envelope = Envelope::wrap($message);
+        $envelope = new Envelope($message);
         $responseFromDepthMiddleware = 1234;
 
         $firstMiddleware = $this->getMockBuilder(MiddlewareInterface::class)->getMock();
diff --git a/src/Symfony/Component/Messenger/Tests/Middleware/AllowNoHandlerMiddlewareTest.php b/src/Symfony/Component/Messenger/Tests/Middleware/AllowNoHandlerMiddlewareTest.php
@@ -21,7 +21,7 @@ class AllowNoHandlerMiddlewareTest extends TestCase
 {
     public function testItCallsNextMiddlewareAndReturnsItsResult()
     {
-        $envelope = Envelope::wrap(new DummyMessage('Hey'));
+        $envelope = new Envelope(new DummyMessage('Hey'));
 
         $next = $this->createPartialMock(\stdClass::class, array('__invoke'));
         $next->expects($this->once())->method('__invoke')->with($envelope)->willReturn('Foo');
@@ -37,7 +37,7 @@ public function testItCatchesTheNoHandlerException()
 
         $middleware = new AllowNoHandlerMiddleware();
 
-        $this->assertNull($middleware->handle(Envelope::wrap(new DummyMessage('Hey')), $next));
+        $this->assertNull($middleware->handle(new Envelope(new DummyMessage('Hey')), $next));
     }
 
     /**
@@ -50,6 +50,6 @@ public function testItDoesNotCatchOtherExceptions()
         $next->expects($this->once())->method('__invoke')->will($this->throwException(new \RuntimeException('Something went wrong.')));
 
         $middleware = new AllowNoHandlerMiddleware();
-        $middleware->handle(Envelope::wrap(new DummyMessage('Hey')), $next);
+        $middleware->handle(new Envelope(new DummyMessage('Hey')), $next);
     }
 }
diff --git a/src/Symfony/Component/Messenger/Tests/Middleware/HandleMessageMiddlewareTest.php b/src/Symfony/Component/Messenger/Tests/Middleware/HandleMessageMiddlewareTest.php
@@ -21,7 +21,7 @@ class HandleMessageMiddlewareTest extends TestCase
 {
     public function testItCallsTheHandlerAndNextMiddleware()
     {
-        $envelope = Envelope::wrap($message = new DummyMessage('Hey'));
+        $envelope = new Envelope($message = new DummyMessage('Hey'));
 
         $handler = $this->createPartialMock(\stdClass::class, array('__invoke'));
         $handler->method('__invoke')->willReturn('Hello');
diff --git a/src/Symfony/Component/Messenger/Tests/Middleware/LoggingMiddlewareTest.php b/src/Symfony/Component/Messenger/Tests/Middleware/LoggingMiddlewareTest.php
@@ -21,7 +21,7 @@ class LoggingMiddlewareTest extends TestCase
 {
     public function testDebugLogAndNextMiddleware()
     {
-        $envelope = Envelope::wrap(new DummyMessage('Hey'));
+        $envelope = new Envelope(new DummyMessage('Hey'));
 
         $logger = $this->createMock(LoggerInterface::class);
         $logger
@@ -46,7 +46,7 @@ public function testDebugLogAndNextMiddleware()
      */
     public function testWarningLogOnException()
     {
-        $envelope = Envelope::wrap(new DummyMessage('Hey'));
+        $envelope = new Envelope(new DummyMessage('Hey'));
 
         $logger = $this->createMock(LoggerInterface::class);
         $logger
diff --git a/src/Symfony/Component/Messenger/Tests/Middleware/ValidationMiddlewareTest.php b/src/Symfony/Component/Messenger/Tests/Middleware/ValidationMiddlewareTest.php
@@ -23,7 +23,7 @@ class ValidationMiddlewareTest extends TestCase
 {
     public function testValidateAndNextMiddleware()
     {
-        $envelope = Envelope::wrap($message = new DummyMessage('Hey'));
+        $envelope = new Envelope($message = new DummyMessage('Hey'));
 
         $validator = $this->createMock(ValidatorInterface::class);
         $validator
@@ -47,7 +47,7 @@ public function testValidateAndNextMiddleware()
 
     public function testValidateWithConfigurationAndNextMiddleware()
     {
-        $envelope = Envelope::wrap($message = new DummyMessage('Hey'))->with(new ValidationConfiguration($groups = array('Default', 'Extra')));
+        $envelope = (new Envelope($message = new DummyMessage('Hey')))->with(new ValidationConfiguration($groups = array('Default', 'Extra')));
 
         $validator = $this->createMock(ValidatorInterface::class);
         $validator
@@ -75,7 +75,7 @@ public function testValidateWithConfigurationAndNextMiddleware()
      */
     public function testValidationFailedException()
     {
-        $envelope = Envelope::wrap($message = new DummyMessage('Hey'));
+        $envelope = new Envelope($message = new DummyMessage('Hey'));
 
         $violationList = $this->createMock(ConstraintViolationListInterface::class);
         $violationList
diff --git a/src/Symfony/Component/Messenger/Tests/TraceableMessageBusTest.php b/src/Symfony/Component/Messenger/Tests/TraceableMessageBusTest.php
@@ -39,7 +39,7 @@ public function testItTracesResult()
 
     public function testItTracesResultWithEnvelope()
     {
-        $envelope = Envelope::wrap($message = new DummyMessage('Hello'))->with($envelopeItem = new AnEnvelopeItem());
+        $envelope = (new Envelope($message = new DummyMessage('Hello')))->with($envelopeItem = new AnEnvelopeItem());
 
         $bus = $this->getMockBuilder(MessageBusInterface::class)->getMock();
         $bus->expects($this->once())->method('dispatch')->with($envelope)->willReturn($result = array('foo' => 'bar'));
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpExtIntegrationTest.php b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpExtIntegrationTest.php
@@ -51,8 +51,8 @@ public function testItSendsAndReceivesMessages()
         $sender = new AmqpSender($serializer, $connection);
         $receiver = new AmqpReceiver($serializer, $connection);
 
-        $sender->send($first = Envelope::wrap(new DummyMessage('First')));
-        $sender->send($second = Envelope::wrap(new DummyMessage('Second')));
+        $sender->send($first = new Envelope(new DummyMessage('First')));
+        $sender->send($second = new Envelope(new DummyMessage('Second')));
 
         $receivedMessages = 0;
         $receiver->receive(function (?Envelope $envelope) use ($receiver, &$receivedMessages, $first, $second) {
@@ -75,7 +75,7 @@ public function testItReceivesSignals()
         $connection->queue()->purge();
 
         $sender = new AmqpSender($serializer, $connection);
-        $sender->send(Envelope::wrap(new DummyMessage('Hello')));
+        $sender->send(new Envelope(new DummyMessage('Hello')));
 
         $amqpReadTimeout = 30;
         $dsn = getenv('MESSENGER_AMQP_DSN').'?read_timeout='.$amqpReadTimeout;
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpSenderTest.php b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpSenderTest.php
@@ -25,7 +25,7 @@ class AmqpSenderTest extends TestCase
 {
     public function testItSendsTheEncodedMessage()
     {
-        $envelope = Envelope::wrap(new DummyMessage('Oy'));
+        $envelope = new Envelope(new DummyMessage('Oy'));
         $encoded = array('body' => '...', 'headers' => array('type' => DummyMessage::class));
 
         $encoder = $this->getMockBuilder(EncoderInterface::class)->getMock();
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpTransportTest.php b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpTransportTest.php
@@ -46,7 +46,7 @@ public function testReceivesMessages()
         $amqpEnvelope->method('getBody')->willReturn('body');
         $amqpEnvelope->method('getHeaders')->willReturn(array('my' => 'header'));
 
-        $decoder->method('decode')->with(array('body' => 'body', 'headers' => array('my' => 'header')))->willReturn(Envelope::wrap($decodedMessage));
+        $decoder->method('decode')->with(array('body' => 'body', 'headers' => array('my' => 'header')))->willReturn(new Envelope($decodedMessage));
         $connection->method('get')->willReturn($amqpEnvelope);
 
         $transport->receive(function (Envelope $envelope) use ($transport, $decodedMessage) {
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Enhancers/StopWhenMemoryUsageIsExceededReceiverTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Enhancers/StopWhenMemoryUsageIsExceededReceiverTest.php
@@ -26,7 +26,7 @@ class StopWhenMemoryUsageIsExceededReceiverTest extends TestCase
     public function testReceiverStopsWhenMemoryLimitExceeded(int $memoryUsage, int $memoryLimit, bool $shouldStop)
     {
         $callable = function ($handler) {
-            $handler(Envelope::wrap(new DummyMessage('API')));
+            $handler(new Envelope(new DummyMessage('API')));
         };
 
         $decoratedReceiver = $this->getMockBuilder(CallbackReceiver::class)
@@ -59,7 +59,7 @@ public function memoryProvider()
     public function testReceiverLogsMemoryExceededWhenLoggerIsGiven()
     {
         $callable = function ($handler) {
-            $handler(Envelope::wrap(new DummyMessage('API')));
+            $handler(new Envelope(new DummyMessage('API')));
         };
 
         $decoratedReceiver = $this->getMockBuilder(CallbackReceiver::class)
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Enhancers/StopWhenMessageCountIsExceededReceiverTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Enhancers/StopWhenMessageCountIsExceededReceiverTest.php
@@ -26,9 +26,9 @@ class StopWhenMessageCountIsExceededReceiverTest extends TestCase
     public function testReceiverStopsWhenMaximumCountExceeded($max, $shouldStop)
     {
         $callable = function ($handler) {
-            $handler(Envelope::wrap(new DummyMessage('First message')));
-            $handler(Envelope::wrap(new DummyMessage('Second message')));
-            $handler(Envelope::wrap(new DummyMessage('Third message')));
+            $handler(new Envelope(new DummyMessage('First message')));
+            $handler(new Envelope(new DummyMessage('Second message')));
+            $handler(new Envelope(new DummyMessage('Third message')));
         };
 
         $decoratedReceiver = $this->getMockBuilder(CallbackReceiver::class)
@@ -79,7 +79,7 @@ public function testReceiverDoesntIncreaseItsCounterWhenReceiveNullMessage()
     public function testReceiverLogsMaximumCountExceededWhenLoggerIsGiven()
     {
         $callable = function ($handler) {
-            $handler(Envelope::wrap(new DummyMessage('First message')));
+            $handler(new Envelope(new DummyMessage('First message')));
         };
 
         $decoratedReceiver = $this->getMockBuilder(CallbackReceiver::class)
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Serialization/SerializerTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Serialization/SerializerTest.php
@@ -29,7 +29,7 @@ public function testEncodedIsDecodable()
             new SerializerComponent\Serializer(array(new ObjectNormalizer()), array('json' => new JsonEncoder()))
         );
 
-        $envelope = Envelope::wrap(new DummyMessage('Hello'));
+        $envelope = new Envelope(new DummyMessage('Hello'));
 
         $this->assertEquals($envelope, $serializer->decode($serializer->encode($envelope)));
     }
@@ -40,7 +40,7 @@ public function testEncodedWithConfigurationIsDecodable()
             new SerializerComponent\Serializer(array(new ObjectNormalizer()), array('json' => new JsonEncoder()))
         );
 
-        $envelope = Envelope::wrap(new DummyMessage('Hello'))
+        $envelope = (new Envelope(new DummyMessage('Hello')))
             ->with(new SerializerConfiguration(array(ObjectNormalizer::GROUPS => array('foo'))))
             ->with(new ValidationConfiguration(array('foo', 'bar')))
         ;
@@ -54,7 +54,7 @@ public function testEncodedIsHavingTheBodyAndTypeHeader()
             new SerializerComponent\Serializer(array(new ObjectNormalizer()), array('json' => new JsonEncoder()))
         );
 
-        $encoded = $serializer->encode(Envelope::wrap(new DummyMessage('Hello')));
+        $encoded = $serializer->encode(new Envelope(new DummyMessage('Hello')));
 
         $this->assertArrayHasKey('body', $encoded);
         $this->assertArrayHasKey('headers', $encoded);
@@ -73,7 +73,7 @@ public function testUsesTheCustomFormatAndContext()
 
         $encoder = new Serializer($serializer, 'csv', array('foo' => 'bar'));
 
-        $encoded = $encoder->encode(Envelope::wrap($message));
+        $encoded = $encoder->encode((new Envelope($message)));
         $decoded = $encoder->decode($encoded);
 
         $this->assertSame('Yay', $encoded['body']);
@@ -86,7 +86,7 @@ public function testEncodedWithSerializationConfiguration()
             new SerializerComponent\Serializer(array(new ObjectNormalizer()), array('json' => new JsonEncoder()))
         );
 
-        $envelope = Envelope::wrap(new DummyMessage('Hello'))
+        $envelope = (new Envelope(new DummyMessage('Hello')))
             ->with(new SerializerConfiguration(array(ObjectNormalizer::GROUPS => array('foo'))))
             ->with(new ValidationConfiguration(array('foo', 'bar')))
         ;
diff --git a/src/Symfony/Component/Messenger/Tests/WorkerTest.php b/src/Symfony/Component/Messenger/Tests/WorkerTest.php
@@ -27,22 +27,22 @@ public function testWorkerDispatchTheReceivedMessage()
         $ipaMessage = new DummyMessage('IPA');
 
         $receiver = new CallbackReceiver(function ($handler) use ($apiMessage, $ipaMessage) {
-            $handler(Envelope::wrap($apiMessage));
-            $handler(Envelope::wrap($ipaMessage));
+            $handler(new Envelope($apiMessage));
+            $handler(new Envelope($ipaMessage));
         });
 
         $bus = $this->getMockBuilder(MessageBusInterface::class)->getMock();
 
-        $bus->expects($this->at(0))->method('dispatch')->with(Envelope::wrap($apiMessage)->with(new ReceivedMessage()));
-        $bus->expects($this->at(1))->method('dispatch')->with(Envelope::wrap($ipaMessage)->with(new ReceivedMessage()));
+        $bus->expects($this->at(0))->method('dispatch')->with((new Envelope($apiMessage))->with(new ReceivedMessage()));
+        $bus->expects($this->at(1))->method('dispatch')->with((new Envelope($ipaMessage))->with(new ReceivedMessage()));
 
         $worker = new Worker($receiver, $bus);
         $worker->run();
     }
 
     public function testWorkerDoesNotWrapMessagesAlreadyWrappedWithReceivedMessage()
     {
-        $envelop = Envelope::wrap(new DummyMessage('API'))->with(new ReceivedMessage());
+        $envelop = (new Envelope(new DummyMessage('API')))->with(new ReceivedMessage());
         $receiver = new CallbackReceiver(function ($handler) use ($envelop) {
             $handler($envelop);
         });
@@ -59,7 +59,7 @@ public function testWorkerIsThrowingExceptionsBackToGenerators()
     {
         $receiver = new CallbackReceiver(function ($handler) {
             try {
-                $handler(Envelope::wrap(new DummyMessage('Hello')));
+                $handler(new Envelope(new DummyMessage('Hello')));
 
                 $this->assertTrue(false, 'This should not be called because the exception is sent back to the generator.');
             } catch (\InvalidArgumentException $e) {

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function dispatch($message)`
`44`	`44`	`throw new InvalidArgumentException(sprintf('Invalid type for message argument. Expected object, but got "%s".', \gettype($message)));`
`45`	`45`	`}`
`46`	`46`
`47`		`- return \call_user_func($this->callableForNextMiddleware(0), Envelope::wrap($message));`
	`47`	`+ return \call_user_func($this->callableForNextMiddleware(0), $message instanceof Envelope ? $message : new Envelope($message));`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`private function callableForNextMiddleware(int $index): callable`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class SendMessageMiddlewareTest extends TestCase`
`25`	`25`	`{`
`26`	`26`	`public function testItSendsTheMessageToAssignedSender()`
`27`	`27`	`{`
`28`		`- $envelope = Envelope::wrap(new DummyMessage('Hey'));`
	`28`	`+ $envelope = new Envelope(new DummyMessage('Hey'));`
`29`	`29`	`$sender = $this->getMockBuilder(SenderInterface::class)->getMock();`
`30`	`30`	`$next = $this->createPartialMock(\stdClass::class, array('__invoke'));`
`31`	`31`
`@@ -39,7 +39,7 @@ public function testItSendsTheMessageToAssignedSender()`
`39`	`39`
`40`	`40`	`public function testItAlsoCallsTheNextMiddlewareBasedOnTheMessageClass()`
`41`	`41`	`{`
`42`		`- $envelope = Envelope::wrap(new DummyMessage('Hey'));`
	`42`	`+ $envelope = new Envelope(new DummyMessage('Hey'));`
`43`	`43`	`$sender = $this->getMockBuilder(SenderInterface::class)->getMock();`
`44`	`44`	`$next = $this->createPartialMock(\stdClass::class, array('__invoke'));`
`45`	`45`
`@@ -55,7 +55,7 @@ public function testItAlsoCallsTheNextMiddlewareBasedOnTheMessageClass()`
`55`	`55`
`56`	`56`	`public function testItAlsoCallsTheNextMiddlewareBasedOnTheMessageParentClass()`
`57`	`57`	`{`
`58`		`- $envelope = Envelope::wrap(new ChildDummyMessage('Hey'));`
	`58`	`+ $envelope = (new Envelope(new ChildDummyMessage('Hey')));`
`59`	`59`	`$sender = $this->getMockBuilder(SenderInterface::class)->getMock();`
`60`	`60`	`$next = $this->createPartialMock(\stdClass::class, array('__invoke'));`
`61`	`61`
`@@ -71,7 +71,7 @@ public function testItAlsoCallsTheNextMiddlewareBasedOnTheMessageParentClass()`
`71`	`71`
`72`	`72`	`public function testItAlsoCallsTheNextMiddlewareBasedOnTheMessageInterface()`
`73`	`73`	`{`
`74`		`- $envelope = Envelope::wrap(new DummyMessage('Hey'));`
	`74`	`+ $envelope = new Envelope(new DummyMessage('Hey'));`
`75`	`75`	`$sender = $this->getMockBuilder(SenderInterface::class)->getMock();`
`76`	`76`	`$next = $this->createPartialMock(\stdClass::class, array('__invoke'));`
`77`	`77`
`@@ -87,7 +87,7 @@ public function testItAlsoCallsTheNextMiddlewareBasedOnTheMessageInterface()`
`87`	`87`
`88`	`88`	`public function testItAlsoCallsTheNextMiddlewareBasedOnWildcard()`
`89`	`89`	`{`
`90`		`- $envelope = Envelope::wrap(new DummyMessage('Hey'));`
	`90`	`+ $envelope = new Envelope(new DummyMessage('Hey'));`
`91`	`91`	`$sender = $this->getMockBuilder(SenderInterface::class)->getMock();`
`92`	`92`	`$next = $this->createPartialMock(\stdClass::class, array('__invoke'));`
`93`	`93`
`@@ -103,7 +103,7 @@ public function testItAlsoCallsTheNextMiddlewareBasedOnWildcard()`
`103`	`103`
`104`	`104`	`public function testItCallsTheNextMiddlewareWhenNoSenderForThisMessage()`
`105`	`105`	`{`
`106`		`- $envelope = Envelope::wrap(new DummyMessage('Hey'));`
	`106`	`+ $envelope = new Envelope(new DummyMessage('Hey'));`
`107`	`107`	`$next = $this->createPartialMock(\stdClass::class, array('__invoke'));`
`108`	`108`
`109`	`109`	`$middleware = new SendMessageMiddleware(new InMemorySenderLocator(null));`
`@@ -115,7 +115,7 @@ public function testItCallsTheNextMiddlewareWhenNoSenderForThisMessage()`
`115`	`115`
`116`	`116`	`public function testItSkipsReceivedMessages()`
`117`	`117`	`{`
`118`		`- $envelope = Envelope::wrap(new DummyMessage('Hey'))->with(new ReceivedMessage());`
	`118`	`+ $envelope = (new Envelope(new DummyMessage('Hey')))->with(new ReceivedMessage());`
`119`	`119`
`120`	`120`	`$sender = $this->getMockBuilder(SenderInterface::class)->getMock();`
`121`	`121`	`$next = $this->createPartialMock(\stdClass::class, array('__invoke'));`
Original file line number	Diff line number	Diff line change
`@@ -554,7 +554,7 @@ class DummyReceiver implements ReceiverInterface`
`554`	`554`	`public function receive(callable $handler): void`
`555`	`555`	`{`
`556`	`556`	`for ($i = 0; $i < 3; ++$i) {`
`557`		`- $handler(Envelope::wrap(new DummyMessage("Dummy $i")));`
	`557`	`+ $handler(new Envelope(new DummyMessage("Dummy $i")));`
`558`	`558`	`}`
`559`	`559`	`}`
`560`	`560`
Original file line number	Diff line number	Diff line change
`@@ -33,37 +33,24 @@ public function testConstruct()`
`33`	`33`	`$this->assertSame($receivedConfig, $configs[ReceivedMessage::class]);`
`34`	`34`	`}`
`35`	`35`
`36`		`- public function testWrap()`
`37`		`- {`
`38`		`- $first = Envelope::wrap($dummy = new DummyMessage('dummy'));`
`39`		`-`
`40`		`- $this->assertInstanceOf(Envelope::class, $first);`
`41`		`- $this->assertSame($dummy, $first->getMessage());`
`42`		`-`
`43`		`- $envelope = Envelope::wrap($first);`
`44`		`- $this->assertSame($first, $envelope);`
`45`		`- }`
`46`		`-`
`47`	`36`	`public function testWithReturnsNewInstance()`
`48`	`37`	`{`
`49`		`- $envelope = Envelope::wrap($dummy = new DummyMessage('dummy'));`
	`38`	`+ $envelope = new Envelope(new DummyMessage('dummy'));`
`50`	`39`
`51`	`40`	`$this->assertNotSame($envelope, $envelope->with(new ReceivedMessage()));`
`52`	`41`	`}`
`53`	`42`
`54`	`43`	`public function testGet()`
`55`	`44`	`{`
`56`		`- $envelope = Envelope::wrap($dummy = new DummyMessage('dummy'))`
`57`		`- ->with($config = new ReceivedMessage())`
`58`		`- ;`
	`45`	`+ $envelope = (new Envelope(new DummyMessage('dummy')))->with($config = new ReceivedMessage());`
`59`	`46`
`60`	`47`	`$this->assertSame($config, $envelope->get(ReceivedMessage::class));`
`61`	`48`	`$this->assertNull($envelope->get(ValidationConfiguration::class));`
`62`	`49`	`}`
`63`	`50`
`64`	`51`	`public function testAll()`
`65`	`52`	`{`
`66`		`- $envelope = Envelope::wrap($dummy = new DummyMessage('dummy'))`
	`53`	`+ $envelope = (new Envelope(new DummyMessage('dummy')))`
`67`	`54`	`->with($receivedConfig = new ReceivedMessage())`
`68`	`55`	`->with($validationConfig = new ValidationConfiguration(array('foo')))`
`69`	`56`	`;`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function testItDispatchInvalidMessageType()`
`41`	`41`	`public function testItCallsMiddlewareAndChainTheReturnValue()`
`42`	`42`	`{`
`43`	`43`	`$message = new DummyMessage('Hello');`
`44`		`- $envelope = Envelope::wrap($message);`
	`44`	`+ $envelope = new Envelope($message);`
`45`	`45`	`$responseFromDepthMiddleware = 1234;`
`46`	`46`
`47`	`47`	`$firstMiddleware = $this->getMockBuilder(MiddlewareInterface::class)->getMock();`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class AllowNoHandlerMiddlewareTest extends TestCase`
`21`	`21`	`{`
`22`	`22`	`public function testItCallsNextMiddlewareAndReturnsItsResult()`
`23`	`23`	`{`
`24`		`- $envelope = Envelope::wrap(new DummyMessage('Hey'));`
	`24`	`+ $envelope = new Envelope(new DummyMessage('Hey'));`
`25`	`25`
`26`	`26`	`$next = $this->createPartialMock(\stdClass::class, array('__invoke'));`
`27`	`27`	`$next->expects($this->once())->method('__invoke')->with($envelope)->willReturn('Foo');`
`@@ -37,7 +37,7 @@ public function testItCatchesTheNoHandlerException()`
`37`	`37`
`38`	`38`	`$middleware = new AllowNoHandlerMiddleware();`
`39`	`39`
`40`		`- $this->assertNull($middleware->handle(Envelope::wrap(new DummyMessage('Hey')), $next));`
	`40`	`+ $this->assertNull($middleware->handle(new Envelope(new DummyMessage('Hey')), $next));`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`/**`
`@@ -50,6 +50,6 @@ public function testItDoesNotCatchOtherExceptions()`
`50`	`50`	`$next->expects($this->once())->method('__invoke')->will($this->throwException(new \RuntimeException('Something went wrong.')));`
`51`	`51`
`52`	`52`	`$middleware = new AllowNoHandlerMiddleware();`
`53`		`- $middleware->handle(Envelope::wrap(new DummyMessage('Hey')), $next);`
	`53`	`+ $middleware->handle(new Envelope(new DummyMessage('Hey')), $next);`
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class HandleMessageMiddlewareTest extends TestCase`
`21`	`21`	`{`
`22`	`22`	`public function testItCallsTheHandlerAndNextMiddleware()`
`23`	`23`	`{`
`24`		`- $envelope = Envelope::wrap($message = new DummyMessage('Hey'));`
	`24`	`+ $envelope = new Envelope($message = new DummyMessage('Hey'));`
`25`	`25`
`26`	`26`	`$handler = $this->createPartialMock(\stdClass::class, array('__invoke'));`
`27`	`27`	`$handler->method('__invoke')->willReturn('Hello');`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class LoggingMiddlewareTest extends TestCase`
`21`	`21`	`{`
`22`	`22`	`public function testDebugLogAndNextMiddleware()`
`23`	`23`	`{`
`24`		`- $envelope = Envelope::wrap(new DummyMessage('Hey'));`
	`24`	`+ $envelope = new Envelope(new DummyMessage('Hey'));`
`25`	`25`
`26`	`26`	`$logger = $this->createMock(LoggerInterface::class);`
`27`	`27`	`$logger`
`@@ -46,7 +46,7 @@ public function testDebugLogAndNextMiddleware()`
`46`	`46`	`*/`
`47`	`47`	`public function testWarningLogOnException()`
`48`	`48`	`{`
`49`		`- $envelope = Envelope::wrap(new DummyMessage('Hey'));`
	`49`	`+ $envelope = new Envelope(new DummyMessage('Hey'));`
`50`	`50`
`51`	`51`	`$logger = $this->createMock(LoggerInterface::class);`
`52`	`52`	`$logger`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class ValidationMiddlewareTest extends TestCase`
`23`	`23`	`{`
`24`	`24`	`public function testValidateAndNextMiddleware()`
`25`	`25`	`{`
`26`		`- $envelope = Envelope::wrap($message = new DummyMessage('Hey'));`
	`26`	`+ $envelope = new Envelope($message = new DummyMessage('Hey'));`
`27`	`27`
`28`	`28`	`$validator = $this->createMock(ValidatorInterface::class);`
`29`	`29`	`$validator`
`@@ -47,7 +47,7 @@ public function testValidateAndNextMiddleware()`
`47`	`47`
`48`	`48`	`public function testValidateWithConfigurationAndNextMiddleware()`
`49`	`49`	`{`
`50`		`- $envelope = Envelope::wrap($message = new DummyMessage('Hey'))->with(new ValidationConfiguration($groups = array('Default', 'Extra')));`
	`50`	`+ $envelope = (new Envelope($message = new DummyMessage('Hey')))->with(new ValidationConfiguration($groups = array('Default', 'Extra')));`
`51`	`51`
`52`	`52`	`$validator = $this->createMock(ValidatorInterface::class);`
`53`	`53`	`$validator`
`@@ -75,7 +75,7 @@ public function testValidateWithConfigurationAndNextMiddleware()`
`75`	`75`	`*/`
`76`	`76`	`public function testValidationFailedException()`
`77`	`77`	`{`
`78`		`- $envelope = Envelope::wrap($message = new DummyMessage('Hey'));`
	`78`	`+ $envelope = new Envelope($message = new DummyMessage('Hey'));`
`79`	`79`
`80`	`80`	`$violationList = $this->createMock(ConstraintViolationListInterface::class);`
`81`	`81`	`$violationList`