cs nullable typehints

Author: dg

src/Mail/Message.php

@@ -57,7 +57,7 @@ public function __construct()
 	 * Sets the sender of the message. Email or format "John Doe" <[email protected]>
 	 * @return static
 	 */
-	public function setFrom(string $email, string $name = null)
+	public function setFrom(string $email, ?string $name = null)
 	{
 		$this->setHeader('From', $this->formatEmail($email, $name));
 		return $this;
@@ -77,7 +77,7 @@ public function getFrom(): ?array
 	 * Adds the reply-to address. Email or format "John Doe" <[email protected]>
 	 * @return static
 	 */
-	public function addReplyTo(string $email, string $name = null)
+	public function addReplyTo(string $email, ?string $name = null)
 	{
 		$this->setHeader('Reply-To', $this->formatEmail($email, $name), true);
 		return $this;
@@ -108,7 +108,7 @@ public function getSubject(): ?string
 	 * Adds email recipient. Email or format "John Doe" <[email protected]>
 	 * @return static
 	 */
-	public function addTo(string $email, string $name = null) // addRecipient()
+	public function addTo(string $email, ?string $name = null) // addRecipient()
 	{
 		$this->setHeader('To', $this->formatEmail($email, $name), true);
 		return $this;
@@ -119,7 +119,7 @@ public function addTo(string $email, string $name = null) // addRecipient()
 	 * Adds carbon copy email recipient. Email or format "John Doe" <[email protected]>
 	 * @return static
 	 */
-	public function addCc(string $email, string $name = null)
+	public function addCc(string $email, ?string $name = null)
 	{
 		$this->setHeader('Cc', $this->formatEmail($email, $name), true);
 		return $this;
@@ -130,7 +130,7 @@ public function addCc(string $email, string $name = null)
 	 * Adds blind carbon copy email recipient. Email or format "John Doe" <[email protected]>
 	 * @return static
 	 */
-	public function addBcc(string $email, string $name = null)
+	public function addBcc(string $email, ?string $name = null)
 	{
 		$this->setHeader('Bcc', $this->formatEmail($email, $name), true);
 		return $this;
@@ -140,7 +140,7 @@ public function addBcc(string $email, string $name = null)
 	/**
 	 * Formats recipient email.
 	 */
-	private function formatEmail(string $email, string $name = null): array
+	private function formatEmail(string $email, ?string $name = null): array
 	{
 		if (!$name && preg_match('#^(.+) +<(.*)>$#D', $email, $matches)) {
 			[, $name, $email] = $matches;
@@ -200,7 +200,7 @@ public function getPriority(): ?int
 	 * Sets HTML body.
 	 * @return static
 	 */
-	public function setHtmlBody(string $html, string $basePath = null)
+	public function setHtmlBody(string $html, ?string $basePath = null)
 	{
 		if ($basePath) {
 			$cids = [];
@@ -259,7 +259,7 @@ public function getHtmlBody(): string
 	/**
 	 * Adds embedded file.
 	 */
-	public function addEmbeddedFile(string $file, string $content = null, string $contentType = null): MimePart
+	public function addEmbeddedFile(string $file, ?string $content = null, ?string $contentType = null): MimePart
 	{
 		return $this->inlines[$file] = $this->createAttachment($file, $content, $contentType, 'inline')
 			->setHeader('Content-ID', $this->getRandomId());
@@ -280,7 +280,7 @@ public function addInlinePart(MimePart $part)
 	/**
 	 * Adds attachment.
 	 */
-	public function addAttachment(string $file, string $content = null, string $contentType = null): MimePart
+	public function addAttachment(string $file, ?string $content = null, ?string $contentType = null): MimePart
 	{
 		return $this->attachments[] = $this->createAttachment($file, $content, $contentType, 'attachment');
 	}

src/Mail/MimePart.php

@@ -161,7 +161,7 @@ public function getHeaders(): array
 	 * Sets Content-Type header.
 	 * @return static
 	 */
-	public function setContentType(string $contentType, string $charset = null)
+	public function setContentType(string $contentType, ?string $charset = null)
 	{
 		$this->setHeader('Content-Type', $contentType . ($charset ? "; charset=$charset" : ''));
 		return $this;
@@ -191,7 +191,7 @@ public function getEncoding(): string
 	/**
 	 * Adds or creates new multipart.
 	 */
-	public function addPart(self $part = null): self
+	public function addPart(?self $part = null): self
 	{
 		return $this->parts[] = $part ?? new self;
 	}
@@ -287,7 +287,7 @@ public function getEncodedMessage(): string
 	/**
 	 * Converts a 8 bit header to a string.
 	 */
-	private static function encodeSequence(string $s, int &$offset = 0, int $type = null): string
+	private static function encodeSequence(string $s, int &$offset = 0, ?int $type = null): string
 	{
 		if (
 			(strlen($s) < self::LINE_LENGTH - 3) && // 3 is tab + quotes

src/Mail/SmtpMailer.php

@@ -227,7 +227,7 @@ protected function disconnect(): void
 	 * Writes data to server and checks response against expected code if some provided.
 	 * @param  int|int[]  $expectedCode
 	 */
-	protected function write(string $line, $expectedCode = null, string $message = null): void
+	protected function write(string $line, $expectedCode = null, ?string $message = null): void
 	{
 		fwrite($this->connection, $line . Message::EOL);
 		if ($expectedCode) {