Remove deprecated code from SenderInterface

Author: Rafikooo

src/Component/Sender/Sender.php

@@ -46,9 +46,9 @@ public function send(
         array $data = [],
         array $attachments = [],
         array $replyTo = [],
+        array $ccRecipients = [],
+        array $bccRecipients = [],
     ): void {
-        $arguments = func_get_args();
-
         Assert::allStringNotEmpty($recipients);
 
         $email = $this->provider->getEmail($code);
@@ -65,12 +65,7 @@ public function send(
 
         $renderedEmail = $this->rendererAdapter->render($email, $data);
 
-        if (count($arguments) > 5 && $this->senderAdapter instanceof CcAwareAdapterInterface) {
-            /** @var array<string> $ccRecipients */
-            $ccRecipients = $arguments[5] ?? [];
-            /** @var array<string> $bccRecipients */
-            $bccRecipients = $arguments[6] ?? [];
-
+        if ($this->senderAdapter instanceof CcAwareAdapterInterface) {
             $this->senderAdapter->sendWithCC(
                 $recipients,
                 $senderAddress,

src/Component/Sender/SenderInterface.php

@@ -16,8 +16,6 @@
 interface SenderInterface
 {
     /**
-     * @deprecated using this method without 2 last arguments ($ccRecipients and $bccRecipients) is deprecated since 1.8 and won't be possible since 2.0
-     *
      * @param string[]|null[] $recipients A list of email addresses to receive the message. Providing null or empty string in the list of recipients is deprecated and will be removed in SyliusMailerBundle 2.0
      * @param string[] $attachments A list of file paths to attach to the message.
      * @param string[] $replyTo A list of email addresses to set as the Reply-To address for the message.
@@ -30,5 +28,7 @@ public function send(
         array $data = [],
         array $attachments = [],
         array $replyTo = [],
+        array $ccRecipients = [],
+        array $bccRecipients = [],
     ): void;
 }

src/Component/spec/Sender/SenderSpec.php

@@ -21,26 +21,21 @@
 use Sylius\Component\Mailer\Provider\EmailProviderInterface;
 use Sylius\Component\Mailer\Renderer\Adapter\AdapterInterface as RendererAdapterInterface;
 use Sylius\Component\Mailer\Renderer\RenderedEmail;
-use Sylius\Component\Mailer\Sender\Adapter\CcAwareAdapterInterface as SenderAdapterInterface;
+use Sylius\Component\Mailer\Sender\Adapter\AdapterInterface as SenderAdapterInterface;;
+use Sylius\Component\Mailer\Sender\Adapter\CcAwareAdapterInterface as CcAwareSenderAdapterInterface;;
 
 final class SenderSpec extends ObjectBehavior
 {
-    function let(
+    function it_sends_an_email_through_the_adapter(
         RendererAdapterInterface $rendererAdapter,
         SenderAdapterInterface $senderAdapter,
         EmailProviderInterface $provider,
         DefaultSettingsProviderInterface $defaultSettingsProvider,
-    ): void {
-        $this->beConstructedWith($rendererAdapter, $senderAdapter, $provider, $defaultSettingsProvider);
-    }
-
-    function it_sends_an_email_through_the_adapter(
         EmailInterface $email,
-        EmailProviderInterface $provider,
         RenderedEmail $renderedEmail,
-        RendererAdapterInterface $rendererAdapter,
-        SenderAdapterInterface $senderAdapter,
     ): void {
+        $this->beConstructedWith($rendererAdapter, $senderAdapter, $provider, $defaultSettingsProvider);
+
         $provider->getEmail('bar')->willReturn($email);
         $email->isEnabled()->willReturn(true);
         $email->getSenderAddress()->willReturn('sender@example.com');
@@ -49,6 +44,7 @@ function it_sends_an_email_through_the_adapter(
         $data = ['foo' => 2];
 
         $rendererAdapter->render($email, ['foo' => 2])->willReturn($renderedEmail);
+
         $senderAdapter->send(
             ['john@example.com'],
             'sender@example.com',
@@ -60,16 +56,19 @@ function it_sends_an_email_through_the_adapter(
             [],
         )->shouldBeCalled();
 
-        $this->send('bar', ['john@example.com'], $data, [], []);
+        $this->send('bar', ['john@example.com'], $data);
     }
 
     function it_sends_an_email_with_cc_and_bcc_through_the_adapter(
-        EmailInterface $email,
+        RendererAdapterInterface $rendererAdapter,
+        CcAwareSenderAdapterInterface $senderAdapter,
         EmailProviderInterface $provider,
+        DefaultSettingsProviderInterface $defaultSettingsProvider,
+        EmailInterface $email,
         RenderedEmail $renderedEmail,
-        RendererAdapterInterface $rendererAdapter,
-        SenderAdapterInterface $senderAdapter,
     ): void {
+        $this->beConstructedWith($rendererAdapter, $senderAdapter, $provider, $defaultSettingsProvider);
+
         $provider->getEmail('bar')->willReturn($email);
         $email->isEnabled()->willReturn(true);
         $email->getSenderAddress()->willReturn('sender@example.com');
@@ -78,6 +77,7 @@ function it_sends_an_email_with_cc_and_bcc_through_the_adapter(
         $data = ['foo' => 2];
 
         $rendererAdapter->render($email, ['foo' => 2])->willReturn($renderedEmail);
+        $senderAdapter->send(Argument::cetera())->shouldNotBeCalled();
         $senderAdapter->sendWithCC(
             ['john@example.com'],
             'sender@example.com',
@@ -133,11 +133,14 @@ function it_sends_a_modified_email_with_cc_and_bcc_through_the_adapter(
     }
 
     function it_does_not_send_disabled_emails(
-        EmailInterface $email,
-        EmailProviderInterface $provider,
         RendererAdapterInterface $rendererAdapter,
         SenderAdapterInterface $senderAdapter,
+        EmailProviderInterface $provider,
+        DefaultSettingsProviderInterface $defaultSettingsProvider,
+        EmailInterface $email,
     ): void {
+        $this->beConstructedWith($rendererAdapter, $senderAdapter, $provider, $defaultSettingsProvider);
+
         $provider->getEmail('bar')->willReturn($email);
         $email->isEnabled()->willReturn(false);
 
@@ -150,7 +153,11 @@ function it_does_not_send_disabled_emails(
     function it_throws_an_exception_if_wrong_value_is_provided_as_recipient_email(
         RendererAdapterInterface $rendererAdapter,
         SenderAdapterInterface $senderAdapter,
+        EmailProviderInterface $provider,
+        DefaultSettingsProviderInterface $defaultSettingsProvider,
     ): void {
+        $this->beConstructedWith($rendererAdapter, $senderAdapter, $provider, $defaultSettingsProvider);
+
         $rendererAdapter->render(Argument::any())->shouldNotBeCalled();
         $senderAdapter->send(Argument::any())->shouldNotBeCalled();