minor #29100 [Messenger] Cleaning after new changes (yceruto)

nicolas-grekas · nicolas-grekas · commit 23a0b2dcdabd · 2018-11-06T16:29:10.000+01:00
This PR was squashed before being merged into the 4.2-dev branch (closes #29100). Discussion ---------- [Messenger] Cleaning after new changes | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - See topic per commit Commits ------- 3d31772 [Messenger] Cleaning after new changes
diff --git a/src/Symfony/Component/Messenger/Command/DebugCommand.php b/src/Symfony/Component/Messenger/Command/DebugCommand.php
@@ -44,7 +44,7 @@ public function __construct(array $mapping)
     protected function configure()
     {
         $this
-            ->addArgument('bus', InputArgument::OPTIONAL, sprintf('The bus id (one of %s)', implode(', ', array_keys($this->mapping))), null)
+            ->addArgument('bus', InputArgument::OPTIONAL, sprintf('The bus id (one of %s)', implode(', ', array_keys($this->mapping))))
             ->setDescription('Lists messages you can dispatch using the message buses')
             ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command displays all messages that can be
diff --git a/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php b/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php
@@ -15,7 +15,6 @@
 use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\Compiler\PriorityTaggedServiceTrait;
 use Symfony\Component\DependencyInjection\Compiler\ServiceLocatorTagPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -33,8 +32,6 @@
  */
 class MessengerPass implements CompilerPassInterface
 {
-    use PriorityTaggedServiceTrait;
-
     private $handlerTag;
     private $busTag;
     private $receiverTag;
@@ -282,7 +279,7 @@ private function registerBusMiddleware(ContainerBuilder $container, string $busI
                 throw new RuntimeException(sprintf('Invalid middleware: service "%s" not found.', $id));
             }
 
-            if (($definition = $container->findDefinition($messengerMiddlewareId))->isAbstract()) {
+            if ($container->findDefinition($messengerMiddlewareId)->isAbstract()) {
                 $childDefinition = new ChildDefinition($messengerMiddlewareId);
                 $childDefinition->setArguments($arguments);
                 $container->setDefinition($messengerMiddlewareId = $busId.'.middleware.'.$id, $childDefinition);
diff --git a/src/Symfony/Component/Messenger/Middleware/TraceableMiddleware.php b/src/Symfony/Component/Messenger/Middleware/TraceableMiddleware.php
@@ -90,7 +90,7 @@ public function next(): MiddlewareInterface
         return $nextMiddleware;
     }
 
-    public function stop()
+    public function stop(): void
     {
         if (null !== $this->currentEvent && $this->stopwatch->isStarted($this->currentEvent)) {
             $this->stopwatch->stop($this->currentEvent);
diff --git a/src/Symfony/Component/Messenger/Tests/MessageBusTest.php b/src/Symfony/Component/Messenger/Tests/MessageBusTest.php
@@ -42,7 +42,6 @@ public function testItCallsMiddleware()
     {
         $message = new DummyMessage('Hello');
         $envelope = new Envelope($message);
-        $responseFromDepthMiddleware = 1234;
 
         $firstMiddleware = $this->getMockBuilder(MiddlewareInterface::class)->getMock();
         $firstMiddleware->expects($this->once())
diff --git a/src/Symfony/Component/Messenger/Tests/TraceableMessageBusTest.php b/src/Symfony/Component/Messenger/Tests/TraceableMessageBusTest.php
@@ -29,7 +29,7 @@ public function testItTracesDispatch()
 
         $traceableBus = new TraceableMessageBus($bus);
         $line = __LINE__ + 1;
-        $this->assertInstanceOf(Envelope::class, $traceableBus->dispatch($message));
+        $traceableBus->dispatch($message);
         $this->assertCount(1, $tracedMessages = $traceableBus->getDispatchedMessages());
         $this->assertArraySubset(array(
             'message' => $message,
@@ -52,7 +52,7 @@ public function testItTracesDispatchWithEnvelope()
 
         $traceableBus = new TraceableMessageBus($bus);
         $line = __LINE__ + 1;
-        $this->assertInstanceOf(Envelope::class, $traceableBus->dispatch($envelope));
+        $traceableBus->dispatch($envelope);
         $this->assertCount(1, $tracedMessages = $traceableBus->getDispatchedMessages());
         $this->assertArraySubset(array(
             'message' => $message,
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpExtIntegrationTest.php b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpExtIntegrationTest.php
@@ -56,7 +56,7 @@ public function testItSendsAndReceivesMessages()
 
         $receivedMessages = 0;
         $receiver->receive(function (?Envelope $envelope) use ($receiver, &$receivedMessages, $first, $second) {
-            $this->assertEquals(0 == $receivedMessages ? $first : $second, $envelope);
+            $this->assertEquals(0 === $receivedMessages ? $first : $second, $envelope);
 
             if (2 === ++$receivedMessages) {
                 $receiver->stop();
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Sender/SendersLocatorTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Sender/SendersLocatorTest.php
@@ -28,6 +28,6 @@ public function testItReturnsTheSenderBasedOnTheMessageClass()
         ));
 
         $this->assertSame(array($sender), iterator_to_array($locator->getSenders(new Envelope(new DummyMessage('a')))));
-        $this->assertSame(array(), iterator_to_array($locator->getSenders(new Envelope(new SecondMessage('b')))));
+        $this->assertSame(array(), iterator_to_array($locator->getSenders(new Envelope(new SecondMessage()))));
     }
 }
diff --git a/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php b/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php
@@ -99,7 +99,7 @@ public function encode(Envelope $envelope): array
         );
     }
 
-    private function decodeStamps($encodedEnvelope)
+    private function decodeStamps(array $encodedEnvelope): array
     {
         $stamps = array();
         foreach ($encodedEnvelope['headers'] as $name => $value) {
@@ -113,7 +113,7 @@ private function decodeStamps($encodedEnvelope)
         return $stamps;
     }
 
-    private function encodeStamps(Envelope $envelope)
+    private function encodeStamps(Envelope $envelope): array
     {
         if (!$stamps = $envelope->all()) {
             return array();

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function __construct(array $mapping)`
`44`	`44`	`protected function configure()`
`45`	`45`	`{`
`46`	`46`	`$this`
`47`		`- ->addArgument('bus', InputArgument::OPTIONAL, sprintf('The bus id (one of %s)', implode(', ', array_keys($this->mapping))), null)`
	`47`	`+ ->addArgument('bus', InputArgument::OPTIONAL, sprintf('The bus id (one of %s)', implode(', ', array_keys($this->mapping))))`
`48`	`48`	`->setDescription('Lists messages you can dispatch using the message buses')`
`49`	`49`	`->setHelp(<<<'EOF'`
`50`	`50`	`The <info>%command.name%</info> command displays all messages that can be`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public function next(): MiddlewareInterface`
`90`	`90`	`return $nextMiddleware;`
`91`	`91`	`}`
`92`	`92`
`93`		`- public function stop()`
	`93`	`+ public function stop(): void`
`94`	`94`	`{`
`95`	`95`	`if (null !== $this->currentEvent && $this->stopwatch->isStarted($this->currentEvent)) {`
`96`	`96`	`$this->stopwatch->stop($this->currentEvent);`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,6 @@ public function testItCallsMiddleware()`
`42`	`42`	`{`
`43`	`43`	`$message = new DummyMessage('Hello');`
`44`	`44`	`$envelope = new Envelope($message);`
`45`		`- $responseFromDepthMiddleware = 1234;`
`46`	`45`
`47`	`46`	`$firstMiddleware = $this->getMockBuilder(MiddlewareInterface::class)->getMock();`
`48`	`47`	`$firstMiddleware->expects($this->once())`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,6 @@ public function testItReturnsTheSenderBasedOnTheMessageClass()`
`28`	`28`	`));`
`29`	`29`
`30`	`30`	`$this->assertSame(array($sender), iterator_to_array($locator->getSenders(new Envelope(new DummyMessage('a')))));`
`31`		`- $this->assertSame(array(), iterator_to_array($locator->getSenders(new Envelope(new SecondMessage('b')))));`
	`31`	`+ $this->assertSame(array(), iterator_to_array($locator->getSenders(new Envelope(new SecondMessage()))));`
`32`	`32`	`}`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public function encode(Envelope $envelope): array`
`99`	`99`	`);`
`100`	`100`	`}`
`101`	`101`
`102`		`- private function decodeStamps($encodedEnvelope)`
	`102`	`+ private function decodeStamps(array $encodedEnvelope): array`
`103`	`103`	`{`
`104`	`104`	`$stamps = array();`
`105`	`105`	`foreach ($encodedEnvelope['headers'] as $name => $value) {`
`@@ -113,7 +113,7 @@ private function decodeStamps($encodedEnvelope)`
`113`	`113`	`return $stamps;`
`114`	`114`	`}`
`115`	`115`
`116`		`- private function encodeStamps(Envelope $envelope)`
	`116`	`+ private function encodeStamps(Envelope $envelope): array`
`117`	`117`	`{`
`118`	`118`	`if (!$stamps = $envelope->all()) {`
`119`	`119`	`return array();`