Issue #3382624 "Embed adjustments"

Closes #3382624

src/BaseEmailInterface.php

@@ -104,7 +104,7 @@ interface BaseEmailInterface {
   /**
    * Sets "to" addresses.
    *
-   * Valid: initialisation or build (build is deprecated in 1.7.0 and will fail
+   * Valid: initialisation or build (build is deprecated in 1.6.0 and will fail
    * in 2.0.0).
    *
    * @param mixed $addresses
@@ -250,11 +250,6 @@ interface BaseEmailInterface {
    *   (optional) The MIME type. If omitted, the type will be guessed.
    *
    * @return $this
-   *
-   * @deprecated in symfony_mailer:1.6.0 and is removed from symfony_mailer:2.0.0.
-   *   Instead you should use attach().
-   *
-   * @see https://www.drupal.org/node/3476132
    */
   public function attachFromPath(string $path, ?string $name = NULL, ?string $mimeType = NULL);
 
@@ -284,20 +279,20 @@ interface BaseEmailInterface {
   /**
    * Gets the attachments.
    *
-   * @return Drupal\symfony_mailer\AttachmentInterface[]
-   *   The attachments. The key is the URI if there is one, else an integer.
+   * @return \Drupal\symfony_mailer\AttachmentInterface[]
+   *   The attachments. The key is the URI if there is one, else the content ID.
    */
   public function getAttachments(): array;
 
   /**
    * Removes an attachment.
    *
-   * @param string|int $key
+   * @param string $key
    *   The key to the attachment within the array returned by getAttachments().
    *
    * @return $this
    */
-  public function removeAttachment($key): static;
+  public function removeAttachment(string $key): static;
 
   /**
    * Gets the headers object for getting or setting headers.