Merge branch '4.0' into 'main'

Author: thorsten

CHANGELOG.md

@@ -40,6 +40,12 @@ This is a log of major user-visible changes in each phpMyFAQ release.
 - migrated from Webpack to Vite v7 (Thorsten)
 - migrated from Jest to Vitest v3 (Thorsten)
 
+### phpMyFAQ v4.0.14 - 2025-11-15
+
+- fixed security vulnerability (Thorsten)
+- updated third party dependencies (Thorsten)
+- fixed bugs (Thorsten)
+
 ### phpMyFAQ v4.0.13 - 2025-10-03
 
 - fixed security vulnerability (Thorsten)

phpmyfaq/src/phpMyFAQ/Mail.php

@@ -277,19 +277,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)) {

tests/bootstrap.php

@@ -34,13 +34,23 @@
 define('PMF_CONFIG_DIR', dirname(__DIR__) . '/tests/content/core/config');
 define('PMF_CONTENT_DIR', dirname(__DIR__) . '/tests/content');
 
-const PMF_LOG_DIR = __DIR__ . '/logs';
+const PMF_LOG_DIR = __DIR__ . '/logs/phpmyfaq.log';
 const PMF_TEST_DIR = __DIR__;
 const IS_VALID_PHPMYFAQ = true;
 
 $_SERVER['HTTP_HOST'] = 'localhost';
 $_SERVER['SERVER_NAME'] = 'localhost';
 
+// Ensure test log destination exists as a writable file for Monolog
+$logDirectory = dirname(PMF_LOG_DIR);
+if (!is_dir($logDirectory)) {
+    mkdir($logDirectory, 0777, true);
+}
+
+if (!file_exists(PMF_LOG_DIR)) {
+    touch(PMF_LOG_DIR);
+}
+
 require PMF_ROOT_DIR . '/content/core/config/constants.php';
 
 //

tests/phpMyFAQ/MailTest.php

@@ -57,8 +57,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
@@ -102,8 +101,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'));
     }
 
     /**
@@ -117,8 +115,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
@@ -199,8 +196,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