fix: don't throw exceptions, just log the error (#3703)

Author: thorsten

phpmyfaq/src/phpMyFAQ/Mail.php

@@ -273,19 +273,22 @@ private function setEmailTo(array &$target, string $targetAlias, string $address
      * @param string        $targetAlias Alias Target alias.
      * @param string        $address User e-mail address.
      * @param string|null   $name Username (optional).
-     * @throws Exception
      * @return bool True if successful, false otherwise.
      */
     private function addEmailTo(array &$target, string $targetAlias, string $address, ?string $name = null): bool
     {
         // Check
         if (!self::validateEmail($address)) {
-            throw new Exception('"' . $address . '" is not a valid email address!');
+            $this->configuration->getLogger()->error('"' . $address . '" is not a valid email address!');
+            return false;
         }
 
         // Don't allow duplicated addresses
         if (array_key_exists($address, $target)) {
-            throw new Exception('"' . $address . '" has been already added in ' . $targetAlias . '!');
+            $this->configuration->getLogger()->error(
+                '"' . $address . '" has been already added in ' . $targetAlias . '!'
+            );
+            return false;
         }
 
         if (isset($name)) {
@@ -302,14 +305,15 @@ private function addEmailTo(array &$target, string $targetAlias, string $address
 
         // Add the email address into the target array
         $target[$address] = $name;
-        // On Windows, when using PHP built-in mail drop any name, just use the e-mail address
+        // On Windows, when using PHP built-in mail drops any name, just use the e-mail address
         if ('WIN' !== strtoupper(substr(PHP_OS, 0, 3))) {
             return true;
         }
         if ('built-in' != $this->agent) {
             return true;
         }
         $target[$address] = null;
+
         return true;
     }
 
@@ -330,6 +334,7 @@ public static function validateEmail(string $address): bool
         if ($address !== str_replace($unsafe, '', $address)) {
             return false;
         }
+
         return (bool) filter_var($address, FILTER_VALIDATE_EMAIL);
     }
 

tests/phpMyFAQ/MailTest.php

@@ -54,8 +54,7 @@ public function testSetFromWithValidAddress(): void
 
     public function testSetFromWithInvalidAddress(): void
     {
-        $this->expectException(Exception::class);
-        $this->mail->setFrom('invalid-email');
+        $this->assertFalse($this->mail->setFrom('invalid-email'));
     }
 
     public function testValidateEmailWithValidAddress(): void
@@ -99,8 +98,7 @@ public function testAddCcWithValidAddress(): void
 
     public function testAddCcWithInvalidAddress(): void
     {
-        $this->expectException(Exception::class);
-        $this->mail->addCc('invalid-email');
+        $this->assertFalse($this->mail->addCc('invalid-email'));
     }
 
     /**
@@ -114,8 +112,7 @@ public function testAddToWithValidAddress(): void
 
     public function testAddToWithInvalidAddress(): void
     {
-        $this->expectException(Exception::class);
-        $this->mail->addTo('invalid-email');
+        $this->assertFalse($this->mail->addTo('invalid-email'));
     }
 
     public function testGetDateWithValidTimestamp(): void
@@ -205,8 +202,7 @@ public function testSetReplyToWithValidAddress(): void
 
     public function testSetReplyToWithInvalidAddress(): void
     {
-        $this->expectException(Exception::class);
-        $this->mail->setReplyTo('invalid-email');
+        $this->assertFalse($this->mail->setReplyTo('invalid-email'));
     }
 
     public function testSafeEmailWithSafeEmailEnabled(): void