Remove passing envelope as second parameter

nicholasruunu · nicholasruunu · commit 58ef48172dfb · 2019-01-10T19:50:05.000+01:00
diff --git a/src/Symfony/Component/Messenger/Middleware/HandleMessageMiddleware.php b/src/Symfony/Component/Messenger/Middleware/HandleMessageMiddleware.php
@@ -42,7 +42,7 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope
         $handler = null;
         $message = $envelope->getMessage();
         foreach ($this->handlersLocator->getHandlers($envelope) as $alias => $handler) {
-            $envelope = $envelope->with(HandledStamp::fromCallable($handler, $handler($message, $envelope), \is_string($alias) ? $alias : null));
+            $envelope = $envelope->with(HandledStamp::fromCallable($handler, $handler($message), \is_string($alias) ? $alias : null));
         }
         if (null === $handler && !$this->allowNoHandlers) {
             throw new NoHandlerForMessageException(sprintf('No handler for message "%s".', \get_class($envelope->getMessage())));
diff --git a/src/Symfony/Component/Messenger/Tests/Middleware/HandleMessageMiddlewareTest.php b/src/Symfony/Component/Messenger/Tests/Middleware/HandleMessageMiddlewareTest.php
@@ -32,7 +32,7 @@ public function testItCallsTheHandlerAndNextMiddleware()
             DummyMessage::class => array($handler),
         )));
 
-        $handler->expects($this->once())->method('__invoke')->with($message, $envelope);
+        $handler->expects($this->once())->method('__invoke')->with($message);
 
         $middleware->handle($envelope, $this->getStackMock());
     }

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope`
`42`	`42`	`$handler = null;`
`43`	`43`	`$message = $envelope->getMessage();`
`44`	`44`	`foreach ($this->handlersLocator->getHandlers($envelope) as $alias => $handler) {`
`45`		`- $envelope = $envelope->with(HandledStamp::fromCallable($handler, $handler($message, $envelope), \is_string($alias) ? $alias : null));`
	`45`	`+ $envelope = $envelope->with(HandledStamp::fromCallable($handler, $handler($message), \is_string($alias) ? $alias : null));`
`46`	`46`	`}`
`47`	`47`	`if (null === $handler && !$this->allowNoHandlers) {`
`48`	`48`	`throw new NoHandlerForMessageException(sprintf('No handler for message "%s".', \get_class($envelope->getMessage())));`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function testItCallsTheHandlerAndNextMiddleware()`
`32`	`32`	`DummyMessage::class => array($handler),`
`33`	`33`	`)));`
`34`	`34`
`35`		`- $handler->expects($this->once())->method('__invoke')->with($message, $envelope);`
	`35`	`+ $handler->expects($this->once())->method('__invoke')->with($message);`
`36`	`36`
`37`	`37`	`$middleware->handle($envelope, $this->getStackMock());`
`38`	`38`	`}`