Fix type error in email validation

codeigniter4 · Feb 20, 2020 · a933848 · a933848
1 parent 091a438
commit a933848
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/system/Email/Email.php b/system/Email/Email.php
@@ -510,7 +510,7 @@ public function setReplyTo($replyto, $name = '')
 	/**
 	 * Set Recipients
 	 *
-	 * @param string $to
+	 * @param string|array $to
 	 *
 	 * @return Email
 	 */
@@ -892,7 +892,7 @@ protected function getMimeMessage()
 	/**
 	 * Validate Email Address
 	 *
-	 * @param string $email
+	 * @param string|array $email
 	 *
 	 * @return boolean
 	 */
@@ -907,7 +907,7 @@ public function validateEmail($email)
 		{
 			if (! $this->isValidEmail($val))
 			{
-				$this->setErrorMessage(lang('Email.invalidAddress', $val));
+				$this->setErrorMessage(lang('Email.invalidAddress', [$val]));
 				return false;
 			}
 		}

diff --git a/tests/system/Email/EmailTest.php b/tests/system/Email/EmailTest.php
@@ -0,0 +1,13 @@
+<?php namespace system\Email;
+
+class EmailTest extends \CIUnitTestCase
+{
+	public function testEmailValidation()
+	{
+		$config           = config('Email');
+		$config->validate = true;
+		$email            = new \CodeIgniter\Email\Email($config);
+		$email->setTo('invalid');
+		$this->assertStringContainsString('Invalid email address: invalid', $email->printDebugger());
+	}
+}