minor #48549 [Notifier] Remove dependency symfony/uid on Notifier bridges (OskarStark)

fabpot · fabpot · commit 54240548a039 · 2022-12-09T08:10:28.000+01:00
This PR was merged into the 6.3 branch. Discussion ---------- [Notifier] Remove dependency `symfony/uid` on Notifier bridges | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? | no | New feature? | yes | Deprecations? | no | Tickets | n/a | License | MIT | Doc PR | n/a We are using it already here: https://github.com/symfony/symfony/blob/f3a9a0e2f22bd67074b596493a7e94779eb356e3/src/Symfony/Component/Notifier/Bridge/Isendpro/IsendproTransport.php#L59-L61 Commits ------- 87a7058 [Notifier] Remove dependency `symfony/uid` on Notifier bridges
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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\\": "" },
