test: added more tests to avoid missing code coverage

Author: thorsten

phpmyfaq/src/phpMyFAQ/Auth/OAuth2/AuthorizationServer.php

@@ -42,6 +42,8 @@ final class AuthorizationServer
 {
     /** @var callable(Request): array{body: array<string, mixed>, status: int, headers?: array<string, string>}|null */
     private $tokenIssuer = null;
+    /** @var callable(Request, string, bool): array{body: mixed, status: int, headers?: array<string, string>}|null */
+    private $authorizationCompleter = null;
 
     public function __construct(
         private readonly Configuration $configuration,
@@ -58,6 +60,16 @@ public function setTokenIssuer(callable $issuer): void
         $this->tokenIssuer = $issuer;
     }
 
+    /**
+     * Allows integration code to provide an authorization completer implementation.
+     *
+     * @param callable(Request, string, bool): array{body: mixed, status: int, headers?: array<string, string>} $completer
+     */
+    public function setAuthorizationCompleter(callable $completer): void
+    {
+        $this->authorizationCompleter = $completer;
+    }
+
     /**
      * Issues an OAuth2 access token response payload.
      *
@@ -160,6 +172,10 @@ public function isEnabled(): bool
 
     public function completeAuthorization(Request $request, string $userId, bool $approved): array
     {
+        if (is_callable($this->authorizationCompleter)) {
+            return ($this->authorizationCompleter)($request, $userId, $approved);
+        }
+
         try {
             $psrRequest = $this->toPsr7Request($request);
             $server = $this->buildLeagueAuthorizationServer();

phpmyfaq/src/phpMyFAQ/Controller/Api/CategoryController.php

@@ -35,12 +35,36 @@
 
 final class CategoryController extends AbstractApiController
 {
+    /** @var null|callable */
+    private $categoryFactory = null;
+
+    /** @var null|callable */
+    private $categoryPermissionFactory = null;
+
+    /** @var null|callable */
+    private $orderFactory = null;
+
     public function __construct(
         private readonly Language $language,
     ) {
         parent::__construct();
     }
 
+    public function setCategoryFactory(callable $categoryFactory): void
+    {
+        $this->categoryFactory = $categoryFactory;
+    }
+
+    public function setCategoryPermissionFactory(callable $categoryPermissionFactory): void
+    {
+        $this->categoryPermissionFactory = $categoryPermissionFactory;
+    }
+
+    public function setOrderFactory(callable $orderFactory): void
+    {
+        $this->orderFactory = $orderFactory;
+    }
+
     /**
      * @throws \Exception
      */
@@ -139,7 +163,7 @@ public function list(?Request $request = null): JsonResponse
 
         [$currentUser, $currentGroups] = CurrentUser::getCurrentUserGroupId($this->currentUser);
 
-        $category = new Category($this->configuration, $currentGroups, withPermission: true);
+        $category = $this->createCategory($currentGroups);
         $category->setUser($currentUser);
         $category->setGroups($currentGroups);
         $category->setLanguage($currentLanguage);
@@ -265,12 +289,12 @@ public function create(Request $request): JsonResponse
 
         $currentLanguage = $this->configuration->getLanguage()->getLanguage();
 
-        $category = new Category($this->configuration, $currentGroups, withPermission: true);
+        $category = $this->createCategory($currentGroups);
         $category->setUser($currentUser);
         $category->setGroups($currentGroups);
         $category->setLanguage($currentLanguage);
 
-        $categoryPermission = new CategoryPermission($this->configuration);
+        $categoryPermission = $this->createCategoryPermission();
 
         $languageCode = Filter::filterVar($data->language, FILTER_SANITIZE_SPECIAL_CHARS);
         $parentId = Filter::filterVar($data->{'parent-id'}, FILTER_VALIDATE_INT);
@@ -320,7 +344,7 @@ public function create(Request $request): JsonResponse
         $categoryId = $category->create($categoryEntity);
 
         // Category Order entry
-        $categoryOrder = new Order($this->configuration);
+        $categoryOrder = $this->createOrder();
         $categoryOrder->add($categoryId, $parentId);
 
         if ($categoryId) {
@@ -339,4 +363,31 @@ public function create(Request $request): JsonResponse
         ];
         return $this->json($result, Response::HTTP_BAD_REQUEST);
     }
+
+    private function createCategory(array $currentGroups): Category
+    {
+        if (is_callable($this->categoryFactory)) {
+            return ($this->categoryFactory)($currentGroups);
+        }
+
+        return new Category($this->configuration, $currentGroups, withPermission: true);
+    }
+
+    private function createCategoryPermission(): CategoryPermission
+    {
+        if (is_callable($this->categoryPermissionFactory)) {
+            return ($this->categoryPermissionFactory)();
+        }
+
+        return new CategoryPermission($this->configuration);
+    }
+
+    private function createOrder(): Order
+    {
+        if (is_callable($this->orderFactory)) {
+            return ($this->orderFactory)();
+        }
+
+        return new Order($this->configuration);
+    }
 }

phpmyfaq/src/phpMyFAQ/Controller/Api/PdfController.php

@@ -35,6 +35,11 @@
 
 final class PdfController extends AbstractController
 {
+    /** @var null|callable(\phpMyFAQ\Configuration): Faq */
+    private $faqFactory = null;
+    /** @var null|callable(\phpMyFAQ\Configuration): Services */
+    private $servicesFactory = null;
+
     public function __construct()
     {
         parent::__construct();
@@ -44,6 +49,16 @@ public function __construct()
         }
     }
 
+    public function setFaqFactory(callable $faqFactory): void
+    {
+        $this->faqFactory = $faqFactory;
+    }
+
+    public function setServicesFactory(callable $servicesFactory): void
+    {
+        $this->servicesFactory = $servicesFactory;
+    }
+
     /**
      * @throws Exception
      */
@@ -88,7 +103,9 @@ public function getById(Request $request): JsonResponse
     {
         [$currentUser, $currentGroups] = CurrentUser::getCurrentUserGroupId($this->currentUser);
 
-        $faq = new Faq($this->configuration);
+        $faq = is_callable($this->faqFactory)
+            ? ($this->faqFactory)($this->configuration)
+            : new Faq($this->configuration);
         $faq->setUser($currentUser);
         $faq->setGroups($currentGroups);
 
@@ -103,7 +120,9 @@ public function getById(Request $request): JsonResponse
             return $this->json($result, Response::HTTP_NOT_FOUND);
         }
 
-        $services = new Services($this->configuration);
+        $services = is_callable($this->servicesFactory)
+            ? ($this->servicesFactory)($this->configuration)
+            : new Services($this->configuration);
         $services->setFaqId($faqId);
         $services->setLanguage($this->configuration->getLanguage()->getLanguage());
         $services->setCategoryId($categoryId);

phpmyfaq/src/phpMyFAQ/Controller/Api/RegistrationController.php

@@ -34,6 +34,9 @@
 
 final class RegistrationController extends AbstractController
 {
+    /** @var null|callable(Configuration): RegistrationHelper */
+    private $registrationHelperFactory = null;
+
     public function __construct()
     {
         parent::__construct();
@@ -43,6 +46,11 @@ public function __construct()
         }
     }
 
+    public function setRegistrationHelperFactory(callable $registrationHelperFactory): void
+    {
+        $this->registrationHelperFactory = $registrationHelperFactory;
+    }
+
     /**
      * @throws TransportExceptionInterface
      * @throws Exception
@@ -108,7 +116,9 @@ public function create(Request $request): JsonResponse
     {
         $this->hasValidToken();
 
-        $registrationHelper = new RegistrationHelper($this->configuration);
+        $registrationHelper = is_callable($this->registrationHelperFactory)
+            ? ($this->registrationHelperFactory)($this->configuration)
+            : new RegistrationHelper($this->configuration);
 
         $data = json_decode(json: $request->getContent(), associative: false, depth: 512, flags: JSON_THROW_ON_ERROR);
 

phpmyfaq/src/phpMyFAQ/EventListener/LanguageListener.php

@@ -91,14 +91,10 @@ private function initializeTranslation(string $currentLanguage): void
     {
         Strings::init($currentLanguage);
 
-        try {
-            Translation::create()
-                ->setTranslationsDir(PMF_TRANSLATION_DIR)
-                ->setDefaultLanguage(defaultLanguage: 'en')
-                ->setCurrentLanguage($currentLanguage)
-                ->setMultiByteLanguage();
-        } catch (Exception $exception) {
-            throw $exception;
-        }
+        Translation::create()
+            ->setTranslationsDir(PMF_TRANSLATION_DIR)
+            ->setDefaultLanguage(defaultLanguage: 'en')
+            ->setCurrentLanguage($currentLanguage)
+            ->setMultiByteLanguage();
     }
 }

phpmyfaq/translations/language_de.php

@@ -784,6 +784,7 @@
 $PMF_LANG['msgAllCatArticles'] = "FAQs in dieser Kategorie";
 $PMF_LANG['msgTagSearch'] = "FAQs mit gleichen Tags";
 $PMF_LANG['ad_pmf_info'] = "phpMyFAQ Information";
+$PMF_LANG['ad_pmf_news'] = 'phpMyFAQ Nachrichten';
 $PMF_LANG['msgOnlineVersionCheck'] = "Online Versionsüberprüfung";
 $PMF_LANG['ad_system_info'] = "System Information";
 
@@ -1664,6 +1665,7 @@
 $PMF_LANG['msgPushNewQuestion'] = 'Neue offene Frage eingereicht';
 $PMF_LANG['msgPushNotificationsDescription'] = 'Erhalten Sie Browser-Benachrichtigungen, wenn neue FAQs veröffentlicht oder Fragen eingereicht werden.';
 $PMF_LANG['pushControlCenter'] = 'Push';
+$PMF_LANG['storageControlCenter'] = 'Speicher-Backend';
 $PMF_LANG['msgGenerateVapidKeys'] = 'VAPID-Schlüssel generieren';
 $PMF_LANG['msgVapidKeysGenerated'] = 'VAPID-Schlüssel wurden erfolgreich generiert.';
 $PMF_LANG['msgVapidKeysError'] = 'VAPID-Schlüssel konnten nicht generiert werden.';
@@ -1681,4 +1683,15 @@
 $LANG_CONF['mail.mailgunRegion'] = ['input', 'Mailgun Region', 'z.B. us, eu'];
 $LANG_CONF['mail.useQueue'] = ['checkbox', 'Hintergrund-Worker-Warteschlange für die E-Mail-Zustellung verwenden'];
 
+$LANG_CONF['storage.testRedisConnection'] = ['button', 'Teste die Verbindung zu Redis'];
+$PMF_LANG['storage.testRedisConnection'] = 'Teste die Verbindung zu Redis';
+
+$PMF_LANG['msgAdminHeaderLdap'] = 'LDAP Konfiguration';
+$PMF_LANG['msgAdminLdapHealthCheck'] = 'LDAP Health Check';
+$PMF_LANG['msgAdminLdapServers'] = 'LDAP Server';
+$PMF_LANG['msgAdminLdapMapping'] = 'LDAP Attribute Mapping';
+$PMF_LANG['msgAdminLdapOptions'] = 'LDAP Optionen';
+$PMF_LANG['msgAdminLdapGroupSettings'] = 'LDAP Gruppeneinstellungen';
+$PMF_LANG['msgAdminLdapSettings'] = 'Allgemeine LDAP-Einstellungen';
+
 return $PMF_LANG;

phpmyfaq/translations/language_en.php

@@ -1706,7 +1706,6 @@
 $LANG_CONF['storage.testRedisConnection'] = ['button', 'Test Redis connection'];
 $PMF_LANG['storage.testRedisConnection'] = 'Test Redis connection';
 
-// added v4.1.0 - 2026-03-05 by Thorsten
 $PMF_LANG['msgAdminHeaderLdap'] = 'LDAP Configuration';
 $PMF_LANG['msgAdminLdapHealthCheck'] = 'LDAP Health Check';
 $PMF_LANG['msgAdminLdapServers'] = 'LDAP Servers';

tests/phpMyFAQ/Controller/Api/AttachmentControllerTest.php

@@ -2,9 +2,14 @@
 
 namespace phpMyFAQ\Controller\Api;
 
+use phpMyFAQ\Attachment\AttachmentFactory;
 use phpMyFAQ\Configuration;
 use phpMyFAQ\Database\Sqlite3;
+use phpMyFAQ\Language;
 use PHPUnit\Framework\Attributes\AllowMockObjectsWithoutExpectations;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\UsesClass;
+use PHPUnit\Framework\Attributes\UsesNamespace;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -26,6 +31,10 @@ public function isApiEnabled(): bool
 }
 
 #[AllowMockObjectsWithoutExpectations]
+#[CoversClass(AttachmentController::class)]
+#[UsesNamespace('phpMyFAQ')]
+#[UsesClass(AbstractApiController::class)]
+#[UsesClass(PaginatedResponseOptions::class)]
 class AttachmentControllerTest extends TestCase
 {
     private ?Sqlite3 $dbHandle = null;
@@ -41,6 +50,40 @@ protected function setUp(): void
         $this->dbHandle = new Sqlite3();
         $this->dbHandle->connect(PMF_TEST_DIR . '/test.db', '', '');
         new Configuration($this->dbHandle);
+
+        Language::$language = 'en';
+        $this->setAttachmentFactoryStorageType(0);
+    }
+
+    protected function tearDown(): void
+    {
+        $this->setAttachmentFactoryStorageType(0);
+
+        parent::tearDown();
+    }
+
+    private function setAttachmentFactoryStorageType(?int $storageType): void
+    {
+        $reflection = new \ReflectionClass(AttachmentFactory::class);
+        $property = $reflection->getProperty('storageType');
+        $property->setValue(null, $storageType);
+    }
+
+    private function insertAttachmentFixture(int $id, int $recordId): void
+    {
+        $query = sprintf(
+            "INSERT INTO faqattachment (id, record_id, record_lang, real_hash, virtual_hash, password_hash, filename, filesize, encrypted, mime_type) VALUES (%d, %d, 'en', 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb', NULL, 'fixture-%d.txt', 123, 0, 'text/plain')",
+            $id,
+            $recordId,
+            $id,
+        );
+
+        $this->dbHandle?->query($query);
+    }
+
+    private function deleteAttachmentFixture(int $id): void
+    {
+        $this->dbHandle?->query(sprintf('DELETE FROM faqattachment WHERE id = %d', $id));
     }
 
     public function testConstructorWithApiEnabled(): void
@@ -255,4 +298,25 @@ public function testListResponseStructure(): void
             }
         }
     }
+
+    public function testListReturnsInternalServerErrorWhenAttachmentFactoryThrows(): void
+    {
+        $fixtureId = 990001;
+        $this->insertAttachmentFixture($fixtureId, 1);
+        $this->setAttachmentFactoryStorageType(999);
+
+        $request = new Request();
+        $request->attributes->set('faqId', '1');
+
+        $controller = new AttachmentController();
+        $response = $controller->list($request);
+        $payload = json_decode($response->getContent(), true);
+
+        $this->deleteAttachmentFixture($fixtureId);
+
+        $this->assertSame(Response::HTTP_INTERNAL_SERVER_ERROR, $response->getStatusCode());
+        $this->assertFalse($payload['success']);
+        $this->assertSame('Failed to fetch attachments', $payload['error']['message']);
+        $this->assertSame('ATTACHMENT_ERROR', $payload['error']['code']);
+    }
 }

tests/phpMyFAQ/Controller/Api/BackupControllerWebTest.php

@@ -12,6 +12,18 @@
 #[UsesNamespace('phpMyFAQ')]
 final class BackupControllerWebTest extends ControllerWebTestCase
 {
+    public function testBackupEndpointReturnsUnauthorizedProblemWhenApiIsDisabled(): void
+    {
+        $this->getConfiguration('api')->getAll();
+        $this->overrideConfigurationValues(['api.enableAccess' => false], 'api');
+
+        $response = $this->requestApi('GET', '/v3.2/backup/data');
+
+        self::assertResponseStatusCodeSame(401, $response);
+        self::assertStringContainsString('problem+json', (string) $response->headers->get('Content-Type'));
+        self::assertJson((string) $response->getContent());
+    }
+
     public function testBackupEndpointReturnsUnauthorizedWhenAnonymous(): void
     {
         $this->overrideConfigurationValues(['api.enableAccess' => true], 'api');