Fix: Use dedicated options array

OskarStark · OskarStark · commit 8a5330132ed7 · 2021-06-18T08:24:41.000+02:00
diff --git a/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/Action/ActionCard.php b/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/Action/ActionCard.php
@@ -21,7 +21,7 @@
  */
 final class ActionCard implements ActionInterface
 {
-    protected $options = ['@type' => 'ActionCard'];
+    private $options = [];
 
     public function name(string $name): self
     {
@@ -46,6 +46,6 @@ public function action(ActionCardCompatibleActionInterface $action): self
 
     public function toArray(): array
     {
-        return $this->options;
+        return $this->options + ['@type' => 'ActionCard'];
     }
 }
diff --git a/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/Action/HttpPostAction.php b/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/Action/HttpPostAction.php
@@ -21,7 +21,7 @@
  */
 final class HttpPostAction implements ActionCardCompatibleActionInterface
 {
-    protected $options = ['@type' => 'HttpPOST'];
+    private $options = ['@type' => 'HttpPOST'];
 
     public function name(string $name): self
     {
diff --git a/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/Action/Input/DateInput.php b/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/Action/Input/DateInput.php
@@ -19,6 +19,8 @@
  */
 final class DateInput extends AbstractInput
 {
+    private $options = [];
+
     public function includeTime(bool $includeTime): self
     {
         $this->options['includeTime'] = $includeTime;
@@ -30,6 +32,6 @@ public function toArray(): array
     {
         $this->options['@type'] = 'DateInput';
 
-        return parent::toArray();
+        return parent::toArray() + $this->options;
     }
 }
diff --git a/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/Action/Input/MultiChoiceInput.php b/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/Action/Input/MultiChoiceInput.php
@@ -26,6 +26,8 @@ final class MultiChoiceInput extends AbstractInput
         'normal',
     ];
 
+    private $options = [];
+
     public function choice(string $display, string $value): self
     {
         $this->options['choices'][] = ['display' => $display, 'value' => $value];
@@ -55,6 +57,6 @@ public function toArray(): array
     {
         $this->options['@type'] = 'MultichoiceInput';
 
-        return parent::toArray();
+        return parent::toArray() + $this->options;
     }
 }
diff --git a/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/Action/Input/TextInput.php b/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/Action/Input/TextInput.php
@@ -19,6 +19,8 @@
  */
 final class TextInput extends AbstractInput
 {
+    private $options = [];
+
     public function isMultiline(bool $multiline): self
     {
         $this->options['isMultiline'] = $multiline;
@@ -37,6 +39,6 @@ public function toArray(): array
     {
         $this->options['@type'] = 'TextInput';
 
-        return parent::toArray();
+        return parent::toArray() + $this->options;
     }
 }
diff --git a/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/Action/InvokeAddInCommandAction.php b/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/Action/InvokeAddInCommandAction.php
@@ -19,7 +19,7 @@
  */
 final class InvokeAddInCommandAction implements ActionInterface
 {
-    protected $options = ['@type' => 'InvokeAddInCommand'];
+    private $options = [];
 
     public function name(string $name): self
     {
@@ -51,6 +51,6 @@ public function initializationContext(array $context): self
 
     public function toArray(): array
     {
-        return $this->options;
+        return $this->options + ['@type' => 'InvokeAddInCommand'];
     }
 }
diff --git a/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/Action/OpenUriAction.php b/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/Action/OpenUriAction.php
@@ -28,7 +28,7 @@ final class OpenUriAction implements ActionCardCompatibleActionInterface
         'windows',
     ];
 
-    protected $options = ['@type' => 'OpenUri'];
+    private $options = [];
 
     public function name(string $name): self
     {
@@ -50,6 +50,6 @@ public function target(string $uri, string $os = 'default'): self
 
     public function toArray(): array
     {
-        return $this->options;
+        return $this->options + ['@type' => 'OpenUri'];
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`*/`
`22`	`22`	`final class ActionCard implements ActionInterface`
`23`	`23`	`{`
`24`		`- protected $options = ['@type' => 'ActionCard'];`
	`24`	`+ private $options = [];`
`25`	`25`
`26`	`26`	`public function name(string $name): self`
`27`	`27`	`{`
`@@ -46,6 +46,6 @@ public function action(ActionCardCompatibleActionInterface $action): self`
`46`	`46`
`47`	`47`	`public function toArray(): array`
`48`	`48`	`{`
`49`		`- return $this->options;`
	`49`	`+ return $this->options + ['@type' => 'ActionCard'];`
`50`	`50`	`}`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@`
`19`	`19`	`*/`
`20`	`20`	`final class DateInput extends AbstractInput`
`21`	`21`	`{`
	`22`	`+ private $options = [];`
	`23`	`+`
`22`	`24`	`public function includeTime(bool $includeTime): self`
`23`	`25`	`{`
`24`	`26`	`$this->options['includeTime'] = $includeTime;`
`@@ -30,6 +32,6 @@ public function toArray(): array`
`30`	`32`	`{`
`31`	`33`	`$this->options['@type'] = 'DateInput';`
`32`	`34`
`33`		`- return parent::toArray();`
	`35`	`+ return parent::toArray() + $this->options;`
`34`	`36`	`}`
`35`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@ final class MultiChoiceInput extends AbstractInput`
`26`	`26`	`'normal',`
`27`	`27`	`];`
`28`	`28`
	`29`	`+ private $options = [];`
	`30`	`+`
`29`	`31`	`public function choice(string $display, string $value): self`
`30`	`32`	`{`
`31`	`33`	`$this->options['choices'][] = ['display' => $display, 'value' => $value];`
`@@ -55,6 +57,6 @@ public function toArray(): array`
`55`	`57`	`{`
`56`	`58`	`$this->options['@type'] = 'MultichoiceInput';`
`57`	`59`
`58`		`- return parent::toArray();`
	`60`	`+ return parent::toArray() + $this->options;`
`59`	`61`	`}`
`60`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`*/`
`20`	`20`	`final class InvokeAddInCommandAction implements ActionInterface`
`21`	`21`	`{`
`22`		`- protected $options = ['@type' => 'InvokeAddInCommand'];`
	`22`	`+ private $options = [];`
`23`	`23`
`24`	`24`	`public function name(string $name): self`
`25`	`25`	`{`
`@@ -51,6 +51,6 @@ public function initializationContext(array $context): self`
`51`	`51`
`52`	`52`	`public function toArray(): array`
`53`	`53`	`{`
`54`		`- return $this->options;`
	`54`	`+ return $this->options + ['@type' => 'InvokeAddInCommand'];`
`55`	`55`	`}`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ final class OpenUriAction implements ActionCardCompatibleActionInterface`
`28`	`28`	`'windows',`
`29`	`29`	`];`
`30`	`30`
`31`		`- protected $options = ['@type' => 'OpenUri'];`
	`31`	`+ private $options = [];`
`32`	`32`
`33`	`33`	`public function name(string $name): self`
`34`	`34`	`{`
`@@ -50,6 +50,6 @@ public function target(string $uri, string $os = 'default'): self`
`50`	`50`
`51`	`51`	`public function toArray(): array`
`52`	`52`	`{`
`53`		`- return $this->options;`
	`53`	`+ return $this->options + ['@type' => 'OpenUri'];`
`54`	`54`	`}`
`55`	`55`	`}`