Fixing bug where attempts never incremented

weaverryan · weaverryan · commit bf338e7e1151 · 2019-03-17T10:16:47.000-04:00
diff --git a/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php
@@ -191,20 +191,21 @@ public function publishForRetry(\AMQPEnvelope $message)
 
         // increment the number of attempts
         $attemptNumber = ((int) $message->getHeader(self::ATTEMPT_COUNT_HEADER_NAME) ?: 0);
-        ++$attemptNumber;
+        $attemptNumber++;
 
         // only allow the attemptNumber to go as high as the configure
         // this will avoid unnecessary queues from being created
         $configuredRetryTtlCount = isset($retryConfiguration['ttl']) ? \count($retryConfiguration['ttl']) - 1 : 0;
-        if ($attemptNumber > $configuredRetryTtlCount) {
-            $attemptNumber = $configuredRetryTtlCount;
+        $attemptNumberForTtl = $attemptNumber;
+        if ($attemptNumberForTtl > $configuredRetryTtlCount) {
+            $attemptNumberForTtl = $configuredRetryTtlCount;
         }
 
         if ($this->shouldSetup()) {
-            $this->setupRetry($retryConfiguration, $attemptNumber);
+            $this->setupRetry($retryConfiguration, $attemptNumberForTtl);
         }
 
-        $routingKey = str_replace('%attempt%', $attemptNumber, $retryConfiguration['routing_key_pattern']);
+        $routingKey = str_replace('%attempt%', $attemptNumberForTtl, $retryConfiguration['routing_key_pattern']);
         $flags = $this->queueConfiguration['flags'] ?? AMQP_NOPARAM;
         $headers = $message->getHeaders();
         $headers[self::ATTEMPT_COUNT_HEADER_NAME] = $attemptNumber;
