Move "hidden defaults" to constants

sroze · sroze · commit 88594f9372b1 · 2018-05-19T13:07:15.000+01:00
diff --git a/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpReceiver.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpReceiver.php
@@ -23,6 +23,8 @@
  */
 class AmqpReceiver implements ReceiverInterface
 {
+    private const DEFAULT_LOOP_SLEEP_IN_MICRO_SECONDS = 200000;
+
     private $decoder;
     private $connection;
     private $logger;
@@ -46,7 +48,7 @@ public function receive(callable $handler): void
             if (null === $AMQPEnvelope) {
                 $handler(null);
 
-                usleep($this->connection->getConnectionConfiguration()['loop_sleep'] ?? 200000);
+                usleep($this->connection->getConnectionConfiguration()['loop_sleep'] ?? self::DEFAULT_LOOP_SLEEP_IN_MICRO_SECONDS);
                 if (\function_exists('pcntl_signal_dispatch')) {
                     pcntl_signal_dispatch();
                 }
diff --git a/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php
@@ -18,6 +18,9 @@
  */
 class Connection
 {
+    private const DEFAULT_MESSAGE_TTL_IN_MILLI_SECONDS = 10000;
+    private const DEFAULT_MAX_ATTEMPTS = 3;
+
     private $connectionConfiguration;
     private $exchangeConfiguration;
     private $queueConfiguration;
@@ -158,7 +161,7 @@ public function publishForRetry(\AMQPEnvelope $message): bool
             $this->setupRetry($retryConfiguration, $attemptNumber);
         }
 
-        $maximumAttempts = $retryConfiguration['attempts'] ?? 3;
+        $maximumAttempts = $retryConfiguration['attempts'] ?? self::DEFAULT_MAX_ATTEMPTS;
         $routingKey = str_replace('%attempt%', $attemptNumber, $retryConfiguration['routing_key_pattern']);
 
         if ($attemptNumber > $maximumAttempts) {
@@ -233,7 +236,7 @@ private function retryQueue(array $retryConfiguration, int $attemptNumber)
         $queue = $this->amqpFactory->createQueue($this->channel());
         $queue->setName(str_replace('%attempt%', $attemptNumber, $retryConfiguration['queue_name_pattern']));
         $queue->setArguments(array(
-            'x-message-ttl' => $retryConfiguration['ttl'][$attemptNumber - 1] ?? 10000, // 10 seconds by default
+            'x-message-ttl' => $retryConfiguration['ttl'][$attemptNumber - 1] ?? self::DEFAULT_MESSAGE_TTL_IN_MILLI_SECONDS,
             'x-dead-letter-exchange' => $this->exchange()->getName(),
         ));
 
