[Mime] add union types

Co-authored-by: Nicochou <[email protected]>

Author: 2 people

Address.php

@@ -90,27 +90,21 @@ public function getEncodedName(): string
         return sprintf('"%s"', preg_replace('/"/u', '\"', $this->getName()));
     }
 
-    /**
-     * @param Address|string $address
-     */
-    public static function create($address): self
+    public static function create(Address|string $address): self
     {
         if ($address instanceof self) {
             return $address;
         }
-        if (\is_string($address)) {
-            if (false === strpos($address, '<')) {
-                return new self($address);
-            }
 
-            if (!preg_match(self::FROM_STRING_PATTERN, $address, $matches)) {
-                throw new InvalidArgumentException(sprintf('Could not parse "%s" to a "%s" instance.', $address, self::class));
-            }
+        if (false === strpos($address, '<')) {
+            return new self($address);
+        }
 
-            return new self($matches['addrSpec'], trim($matches['displayName'], ' \'"'));
+        if (!preg_match(self::FROM_STRING_PATTERN, $address, $matches)) {
+            throw new InvalidArgumentException(sprintf('Could not parse "%s" to a "%s" instance.', $address, self::class));
         }
 
-        throw new InvalidArgumentException(sprintf('An address can be an instance of Address or a string ("%s" given).', get_debug_type($address)));
+        return new self($matches['addrSpec'], trim($matches['displayName'], ' \'"'));
     }
 
     /**

Crypto/SMimeEncrypter.php

@@ -26,7 +26,7 @@ final class SMimeEncrypter extends SMime
      * @param string|string[] $certificate The path (or array of paths) of the file(s) containing the X.509 certificate(s)
      * @param int|null        $cipher      A set of algorithms used to encrypt the message. Must be one of these PHP constants: https://www.php.net/manual/en/openssl.ciphers.php
      */
-    public function __construct($certificate, int $cipher = null)
+    public function __construct(string|array $certificate, int $cipher = null)
     {
         if (!\extension_loaded('openssl')) {
             throw new \LogicException('PHP extension "openssl" is required to use SMime.');

Email.php

@@ -71,11 +71,9 @@ public function getDate(): ?\DateTimeImmutable
     }
 
     /**
-     * @param Address|string $address
-     *
      * @return $this
      */
-    public function returnPath($address)
+    public function returnPath(Address|string $address)
     {
         return $this->setHeaderBody('Path', 'Return-Path', Address::create($address));
     }
@@ -86,11 +84,9 @@ public function getReturnPath(): ?Address
     }
 
     /**
-     * @param Address|string $address
-     *
      * @return $this
      */
-    public function sender($address)
+    public function sender(Address|string $address)
     {
         return $this->setHeaderBody('Mailbox', 'Sender', Address::create($address));
     }
@@ -101,21 +97,17 @@ public function getSender(): ?Address
     }
 
     /**
-     * @param Address|string ...$addresses
-     *
      * @return $this
      */
-    public function addFrom(...$addresses)
+    public function addFrom(Address|string ...$addresses)
     {
         return $this->addListAddressHeaderBody('From', $addresses);
     }
 
     /**
-     * @param Address|string ...$addresses
-     *
      * @return $this
      */
-    public function from(...$addresses)
+    public function from(Address|string ...$addresses)
     {
         return $this->setListAddressHeaderBody('From', $addresses);
     }
@@ -129,21 +121,17 @@ public function getFrom(): array
     }
 
     /**
-     * @param Address|string ...$addresses
-     *
      * @return $this
      */
-    public function addReplyTo(...$addresses)
+    public function addReplyTo(Address|string ...$addresses)
     {
         return $this->addListAddressHeaderBody('Reply-To', $addresses);
     }
 
     /**
-     * @param Address|string ...$addresses
-     *
      * @return $this
      */
-    public function replyTo(...$addresses)
+    public function replyTo(Address|string ...$addresses)
     {
         return $this->setListAddressHeaderBody('Reply-To', $addresses);
     }
@@ -157,21 +145,17 @@ public function getReplyTo(): array
     }
 
     /**
-     * @param Address|string ...$addresses
-     *
      * @return $this
      */
-    public function addTo(...$addresses)
+    public function addTo(Address|string ...$addresses)
     {
         return $this->addListAddressHeaderBody('To', $addresses);
     }
 
     /**
-     * @param Address|string ...$addresses
-     *
      * @return $this
      */
-    public function to(...$addresses)
+    public function to(Address|string ...$addresses)
     {
         return $this->setListAddressHeaderBody('To', $addresses);
     }
@@ -185,21 +169,17 @@ public function getTo(): array
     }
 
     /**
-     * @param Address|string ...$addresses
-     *
      * @return $this
      */
-    public function addCc(...$addresses)
+    public function addCc(Address|string ...$addresses)
     {
         return $this->addListAddressHeaderBody('Cc', $addresses);
     }
 
     /**
-     * @param Address|string ...$addresses
-     *
      * @return $this
      */
-    public function cc(...$addresses)
+    public function cc(Address|string ...$addresses)
     {
         return $this->setListAddressHeaderBody('Cc', $addresses);
     }
@@ -213,21 +193,17 @@ public function getCc(): array
     }
 
     /**
-     * @param Address|string ...$addresses
-     *
      * @return $this
      */
-    public function addBcc(...$addresses)
+    public function addBcc(Address|string ...$addresses)
     {
         return $this->addListAddressHeaderBody('Bcc', $addresses);
     }
 
     /**
-     * @param Address|string ...$addresses
-     *
      * @return $this
      */
-    public function bcc(...$addresses)
+    public function bcc(Address|string ...$addresses)
     {
         return $this->setListAddressHeaderBody('Bcc', $addresses);
     }

Header/DateHeader.php

@@ -30,7 +30,7 @@ public function __construct(string $name, \DateTimeInterface $date)
     /**
      * @param \DateTimeInterface $body
      */
-    public function setBody($body)
+    public function setBody(mixed $body)
     {
         $this->setDateTime($body);
     }

Header/HeaderInterface.php

@@ -22,10 +22,8 @@ interface HeaderInterface
      * Sets the body.
      *
      * The type depends on the Header concrete class.
-     *
-     * @param mixed $body
      */
-    public function setBody($body);
+    public function setBody(mixed $body);
 
     /**
      * Gets the body.

Header/Headers.php

@@ -85,31 +85,25 @@ public function addMailboxListHeader(string $name, array $addresses): self
     }
 
     /**
-     * @param Address|string $address
-     *
      * @return $this
      */
-    public function addMailboxHeader(string $name, $address): self
+    public function addMailboxHeader(string $name, Address|string $address): self
     {
         return $this->add(new MailboxHeader($name, Address::create($address)));
     }
 
     /**
-     * @param string|array $ids
-     *
      * @return $this
      */
-    public function addIdHeader(string $name, $ids): self
+    public function addIdHeader(string $name, string|array $ids): self
     {
         return $this->add(new IdentificationHeader($name, $ids));
     }
 
     /**
-     * @param Address|string $path
-     *
      * @return $this
      */
-    public function addPathHeader(string $name, $path): self
+    public function addPathHeader(string $name, Address|string $path): self
     {
         return $this->add(new PathHeader($name, $path instanceof Address ? $path : new Address($path)));
     }
@@ -141,7 +135,7 @@ public function addParameterizedHeader(string $name, string $value, array $param
     /**
      * @return $this
      */
-    public function addHeader(string $name, $argument, array $more = []): self
+    public function addHeader(string $name, mixed $argument, array $more = []): self
     {
         $parts = explode('\\', self::HEADER_CLASS_MAP[strtolower($name)] ?? UnstructuredHeader::class);
         $method = 'add'.ucfirst(array_pop($parts));
@@ -254,15 +248,15 @@ public function toArray(): array
         return $arr;
     }
 
-    public function getHeaderBody($name)
+    public function getHeaderBody(string $name)
     {
         return $this->has($name) ? $this->get($name)->getBody() : null;
     }
 
     /**
      * @internal
      */
-    public function setHeaderBody(string $type, string $name, $body): void
+    public function setHeaderBody(string $type, string $name, mixed $body): void
     {
         if ($this->has($name)) {
             $this->get($name)->setBody($body);
@@ -288,7 +282,7 @@ public function getHeaderParameter(string $name, string $parameter): ?string
     /**
      * @internal
      */
-    public function setHeaderParameter(string $name, string $parameter, $value): void
+    public function setHeaderParameter(string $name, string $parameter, ?string $value): void
     {
         if (!$this->has($name)) {
             throw new LogicException(sprintf('Unable to set parameter "%s" on header "%s" as the header is not defined.', $parameter, $name));

Header/IdentificationHeader.php

@@ -24,22 +24,19 @@ final class IdentificationHeader extends AbstractHeader
     private $ids = [];
     private $idsAsAddresses = [];
 
-    /**
-     * @param string|array $ids
-     */
-    public function __construct(string $name, $ids)
+    public function __construct(string $name, string|array $ids)
     {
         parent::__construct($name);
 
         $this->setId($ids);
     }
 
     /**
-     * @param string|array $body a string ID or an array of IDs
+     * @param string|string[] $body a string ID or an array of IDs
      *
      * @throws RfcComplianceException
      */
-    public function setBody($body)
+    public function setBody(mixed $body)
     {
         $this->setId($body);
     }
@@ -52,11 +49,11 @@ public function getBody(): array
     /**
      * Set the ID used in the value of this header.
      *
-     * @param string|array $id
+     * @param string|string[] $id
      *
      * @throws RfcComplianceException
      */
-    public function setId($id)
+    public function setId(string|array $id)
     {
         $this->setIds(\is_array($id) ? $id : [$id]);
     }

Header/MailboxHeader.php

@@ -35,7 +35,7 @@ public function __construct(string $name, Address $address)
      *
      * @throws RfcComplianceException
      */
-    public function setBody($body)
+    public function setBody(mixed $body)
     {
         $this->setAddress($body);
     }

Header/MailboxListHeader.php

@@ -38,7 +38,7 @@ public function __construct(string $name, array $addresses)
      *
      * @throws RfcComplianceException
      */
-    public function setBody($body)
+    public function setBody(mixed $body)
     {
         $this->setAddresses($body);
     }

Header/PathHeader.php

@@ -35,7 +35,7 @@ public function __construct(string $name, Address $address)
      *
      * @throws RfcComplianceException
      */
-    public function setBody($body)
+    public function setBody(mixed $body)
     {
         $this->setAddress($body);
     }

Header/UnstructuredHeader.php

@@ -30,7 +30,7 @@ public function __construct(string $name, string $value)
     /**
      * @param string $body
      */
-    public function setBody($body)
+    public function setBody(mixed $body)
     {
         $this->setValue($body);
     }

MimeTypeGuesserInterface.php

@@ -26,8 +26,6 @@ public function isGuesserSupported(): bool;
     /**
      * Guesses the MIME type of the file with the given path.
      *
-     * @param string $path The path to the file
-     *
      * @return string|null The MIME type or null, if none could be guessed
      *
      * @throws \LogicException           If the guesser is not supported

Part/DataPart.php

@@ -39,8 +39,10 @@ public function __construct($body, string $filename = null, string $contentType
 
         parent::__construct($body, null, $subtype, $encoding);
 
-        $this->filename = $filename;
-        $this->setName($filename);
+        if (null !== $filename) {
+            $this->filename = $filename;
+            $this->setName($filename);
+        }
         $this->setDisposition('attachment');
     }
 

Part/Multipart/FormDataPart.php

@@ -83,7 +83,7 @@ private function prepareFields(array $fields): array
         return $values;
     }
 
-    private function preparePart(string $name, $value): TextPart
+    private function preparePart(string $name, string|TextPart $value): TextPart
     {
         if (\is_string($value)) {
             return $this->configurePart($name, new TextPart($value, 'utf-8', 'plain', '8bit'));