fabbot

weaverryan · weaverryan · commit 263148ccc60a · 2019-03-18T15:54:09.000-04:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1650,7 +1650,7 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
             $senderAliases[$name] = $transportId;
 
             $transportRetryReferences[$name] = new Reference($transport['retry_strategy']['service']);
-            if ($transport['retry_strategy']['service'] === 'messenger.retry.exponential_retry_strategy') {
+            if ('messenger.retry.exponential_retry_strategy' === $transport['retry_strategy']['service']) {
                 $container->getDefinition('messenger.retry.exponential_retry_strategy')
                     ->replaceArgument(0, $transport['retry_strategy']['max_retries'])
                     ->replaceArgument(1, $transport['retry_strategy']['exponential_offset']);
diff --git a/src/Symfony/Component/Messenger/Event/AbstractWorkerMessageEvent.php b/src/Symfony/Component/Messenger/Event/AbstractWorkerMessageEvent.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Messenger\Event;
 
 use Symfony\Component\EventDispatcher\Event;
@@ -30,4 +39,4 @@ public function getReceiverName(): string
     {
         return $this->receiverName;
     }
-}
+}
diff --git a/src/Symfony/Component/Messenger/Event/WorkerMessageFailedEvent.php b/src/Symfony/Component/Messenger/Event/WorkerMessageFailedEvent.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Messenger\Event;
 
-use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\Messenger\Envelope;
 
 class WorkerMessageFailedEvent extends AbstractWorkerMessageEvent
diff --git a/src/Symfony/Component/Messenger/Event/WorkerMessageHandledEvent.php b/src/Symfony/Component/Messenger/Event/WorkerMessageHandledEvent.php
@@ -11,9 +11,6 @@
 
 namespace Symfony\Component\Messenger\Event;
 
-use Symfony\Component\EventDispatcher\Event;
-use Symfony\Component\Messenger\Envelope;
-
 class WorkerMessageHandledEvent extends AbstractWorkerMessageEvent
 {
 }
diff --git a/src/Symfony/Component/Messenger/Event/WorkerMessageHandlingEvent.php b/src/Symfony/Component/Messenger/Event/WorkerMessageHandlingEvent.php
@@ -11,9 +11,6 @@
 
 namespace Symfony\Component\Messenger\Event;
 
-use Symfony\Component\EventDispatcher\Event;
-use Symfony\Component\Messenger\Envelope;
-
 class WorkerMessageHandlingEvent extends AbstractWorkerMessageEvent
 {
 }
diff --git a/src/Symfony/Component/Messenger/Exception/MessageDecodingFailedException.php b/src/Symfony/Component/Messenger/Exception/MessageDecodingFailedException.php
@@ -1,9 +1,18 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Messenger\Exception;
 
 /**
- * Thrown when a message cannot be decoded in a serializer
+ * Thrown when a message cannot be decoded in a serializer.
  */
 class MessageDecodingFailedException extends \Exception implements ExceptionInterface
 {
diff --git a/src/Symfony/Component/Messenger/Retry/ExponentialRetryStrategy.php b/src/Symfony/Component/Messenger/Retry/ExponentialRetryStrategy.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Messenger\Retry;
 
 use Symfony\Component\Messenger\Envelope;
diff --git a/src/Symfony/Component/Messenger/Retry/RetryStrategyInterface.php b/src/Symfony/Component/Messenger/Retry/RetryStrategyInterface.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Messenger\Retry;
 
 use Symfony\Component\Messenger\Envelope;
diff --git a/src/Symfony/Component/Messenger/Stamp/RetryCountStamp.php b/src/Symfony/Component/Messenger/Stamp/RetryCountStamp.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Messenger\Stamp;
 
 /**
diff --git a/src/Symfony/Component/Messenger/Tests/Fixtures/CallbackReceiver.php b/src/Symfony/Component/Messenger/Tests/Fixtures/CallbackReceiver.php
@@ -31,17 +31,17 @@ public function stop(): void
 
     public function acknowledgeCurrentMessage(): void
     {
-        $this->acknowledgeCount++;
+        ++$this->acknowledgeCount;
     }
 
     public function rejectCurrentMessage(): void
     {
-        $this->rejectCount++;
+        ++$this->rejectCount;
     }
 
     public function retryCurrentMessage(int $delay): void
     {
-        $this->retryCount++;
+        ++$this->retryCount;
     }
 
     public function getAcknowledgeCount(): int
diff --git a/src/Symfony/Component/Messenger/Tests/Retry/ExponentialRetryStrategyTest.php b/src/Symfony/Component/Messenger/Tests/Retry/ExponentialRetryStrategyTest.php
@@ -11,9 +11,9 @@
 
 namespace Symfony\Component\Messenger\Tests\Retry;
 
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\Retry\ExponentialRetryStrategy;
-use PHPUnit\Framework\TestCase;
 use Symfony\Component\Messenger\Stamp\RetryCountStamp;
 
 class ExponentialRetryStrategyTest extends TestCase
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpExtIntegrationTest.php b/src/Symfony/Component/Messenger/Tests/Transport/AmqpExt/AmqpExtIntegrationTest.php
@@ -94,7 +94,7 @@ public function testRetryAndDelay()
                 return;
             }
 
-            $receivedMessages++;
+            ++$receivedMessages;
 
             // retry the first time
             if (1 === $receivedMessages) {
@@ -134,7 +134,7 @@ public function testItReceivesSignals()
             'DSN' => $dsn,
         ]);
 
-        $process->start(function($type, $data) {
+        $process->start(function ($type, $data) {
             dump($data);
         });
 
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Serialization/PhpSerializerTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Serialization/PhpSerializerTest.php
@@ -36,7 +36,7 @@ public function testDecodingFailsWithBadFormat()
         $serializer = new PhpSerializer();
 
         $serializer->decode([
-            'body' => '{"message": "bar"}'
+            'body' => '{"message": "bar"}',
         ]);
     }
 
@@ -48,7 +48,7 @@ public function testDecodingFailsWithBadClass()
         $serializer = new PhpSerializer();
 
         $serializer->decode([
-            'body' => 'O:47:"Symfony\Component\Messenger\Stamp\ReceivedSt0mp":0:{}'
+            'body' => 'O:47:"Symfony\Component\Messenger\Stamp\ReceivedSt0mp":0:{}',
         ]);
     }
 }
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Serialization/SerializerTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Serialization/SerializerTest.php
@@ -104,7 +104,7 @@ public function testDecodingFailsWithBadFormat()
 
         $serializer->decode([
             'body' => '{foo',
-            'headers' => ['type' => 'stdClass']
+            'headers' => ['type' => 'stdClass'],
         ]);
     }
 
@@ -116,7 +116,7 @@ public function testDecodingFailsWithBadClass()
 
         $serializer->decode([
             'body' => '{}',
-            'headers' => ['type' => 'NonExistentClass']
+            'headers' => ['type' => 'NonExistentClass'],
         ]);
     }
 }
diff --git a/src/Symfony/Component/Messenger/Tests/WorkerTest.php b/src/Symfony/Component/Messenger/Tests/WorkerTest.php
@@ -83,22 +83,22 @@ public function testDispatchCausesWorkerToRetry()
     }
 
     public function testDispatchCausesWorkerToRejectWhenNoRetry()
-   {
-       $receiver = new CallbackReceiver(function ($handler) {
-           $handler(new Envelope(new DummyMessage('Hello')));
-       });
-
-       $bus = $this->getMockBuilder(MessageBusInterface::class)->getMock();
-       $bus->method('dispatch')->willThrowException(new \InvalidArgumentException('Why not'));
-
-       $retryStrategy = $this->getMockBuilder(RetryStrategyInterface::class)->getMock();
-       $retryStrategy->expects($this->once())->method('isRetryable')->willReturn(false);
-
-       $worker = new Worker($receiver, $bus, $retryStrategy, 'receiver_id');
-       $worker->run();
-       $this->assertSame(1, $receiver->getRejectCount());
-       $this->assertSame(0, $receiver->getAcknowledgeCount());
-   }
+    {
+        $receiver = new CallbackReceiver(function ($handler) {
+            $handler(new Envelope(new DummyMessage('Hello')));
+        });
+
+        $bus = $this->getMockBuilder(MessageBusInterface::class)->getMock();
+        $bus->method('dispatch')->willThrowException(new \InvalidArgumentException('Why not'));
+
+        $retryStrategy = $this->getMockBuilder(RetryStrategyInterface::class)->getMock();
+        $retryStrategy->expects($this->once())->method('isRetryable')->willReturn(false);
+
+        $worker = new Worker($receiver, $bus, $retryStrategy, 'receiver_id');
+        $worker->run();
+        $this->assertSame(1, $receiver->getRejectCount());
+        $this->assertSame(0, $receiver->getAcknowledgeCount());
+    }
 
     public function testWorkerDoesNotSendNullMessagesToTheBus()
     {
diff --git a/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php
@@ -182,7 +182,7 @@ public function publishForRetry(\AMQPEnvelope $message, int $delay)
     {
         // increment the number of attempts
         $attemptNumber = $this->getRetryCount($message);
-        $attemptNumber++;
+        ++$attemptNumber;
 
         if ($this->shouldSetup()) {
             $this->setupDelay($delay);
@@ -199,7 +199,7 @@ public function publishForRetry(\AMQPEnvelope $message, int $delay)
 
     public function getRetryCount(\AMQPEnvelope $amqpEnvelope): int
     {
-        return ((int) $amqpEnvelope->getHeader(self::ATTEMPT_COUNT_HEADER_NAME) ?: 0);
+        return (int) $amqpEnvelope->getHeader(self::ATTEMPT_COUNT_HEADER_NAME) ?: 0;
     }
 
     private function setupDelay(int $delay)
diff --git a/src/Symfony/Component/Messenger/Transport/Receiver/ReceiverInterface.php b/src/Symfony/Component/Messenger/Transport/Receiver/ReceiverInterface.php
@@ -52,6 +52,7 @@ public function rejectCurrentMessage(): void;
      * Called when the handling of the current message failed but should be retried.
      *
      * @param int The delay to apply in milliseconds
+     *
      * @throws TransportException If there is an issue communicating with the transport
      */
     public function retryCurrentMessage(int $delay): void;

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,6 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\Messenger\Event;`
`13`	`13`
`14`		`-use Symfony\Component\EventDispatcher\Event;`
`15`		`-use Symfony\Component\Messenger\Envelope;`
`16`		`-`
`17`	`14`	`class WorkerMessageHandledEvent extends AbstractWorkerMessageEvent`
`18`	`15`	`{`
`19`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,17 +31,17 @@ public function stop(): void`
`31`	`31`
`32`	`32`	`public function acknowledgeCurrentMessage(): void`
`33`	`33`	`{`
`34`		`- $this->acknowledgeCount++;`
	`34`	`+ ++$this->acknowledgeCount;`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public function rejectCurrentMessage(): void`
`38`	`38`	`{`
`39`		`- $this->rejectCount++;`
	`39`	`+ ++$this->rejectCount;`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`public function retryCurrentMessage(int $delay): void`
`43`	`43`	`{`
`44`		`- $this->retryCount++;`
	`44`	`+ ++$this->retryCount;`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`public function getAcknowledgeCount(): int`