Fix tests.

OskarStark · OskarStark · commit 64fcfd07e6bf · 2021-01-07T11:05:12.000+01:00
diff --git a/src/Symfony/Component/Notifier/Bridge/GatewayApi/GatewayApiTransport.php b/src/Symfony/Component/Notifier/Bridge/GatewayApi/GatewayApiTransport.php
@@ -70,7 +70,7 @@ protected function doSend(MessageInterface $message): SentMessage
             throw new TransportException(sprintf('Unable to send the SMS: error %d.', $statusCode), $response);
         }
 
-        $content = $response->toArray();
+        $content = $response->toArray(false);
 
         $sentMessage = new SentMessage($message, (string) $this);
         $sentMessage->setMessageId((string) $content['ids'][0]);
diff --git a/src/Symfony/Component/Notifier/Bridge/GatewayApi/GatewayApiTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/GatewayApi/GatewayApiTransportFactory.php
@@ -32,7 +32,7 @@ public function create(Dsn $dsn): TransportInterface
             throw new UnsupportedSchemeException($dsn, 'gatewayapi', $this->getSupportedSchemes());
         }
 
-        $authToken = $dsn->getUser();
+        $authToken = $this->getUser($dsn);
         $from = $dsn->getRequiredOption('from');
         $host = 'default' === $dsn->getHost() ? null : $dsn->getHost();
         $port = $dsn->getPort();
diff --git a/src/Symfony/Component/Notifier/Bridge/GatewayApi/Tests/GatewayApiTransportTest.php b/src/Symfony/Component/Notifier/Bridge/GatewayApi/Tests/GatewayApiTransportTest.php
@@ -29,7 +29,7 @@ public function createTransport(?HttpClientInterface $client = null): TransportI
 
     public function toStringProvider(): iterable
     {
-        yield ['gatewayapi://host.test?from=Symfony', $this->createTransport()];
+        yield ['gatewayapi://gatewayapi.com?from=Symfony', $this->createTransport()];
     }
 
     public function supportedMessagesProvider(): iterable
@@ -50,15 +50,16 @@ public function testSend()
             ->method('getStatusCode')
             ->willReturn(200);
         $response->expects($this->once())
-            ->method('toArray')
-            ->willReturn(['content' => ['ids' => [42]]]);
+            ->method('getContent')
+            ->willReturn(json_encode(['content' => ['ids' => [42]]]));
 
         $client = new MockHttpClient(static function () use ($response): ResponseInterface {
             return $response;
         });
 
-        $transport = $this->createTransport($client);
         $message = new SmsMessage('3333333333', 'Hello!');
+
+        $transport = $this->createTransport($client);
         $sentMessage = $transport->send($message);
 
         $this->assertInstanceOf(SentMessage::class, $sentMessage);

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ protected function doSend(MessageInterface $message): SentMessage`
`70`	`70`	`throw new TransportException(sprintf('Unable to send the SMS: error %d.', $statusCode), $response);`
`71`	`71`	`}`
`72`	`72`
`73`		`- $content = $response->toArray();`
	`73`	`+ $content = $response->toArray(false);`
`74`	`74`
`75`	`75`	`$sentMessage = new SentMessage($message, (string) $this);`
`76`	`76`	`$sentMessage->setMessageId((string) $content['ids'][0]);`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function create(Dsn $dsn): TransportInterface`
`32`	`32`	`throw new UnsupportedSchemeException($dsn, 'gatewayapi', $this->getSupportedSchemes());`
`33`	`33`	`}`
`34`	`34`
`35`		`- $authToken = $dsn->getUser();`
	`35`	`+ $authToken = $this->getUser($dsn);`
`36`	`36`	`$from = $dsn->getRequiredOption('from');`
`37`	`37`	`$host = 'default' === $dsn->getHost() ? null : $dsn->getHost();`
`38`	`38`	`$port = $dsn->getPort();`