Fix type issues under Mailer namespace

cakephp · Sep 3, 2019 · feeec53 · feeec53
1 parent 7b57873
commit feeec53
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -787,14 +787,6 @@
       <code>$locale</code>
     </PossiblyNullArgument>
   </file>
-  <file src="src/Mailer/Message.php">
-    <PossiblyInvalidArgument occurrences="1">
-      <code>env('HTTP_HOST')</code>
-    </PossiblyInvalidArgument>
-    <PossiblyNullArgument occurrences="1">
-      <code>$this-&gt;appCharset</code>
-    </PossiblyNullArgument>
-  </file>
   <file src="src/Network/Socket.php">
     <InvalidArgument occurrences="1">
       <code>[$this, '_connectionErrorHandler']</code>

diff --git a/src/Mailer/Message.php b/src/Mailer/Message.php
@@ -311,7 +311,7 @@ public function __construct(?array $config = null)
         if ($this->appCharset !== null) {
             $this->charset = $this->appCharset;
         }
-        $this->domain = preg_replace('/\:\d+$/', '', env('HTTP_HOST'));
+        $this->domain = preg_replace('/\:\d+$/', '', (string)env('HTTP_HOST'));
         if (empty($this->domain)) {
             $this->domain = php_uname('n');
         }
@@ -1557,6 +1557,10 @@ protected function encodeString(string $text, string $charset): string
             return $text;
         }
 
+        if ($this->appCharset === null) {
+            return mb_convert_encoding($text, $charset);
+        }
+
         return mb_convert_encoding($text, $charset, $this->appCharset);
     }