feature #37747 [Notifier] Make Freemobile config more flexible (fabpot)

fabpot · fabpot · commit 9db0f20c855b · 2020-08-06T07:18:22.000+02:00
This PR was merged into the 5.2-dev branch. Discussion ---------- [Notifier] Make Freemobile config more flexible | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes  | Deprecations? | no  | Tickets | n/a | License | MIT | Doc PR | n/a As Freemobile only supports French phone numbers, let's support French numbers without the international code. Commits ------- 4dfde6a [Notifier] Make Freemobile config more flexible
diff --git a/src/Symfony/Component/Notifier/Bridge/FreeMobile/FreeMobileTransport.php b/src/Symfony/Component/Notifier/Bridge/FreeMobile/FreeMobileTransport.php
@@ -37,7 +37,7 @@ public function __construct(string $login, string $password, string $phone, Http
     {
         $this->login = $login;
         $this->password = $password;
-        $this->phone = $phone;
+        $this->phone = str_replace('+33', '0', $phone);
 
         parent::__construct($client, $dispatcher);
     }
@@ -49,7 +49,7 @@ public function __toString(): string
 
     public function supports(MessageInterface $message): bool
     {
-        return $message instanceof SmsMessage && $this->phone === $message->getPhone();
+        return $message instanceof SmsMessage && $this->phone === str_replace('+33', '0', $message->getPhone());
     }
 
     protected function doSend(MessageInterface $message): SentMessage
diff --git a/src/Symfony/Component/Notifier/Bridge/FreeMobile/Tests/FreeMobileTransportTest.php b/src/Symfony/Component/Notifier/Bridge/FreeMobile/Tests/FreeMobileTransportTest.php
@@ -22,33 +22,37 @@ final class FreeMobileTransportTest extends TestCase
 {
     public function testToStringContainsProperties(): void
     {
-        $transport = $this->initTransport();
+        $transport = $this->getTransport('0611223344');
 
         $this->assertSame('freemobile://host.test?phone=0611223344', (string) $transport);
     }
 
     public function testSupportsMessageInterface(): void
     {
-        $transport = $this->initTransport();
+        $transport = $this->getTransport('0611223344');
 
         $this->assertTrue($transport->supports(new SmsMessage('0611223344', 'Hello!')));
+        $this->assertTrue($transport->supports(new SmsMessage('+33611223344', 'Hello!')));
         $this->assertFalse($transport->supports(new SmsMessage('0699887766', 'Hello!')));
         $this->assertFalse($transport->supports($this->createMock(MessageInterface::class), 'Hello!'));
+
+        $transport = $this->getTransport('+33611223344');
+
+        $this->assertTrue($transport->supports(new SmsMessage('0611223344', 'Hello!')));
+        $this->assertTrue($transport->supports(new SmsMessage('+33611223344', 'Hello!')));
     }
 
     public function testSendNonSmsMessageThrowsException(): void
     {
-        $transport = $this->initTransport();
+        $transport = $this->getTransport('0611223344');
 
         $this->expectException(LogicException::class);
 
         $transport->send(new SmsMessage('0699887766', 'Hello!'));
     }
 
-    private function initTransport(): FreeMobileTransport
+    private function getTransport(string $phone): FreeMobileTransport
     {
-        return (new FreeMobileTransport(
-            'login', 'pass', '0611223344', $this->createMock(HttpClientInterface::class)
-        ))->setHost('host.test');
+        return (new FreeMobileTransport('login', 'pass', $phone, $this->createMock(HttpClientInterface::class)))->setHost('host.test');
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function __construct(string $login, string $password, string $phone, Http`
`37`	`37`	`{`
`38`	`38`	`$this->login = $login;`
`39`	`39`	`$this->password = $password;`
`40`		`- $this->phone = $phone;`
	`40`	`+ $this->phone = str_replace('+33', '0', $phone);`
`41`	`41`
`42`	`42`	`parent::__construct($client, $dispatcher);`
`43`	`43`	`}`
`@@ -49,7 +49,7 @@ public function __toString(): string`
`49`	`49`
`50`	`50`	`public function supports(MessageInterface $message): bool`
`51`	`51`	`{`
`52`		`- return $message instanceof SmsMessage && $this->phone === $message->getPhone();`
	`52`	`+ return $message instanceof SmsMessage && $this->phone === str_replace('+33', '0', $message->getPhone());`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`protected function doSend(MessageInterface $message): SentMessage`
Original file line number	Diff line number	Diff line change
`@@ -22,33 +22,37 @@ final class FreeMobileTransportTest extends TestCase`
`22`	`22`	`{`
`23`	`23`	`public function testToStringContainsProperties(): void`
`24`	`24`	`{`
`25`		`- $transport = $this->initTransport();`
	`25`	`+ $transport = $this->getTransport('0611223344');`
`26`	`26`
`27`	`27`	`$this->assertSame('freemobile://host.test?phone=0611223344', (string) $transport);`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public function testSupportsMessageInterface(): void`
`31`	`31`	`{`
`32`		`- $transport = $this->initTransport();`
	`32`	`+ $transport = $this->getTransport('0611223344');`
`33`	`33`
`34`	`34`	`$this->assertTrue($transport->supports(new SmsMessage('0611223344', 'Hello!')));`
	`35`	`+ $this->assertTrue($transport->supports(new SmsMessage('+33611223344', 'Hello!')));`
`35`	`36`	`$this->assertFalse($transport->supports(new SmsMessage('0699887766', 'Hello!')));`
`36`	`37`	`$this->assertFalse($transport->supports($this->createMock(MessageInterface::class), 'Hello!'));`
	`38`	`+`
	`39`	`+ $transport = $this->getTransport('+33611223344');`
	`40`	`+`
	`41`	`+ $this->assertTrue($transport->supports(new SmsMessage('0611223344', 'Hello!')));`
	`42`	`+ $this->assertTrue($transport->supports(new SmsMessage('+33611223344', 'Hello!')));`
`37`	`43`	`}`
`38`	`44`
`39`	`45`	`public function testSendNonSmsMessageThrowsException(): void`
`40`	`46`	`{`
`41`		`- $transport = $this->initTransport();`
	`47`	`+ $transport = $this->getTransport('0611223344');`
`42`	`48`
`43`	`49`	`$this->expectException(LogicException::class);`
`44`	`50`
`45`	`51`	`$transport->send(new SmsMessage('0699887766', 'Hello!'));`
`46`	`52`	`}`
`47`	`53`
`48`		`- private function initTransport(): FreeMobileTransport`
	`54`	`+ private function getTransport(string $phone): FreeMobileTransport`
`49`	`55`	`{`
`50`		`- return (new FreeMobileTransport(`
`51`		`- 'login', 'pass', '0611223344', $this->createMock(HttpClientInterface::class)`
`52`		`- ))->setHost('host.test');`
	`56`	`+ return (new FreeMobileTransport('login', 'pass', $phone, $this->createMock(HttpClientInterface::class)))->setHost('host.test');`
`53`	`57`	`}`
`54`	`58`	`}`