[Notifier] [Free Mobile] Could not use custom host in DSN

OskarStark · OskarStark · commit 105c6f43222c · 2020-12-15T11:45:58.000+01:00
diff --git a/src/Symfony/Component/Notifier/Bridge/FreeMobile/FreeMobileTransport.php b/src/Symfony/Component/Notifier/Bridge/FreeMobile/FreeMobileTransport.php
@@ -26,7 +26,7 @@
  */
 final class FreeMobileTransport extends AbstractTransport
 {
-    protected const HOST = 'https://smsapi.free-mobile.fr/sendmsg';
+    protected const HOST = 'smsapi.free-mobile.fr/sendmsg';
 
     private $login;
     private $password;
diff --git a/src/Symfony/Component/Notifier/Bridge/FreeMobile/FreeMobileTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/FreeMobile/FreeMobileTransportFactory.php
@@ -43,7 +43,10 @@ public function create(Dsn $dsn): TransportInterface
             throw new IncompleteDsnException('Missing phone.', $dsn->getOriginalDsn());
         }
 
-        return new FreeMobileTransport($login, $password, $phone, $this->client, $this->dispatcher);
+        $host = 'default' === $dsn->getHost() ? null : $dsn->getHost();
+        $port = $dsn->getPort();
+
+        return (new FreeMobileTransport($login, $password, $phone, $this->client, $this->dispatcher))->setHost($host)->setPort($port);
     }
 
     protected function getSupportedSchemes(): array
diff --git a/src/Symfony/Component/Notifier/Bridge/FreeMobile/Tests/FreeMobileTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/FreeMobile/Tests/FreeMobileTransportFactoryTest.php
@@ -23,9 +23,7 @@ public function testCreateWithDsn()
     {
         $factory = $this->createFactory();
 
-        $dsn = 'freemobile://login:pass@default?phone=0611223344';
-        $transport = $factory->create(Dsn::fromString($dsn));
-        $transport->setHost('host.test');
+        $transport = $factory->create(Dsn::fromString('freemobile://login:pass@host.test?phone=0611223344'));
 
         $this->assertSame('freemobile://host.test?phone=0611223344', (string) $transport);
     }

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`*/`
`27`	`27`	`final class FreeMobileTransport extends AbstractTransport`
`28`	`28`	`{`
`29`		`- protected const HOST = 'https://smsapi.free-mobile.fr/sendmsg';`
	`29`	`+ protected const HOST = 'smsapi.free-mobile.fr/sendmsg';`
`30`	`30`
`31`	`31`	`private $login;`
`32`	`32`	`private $password;`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,10 @@ public function create(Dsn $dsn): TransportInterface`
`43`	`43`	`throw new IncompleteDsnException('Missing phone.', $dsn->getOriginalDsn());`
`44`	`44`	`}`
`45`	`45`
`46`		`- return new FreeMobileTransport($login, $password, $phone, $this->client, $this->dispatcher);`
	`46`	`+ $host = 'default' === $dsn->getHost() ? null : $dsn->getHost();`
	`47`	`+ $port = $dsn->getPort();`
	`48`	`+`
	`49`	`+ return (new FreeMobileTransport($login, $password, $phone, $this->client, $this->dispatcher))->setHost($host)->setPort($port);`
`47`	`50`	`}`
`48`	`51`
`49`	`52`	`protected function getSupportedSchemes(): array`
Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,7 @@ public function testCreateWithDsn()`
`23`	`23`	`{`
`24`	`24`	`$factory = $this->createFactory();`
`25`	`25`
`26`		`- $dsn = 'freemobile://login:pass@default?phone=0611223344';`
`27`		`- $transport = $factory->create(Dsn::fromString($dsn));`
`28`		`- $transport->setHost('host.test');`
	`26`	`+ $transport = $factory->create(Dsn::fromString('freemobile://login:pass@host.test?phone=0611223344'));`
`29`	`27`
`30`	`28`	`$this->assertSame('freemobile://host.test?phone=0611223344', (string) $transport);`
`31`	`29`	`}`