Update src/Symfony/Component/Messenger/Transport/SqsExt/Connection.php

jderusse · deguif · jderusse · commit 8907adcdf265 · 2019-08-07T14:01:30.000+02:00
Co-Authored-By: François-Xavier de Guillebon &lt;deguif@gmail.com&gt;
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/SqsExt/SqsExtIntegrationTest.php b/src/Symfony/Component/Messenger/Tests/Transport/SqsExt/SqsExtIntegrationTest.php
@@ -42,27 +42,6 @@ public function testConnectionSendAndGet()
         $this->assertEquals(['type' => DummyMessage::class], $encoded['headers']);
     }
 
-    public function testGetTheFirstAvailableMessage()
-    {
-        $this->connection->send('{"message": "Hi1"}', ['type' => DummyMessage::class]);
-        $this->connection->send('{"message": "Hi2"}', ['type' => DummyMessage::class]);
-        $wait = 0;
-        while ((null === $encoded1 = $this->connection->get()) && $wait++ < 50) {
-            usleep(5000);
-        }
-        $this->assertEquals(['type' => DummyMessage::class], $encoded1['headers']);
-
-        $wait = 0;
-        while ((null === $encoded2 = $this->connection->get()) && $wait++ < 50) {
-            usleep(5000);
-        }
-        $this->assertEquals(['type' => DummyMessage::class], $encoded2['headers']);
-
-        $messages = [$encoded2['body'], $encoded2['body']];
-        sort($messages);
-        $this->assertEquals(['{"message": "Hi1"}', '{"message": "Hi2"}'], $messages);
-    }
-
     private function clearSqs()
     {
         $this->connection->requeuePrefetchedMessages();
diff --git a/src/Symfony/Component/Messenger/Transport/SqsExt/Connection.php b/src/Symfony/Component/Messenger/Transport/SqsExt/Connection.php
@@ -74,7 +74,7 @@ public function __construct(array $configuration, HttpClientInterface $client =
      * * buffer_size: number of messages to prefetch (Default: 9)
      * * wait_time: long polling duration in seconds (Default: 20)
      * * visibility_timeout: amount of seconds the message won't be visible
-     * * auto_setup: Whether the table should be created automatically during send / get (Default: true)
+     * * auto_setup: Whether the queue should be created automatically during send / get (Default: true)
      */
     public static function fromDsn(string $dsn, array $options = [], HttpClientInterface $client = null): self
     {
@@ -240,7 +240,7 @@ public function requeue(string $id, int $delay = 0): void
 
     public function requeuePrefetchedMessages(): void
     {
-        if ($this->currentResponse !== null) {
+        if (null !== $this->currentResponse) {
             $this->currentResponse->cancel();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public function __construct(array $configuration, HttpClientInterface $client =`
`74`	`74`	`* * buffer_size: number of messages to prefetch (Default: 9)`
`75`	`75`	`* * wait_time: long polling duration in seconds (Default: 20)`
`76`	`76`	`* * visibility_timeout: amount of seconds the message won't be visible`
`77`		`- * * auto_setup: Whether the table should be created automatically during send / get (Default: true)`
	`77`	`+ * * auto_setup: Whether the queue should be created automatically during send / get (Default: true)`
`78`	`78`	`*/`
`79`	`79`	`public static function fromDsn(string $dsn, array $options = [], HttpClientInterface $client = null): self`
`80`	`80`	`{`
`@@ -240,7 +240,7 @@ public function requeue(string $id, int $delay = 0): void`
`240`	`240`
`241`	`241`	`public function requeuePrefetchedMessages(): void`
`242`	`242`	`{`
`243`		`- if ($this->currentResponse !== null) {`
	`243`	`+ if (null !== $this->currentResponse) {`
`244`	`244`	`$this->currentResponse->cancel();`
`245`	`245`	`}`
`246`	`246`