From 87a7058f6513b4642dd97c2b24b7ca818b388e57 Mon Sep 17 00:00:00 2001 From: Oskar Stark Date: Thu, 8 Dec 2022 14:58:23 +0100 Subject: [PATCH] [Notifier] Remove dependency `symfony/uid` on Notifier bridges --- .../ContactEveryone/Tests/ContactEveryoneTransportTest.php | 3 +-- .../Component/Notifier/Bridge/ContactEveryone/composer.json | 3 --- .../Notifier/Bridge/Esendex/Tests/EsendexTransportTest.php | 3 +-- src/Symfony/Component/Notifier/Bridge/Esendex/composer.json | 3 --- src/Symfony/Component/Notifier/Bridge/OrangeSms/composer.json | 3 --- .../Component/Notifier/Bridge/SmsFactor/SmsFactorTransport.php | 3 +-- src/Symfony/Component/Notifier/Bridge/SmsFactor/composer.json | 3 +-- 7 files changed, 4 insertions(+), 17 deletions(-) diff --git a/src/Symfony/Component/Notifier/Bridge/ContactEveryone/Tests/ContactEveryoneTransportTest.php b/src/Symfony/Component/Notifier/Bridge/ContactEveryone/Tests/ContactEveryoneTransportTest.php index fef60a4c1c0d9..97194efdd87be 100644 --- a/src/Symfony/Component/Notifier/Bridge/ContactEveryone/Tests/ContactEveryoneTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/ContactEveryone/Tests/ContactEveryoneTransportTest.php @@ -18,7 +18,6 @@ use Symfony\Component\Notifier\Message\MessageInterface; use Symfony\Component\Notifier\Message\SmsMessage; use Symfony\Component\Notifier\Test\TransportTestCase; -use Symfony\Component\Uid\Uuid; use Symfony\Contracts\HttpClient\HttpClientInterface; use Symfony\Contracts\HttpClient\ResponseInterface; @@ -47,7 +46,7 @@ public function unsupportedMessagesProvider(): iterable public function testSendSuccessfully() { - $messageId = Uuid::v4()->toRfc4122(); + $messageId = bin2hex(random_bytes(7)); $response = $this->createMock(ResponseInterface::class); $response->method('getStatusCode')->willReturn(200); $response->method('getContent')->willReturn($messageId); diff --git a/src/Symfony/Component/Notifier/Bridge/ContactEveryone/composer.json b/src/Symfony/Component/Notifier/Bridge/ContactEveryone/composer.json index 8f765ab71f1f8..f47e713dcc63f 100644 --- a/src/Symfony/Component/Notifier/Bridge/ContactEveryone/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/ContactEveryone/composer.json @@ -20,9 +20,6 @@ "symfony/http-client": "^5.4|^6.0", "symfony/notifier": "^6.2" }, - "require-dev": { - "symfony/uid": "^5.4|^6.0" - }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\ContactEveryone\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/Notifier/Bridge/Esendex/Tests/EsendexTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Esendex/Tests/EsendexTransportTest.php index 4d197428815d7..cde836ae55607 100644 --- a/src/Symfony/Component/Notifier/Bridge/Esendex/Tests/EsendexTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Esendex/Tests/EsendexTransportTest.php @@ -18,7 +18,6 @@ use Symfony\Component\Notifier\Message\MessageInterface; use Symfony\Component\Notifier\Message\SmsMessage; use Symfony\Component\Notifier\Test\TransportTestCase; -use Symfony\Component\Uid\Uuid; use Symfony\Contracts\HttpClient\HttpClientInterface; use Symfony\Contracts\HttpClient\ResponseInterface; @@ -88,7 +87,7 @@ public function testSendWithErrorResponseContainingDetailsThrowsTransportExcepti public function testSendWithSuccessfulResponseDispatchesMessageEvent() { - $messageId = Uuid::v4()->toRfc4122(); + $messageId = bin2hex(random_bytes(7)); $response = $this->createMock(ResponseInterface::class); $response->expects($this->exactly(2)) ->method('getStatusCode') diff --git a/src/Symfony/Component/Notifier/Bridge/Esendex/composer.json b/src/Symfony/Component/Notifier/Bridge/Esendex/composer.json index 63422b2d5d40c..e6ea519dcfa87 100644 --- a/src/Symfony/Component/Notifier/Bridge/Esendex/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/Esendex/composer.json @@ -20,9 +20,6 @@ "symfony/http-client": "^5.4|^6.0", "symfony/notifier": "^6.2" }, - "require-dev": { - "symfony/uid": "^5.4|^6.0" - }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\Esendex\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/Notifier/Bridge/OrangeSms/composer.json b/src/Symfony/Component/Notifier/Bridge/OrangeSms/composer.json index 72f9dffc56bac..ee2fd7443d254 100644 --- a/src/Symfony/Component/Notifier/Bridge/OrangeSms/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/OrangeSms/composer.json @@ -20,9 +20,6 @@ "symfony/http-client": "^5.4|^6.0", "symfony/notifier": "^6.2" }, - "require-dev": { - "symfony/uid": "^5.4|^6.0" - }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\OrangeSms\\": "" }, "exclude-from-classmap": [ diff --git a/src/Symfony/Component/Notifier/Bridge/SmsFactor/SmsFactorTransport.php b/src/Symfony/Component/Notifier/Bridge/SmsFactor/SmsFactorTransport.php index 494ac96ad8f28..0032d3c9510f8 100644 --- a/src/Symfony/Component/Notifier/Bridge/SmsFactor/SmsFactorTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/SmsFactor/SmsFactorTransport.php @@ -17,7 +17,6 @@ use Symfony\Component\Notifier\Message\SentMessage; use Symfony\Component\Notifier\Message\SmsMessage; use Symfony\Component\Notifier\Transport\AbstractTransport; -use Symfony\Component\Uid\Uuid; use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface; use Symfony\Contracts\HttpClient\HttpClientInterface; @@ -67,7 +66,7 @@ protected function doSend(MessageInterface $message): SentMessage throw new UnsupportedMessageTypeException(__CLASS__, SmsMessage::class, $message); } - $messageId = Uuid::v4()->toRfc4122(); + $messageId = bin2hex(random_bytes(7));; $query = [ 'to' => $message->getPhone(), 'text' => $message->getSubject(), diff --git a/src/Symfony/Component/Notifier/Bridge/SmsFactor/composer.json b/src/Symfony/Component/Notifier/Bridge/SmsFactor/composer.json index 6a7b8d6d09490..04ae90a40d137 100644 --- a/src/Symfony/Component/Notifier/Bridge/SmsFactor/composer.json +++ b/src/Symfony/Component/Notifier/Bridge/SmsFactor/composer.json @@ -18,8 +18,7 @@ "require": { "php": ">=8.1", "symfony/http-client": "^5.4|^6.0", - "symfony/notifier": "^6.2", - "symfony/uid": "^5.4|^6.0" + "symfony/notifier": "^6.2" }, "autoload": { "psr-4": { "Symfony\\Component\\Notifier\\Bridge\\SmsFactor\\": "" },