Fix compatibility with symfony/notifier 5.2

GromNaN · GromNaN · commit b4fdfc8cf800 · 2020-07-31T18:45:52.000+02:00
diff --git a/src/Symfony/Component/Notifier/Bridge/GoogleChat/GoogleChatTransport.php b/src/Symfony/Component/Notifier/Bridge/GoogleChat/GoogleChatTransport.php
@@ -16,6 +16,7 @@
 use Symfony\Component\Notifier\Exception\TransportException;
 use Symfony\Component\Notifier\Message\ChatMessage;
 use Symfony\Component\Notifier\Message\MessageInterface;
+use Symfony\Component\Notifier\Message\SentMessage;
 use Symfony\Component\Notifier\Transport\AbstractTransport;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
@@ -89,7 +90,7 @@ public function supports(MessageInterface $message): bool
     /**
      * @see https://developers.google.com/hangouts/chat/how-tos/webhooks
      */
-    protected function doSend(MessageInterface $message): void
+    protected function doSend(MessageInterface $message): SentMessage
     {
         if (!$message instanceof ChatMessage) {
             throw new LogicException(sprintf('The "%s" transport only supports instances of "%s" (instance of "%s" given).', __CLASS__, ChatMessage::class, \get_class($message)));
@@ -138,5 +139,10 @@ protected function doSend(MessageInterface $message): void
         if (!\array_key_exists('name', $result)) {
             throw new TransportException(sprintf('Unable to post the Google Chat message: "%s".', $response->getContent(false)), $response);
         }
+
+        $sentMessage = new SentMessage($message, (string) $this);
+        $sentMessage->setMessageId($result['name']);
+
+        return $sentMessage;
     }
 }
diff --git a/src/Symfony/Component/Notifier/Bridge/GoogleChat/Tests/GoogleChatTransportTest.php b/src/Symfony/Component/Notifier/Bridge/GoogleChat/Tests/GoogleChatTransportTest.php
@@ -29,9 +29,9 @@ class GoogleChatTransportTest extends TestCase
     public function testToStringContainsProperties(): void
     {
         $transport = new GoogleChatTransport('My-Space', 'theAccessKey', 'theAccessToken=', $this->createMock(HttpClientInterface::class));
-        $transport->setHost('testHost');
+        $transport->setHost(null);
 
-        $this->assertSame('googlechat://theAccessKey:theAccessToken%3D@testHost/My-Space', (string) $transport);
+        $this->assertSame('googlechat://theAccessKey:theAccessToken%3D@chat.googleapis.com/My-Space', (string) $transport);
     }
 
     public function testSupportsChatMessage(): void
@@ -71,7 +71,9 @@ public function testSendWithEmptyArrayResponseThrows(): void
 
         $transport = new GoogleChatTransport('My-Space', 'theAccessKey', 'theAccessToken=', $client);
 
-        $transport->send(new ChatMessage('testMessage'));
+        $sentMessage = $transport->send(new ChatMessage('testMessage'));
+
+        $this->assertSame('spaces/My-Space/messages/abcdefg.hijklmno', $sentMessage->getMessageId());
     }
 
     public function testSendWithErrorResponseThrows(): void
@@ -93,7 +95,9 @@ public function testSendWithErrorResponseThrows(): void
 
         $transport = new GoogleChatTransport('My-Space', 'theAccessKey', 'theAccessToken=', $client);
 
-        $transport->send(new ChatMessage('testMessage'));
+        $sentMessage = $transport->send(new ChatMessage('testMessage'));
+
+        $this->assertSame('spaces/My-Space/messages/abcdefg.hijklmno', $sentMessage->getMessageId());
     }
 
     public function testSendWithOptions(): void
@@ -123,7 +127,9 @@ public function testSendWithOptions(): void
         $transport = new GoogleChatTransport('My-Space', 'theAccessKey', 'theAccessToken=', $client);
         $transport->setThreadKey('My-Thread');
 
-        $transport->send(new ChatMessage('testMessage'));
+        $sentMessage = $transport->send(new ChatMessage('testMessage'));
+
+        $this->assertSame('spaces/My-Space/messages/abcdefg.hijklmno', $sentMessage->getMessageId());
     }
 
     public function testSendWithNotification(): void
@@ -153,7 +159,9 @@ public function testSendWithNotification(): void
 
         $transport = new GoogleChatTransport('My-Space', 'theAccessKey', 'theAccessToken=', $client);
 
-        $transport->send($chatMessage);
+        $sentMessage = $transport->send($chatMessage);
+
+        $this->assertSame('spaces/My-Space/messages/abcdefg.hijklmno', $sentMessage->getMessageId());
     }
 
     public function testSendWithInvalidOptions(): void
@@ -196,6 +204,8 @@ public function testSendWith200ResponseButNotOk(): void
 
         $transport = new GoogleChatTransport('My-Space', 'theAccessKey', 'theAccessToken=', $client);
 
-        $transport->send(new ChatMessage('testMessage'));
+        $sentMessage = $transport->send(new ChatMessage('testMessage'));
+
+        $this->assertSame('spaces/My-Space/messages/abcdefg.hijklmno', $sentMessage->getMessageId());
     }
 }
