bug #50473 [Notifier] Fix ContactEveryoneOptions (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit f2df30b82cf8 · 2023-05-30T16:52:34.000+02:00
This PR was merged into the 6.3 branch. Discussion ---------- [Notifier] Fix ContactEveryoneOptions | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Thanks to `@franckranaivo` in #50349 (comment) Commits ------- 8dd9d93 [Notifier] Fix ContactEveryoneOptions
diff --git a/src/Symfony/Component/Notifier/Bridge/ContactEveryone/ContactEveryoneOptions.php b/src/Symfony/Component/Notifier/Bridge/ContactEveryone/ContactEveryoneOptions.php
@@ -15,6 +15,8 @@
 
 /**
  * @author gnito-org <https://github.com/gnito-org>
+ *
+ * @see https://ceo-be.multimediabs.com/attachments/hosted/lightApiManualsFR
  */
 final class ContactEveryoneOptions implements MessageOptionsInterface
 {
@@ -35,7 +37,7 @@ public function getRecipientId(): ?string
      */
     public function diffusionName(string $diffusionName): static
     {
-        $this->options['diffusion_name'] = $diffusionName;
+        $this->options['diffusionname'] = $diffusionName;
 
         return $this;
     }
@@ -50,6 +52,28 @@ public function category(string $category): static
         return $this;
     }
 
+    /**
+     * @param 'fr_FR'|'en_GB' $locale
+     *
+     * @return $this
+     */
+    public function locale(string $locale): static
+    {
+        $this->options['locale'] = $locale;
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    public function unicode(bool $unicode): static
+    {
+        $this->options['xcharset'] = $unicode ? 'true' : 'false';
+
+        return $this;
+    }
+
     public function toArray(): array
     {
         return $this->options;
diff --git a/src/Symfony/Component/Notifier/Bridge/ContactEveryone/ContactEveryoneTransport.php b/src/Symfony/Component/Notifier/Bridge/ContactEveryone/ContactEveryoneTransport.php
@@ -73,7 +73,9 @@ protected function doSend(MessageInterface $message): SentMessage
         }
 
         $options = $message->getOptions()?->toArray() ?? [];
-        $options['xcharset'] = 'true';
+        $options['category'] ??= $this->category;
+        $options['diffusionname'] ??= $this->diffusionName;
+        $options['xcharset'] ??= 'true';
         $options['token'] = $this->token;
         $options['to'] = $message->getPhone();
         $options['msg'] = $message->getSubject();
diff --git a/src/Symfony/Component/Notifier/Bridge/ContactEveryone/Tests/ContactEveryoneOptionsTest.php b/src/Symfony/Component/Notifier/Bridge/ContactEveryone/Tests/ContactEveryoneOptionsTest.php
@@ -24,7 +24,7 @@ public function testContactEveryoneOptions()
 
         self::assertSame([
             'category' => 'test_category',
-            'diffusion_name' => 'test_diffusion_name',
+            'diffusionname' => 'test_diffusion_name',
         ], $contactEveryoneOptions->toArray());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public function testContactEveryoneOptions()`
`24`	`24`
`25`	`25`	`self::assertSame([`
`26`	`26`	`'category' => 'test_category',`
`27`		`- 'diffusion_name' => 'test_diffusion_name',`
	`27`	`+ 'diffusionname' => 'test_diffusion_name',`
`28`	`28`	`], $contactEveryoneOptions->toArray());`
`29`	`29`	`}`
`30`	`30`	`}`