test: added more tests to improve code coverage

thorsten · thorsten · commit 5c19d993cbd7 · 2026-03-30T12:46:09.000+02:00
diff --git a/tests/phpMyFAQ/Controller/Administration/Api/MediaBrowserControllerTest.php b/tests/phpMyFAQ/Controller/Administration/Api/MediaBrowserControllerTest.php
@@ -11,6 +11,7 @@
 use phpMyFAQ\Enums\PermissionType;
 use phpMyFAQ\Language;
 use phpMyFAQ\Permission\PermissionInterface;
+use phpMyFAQ\Session\Token;
 use phpMyFAQ\Strings;
 use phpMyFAQ\Translation;
 use phpMyFAQ\User\CurrentUser;
@@ -163,12 +164,32 @@ public function testIndexRemovesFileWhenFileRemoveActionIsRequested(): void
         $this->createdMediaFile = PMF_CONTENT_DIR . '/user/images/' . $fileName;
         file_put_contents($this->createdMediaFile, 'fake-image');
 
+        $session = new Session(new MockArraySessionStorage());
+
+        // Set up a valid CSRF token in the session
+        Token::resetInstanceForTests();
+        $csrfToken = md5(base64_encode(random_bytes(32)));
+        $tokenObj = Token::getInstance($session);
+        $tokenPage = 'media-browser';
+        $sessionKey = sprintf('%s.%s', Token::PMF_SESSION_NAME, $tokenPage);
+
+        // Use reflection to create a Token object for session storage
+        $tokenReflection = new \ReflectionClass(Token::class);
+        $storedToken = $tokenReflection->newInstanceWithoutConstructor();
+        $storedToken->setPage($tokenPage);
+        $storedToken->setExpiry(time() + 3600);
+        $storedToken->setSessionToken($csrfToken);
+        $storedToken->setCookieToken('');
+
+        $session->set($sessionKey, $storedToken);
+
         $controller = new MediaBrowserController();
-        $controller->setContainer($this->createAuthenticatedContainer());
+        $controller->setContainer($this->createAuthenticatedContainer($session));
 
         $request = new Request([], [], [], [], [], [], json_encode([
             'action' => 'fileRemove',
             'name' => $fileName,
+            'csrfToken' => $csrfToken,
         ], JSON_THROW_ON_ERROR));
 
         $response = $controller->index($request);
@@ -180,7 +201,7 @@ public function testIndexRemovesFileWhenFileRemoveActionIsRequested(): void
         $this->createdMediaFile = '';
     }
 
-    private function createAuthenticatedContainer(): ContainerInterface
+    private function createAuthenticatedContainer(?Session $session = null): ContainerInterface
     {
         $permission = $this->createMock(PermissionInterface::class);
         $permission
@@ -197,7 +218,7 @@ private function createAuthenticatedContainer(): ContainerInterface
         $currentUser->method('isLoggedIn')->willReturn(true);
         $currentUser->method('getUserId')->willReturn(42);
 
-        $session = new Session(new MockArraySessionStorage());
+        $session ??= new Session(new MockArraySessionStorage());
 
         $container = $this->createStub(ContainerInterface::class);
         $container
diff --git a/tests/phpMyFAQ/Faq/StatisticsTest.php b/tests/phpMyFAQ/Faq/StatisticsTest.php
@@ -620,7 +620,7 @@ public function testGetTopTenDataWithCategoryFilter(): void
         $this->dbMock
             ->expects($this->once())
             ->method('query')
-            ->with($this->stringContains("fcr.category_id = 5"))
+            ->with($this->stringContains('fcr.category_id = 5'))
             ->willReturn($resultMock);
         $this->dbMock->method('escape')->willReturn('en');
         $this->dbMock->method('fetchObject')->willReturn(null);
diff --git a/tests/phpMyFAQ/Instance/Database/PdoSqlsrvTest.php b/tests/phpMyFAQ/Instance/Database/PdoSqlsrvTest.php
@@ -187,7 +187,10 @@ public function testCreateTablesWithPrefixOnIndexStatements(): void
 
         $this->pdoSqlsrv->createTables('test_');
 
-        $indexQueries = array_filter($executedQueries, fn($q) => str_contains($q, 'CREATE INDEX') || str_contains($q, 'CREATE UNIQUE INDEX'));
+        $indexQueries = array_filter(
+            $executedQueries,
+            fn($q) => str_contains($q, 'CREATE INDEX') || str_contains($q, 'CREATE UNIQUE INDEX'),
+        );
         $this->assertNotEmpty($indexQueries);
 
         foreach ($indexQueries as $query) {
diff --git a/tests/phpMyFAQ/Instance/Search/ElasticsearchTest.php b/tests/phpMyFAQ/Instance/Search/ElasticsearchTest.php
@@ -106,7 +106,7 @@ private function createElasticsearchResponse(int $statusCode, array $body): Resp
                 'Content-Type' => 'application/json',
                 'X-Elastic-Product' => 'Elasticsearch',
             ],
-            json_encode($body)
+            json_encode($body),
         );
     }
 
@@ -324,10 +324,12 @@ public function testIndexFaqSendsCorrectParams(): void
             ->method('sendRequest')
             ->with($this->callback(function ($request) {
                 $body = json_decode((string) $request->getBody(), true);
-                return str_contains($request->getUri()->getPath(), '/_doc/42')
+                return (
+                    str_contains($request->getUri()->getPath(), '/_doc/42')
                     && $body['question'] === 'What is phpMyFAQ?'
                     && $body['answer'] === 'A FAQ tool'
-                    && $body['content_type'] === 'faq';
+                    && $body['content_type'] === 'faq'
+                );
             }))
             ->willReturn($this->createElasticsearchResponse(200, ['result' => 'created']));
 
@@ -378,9 +380,11 @@ public function testUpdateFaqSendsCorrectParams(): void
             ->method('sendRequest')
             ->with($this->callback(function ($request) {
                 $body = json_decode((string) $request->getBody(), true);
-                return str_contains($request->getUri()->getPath(), '/_update/42')
+                return (
+                    str_contains($request->getUri()->getPath(), '/_update/42')
                     && $body['doc']['answer'] === 'Updated answer'
-                    && $body['doc']['content_type'] === 'faq';
+                    && $body['doc']['content_type'] === 'faq'
+                );
             }))
             ->willReturn($this->createElasticsearchResponse(200, ['result' => 'updated']));
 
@@ -418,7 +422,7 @@ public function testDeleteFaqSendsCorrectParams(): void
             ->method('sendRequest')
             ->with($this->callback(function ($request) {
                 return $request->getMethod() === 'DELETE'
-                    && str_contains($request->getUri()->getPath(), '/phpmyfaq_test/_doc/42');
+                && str_contains($request->getUri()->getPath(), '/phpmyfaq_test/_doc/42');
             }))
             ->willReturn($this->createElasticsearchResponse(200, ['result' => 'deleted']));
 
@@ -441,9 +445,7 @@ public function testDeleteFaqReturnsErrorOnException(): void
 
     public function testIsAvailableReturnsTrueOnPing(): void
     {
-        $this->httpClientMock
-            ->method('sendRequest')
-            ->willReturn($this->createElasticsearchResponse(200, []));
+        $this->httpClientMock->method('sendRequest')->willReturn($this->createElasticsearchResponse(200, []));
 
         $this->assertTrue($this->elasticsearch->isAvailable());
     }
@@ -493,8 +495,7 @@ public function testBulkIndexSkipsInactiveFaqs(): void
             ->with($this->callback(function ($request) {
                 $body = (string) $request->getBody();
                 // NDJSON: should only contain solution_id 2, not 1
-                return str_contains($body, '"_id":"2"')
-                    && !str_contains($body, '"_id":"1"');
+                return str_contains($body, '"_id":"2"') && !str_contains($body, '"_id":"1"');
             }))
             ->willReturn($this->createElasticsearchResponse(200, ['errors' => false, 'items' => []]));
 
@@ -569,10 +570,12 @@ public function testIndexCustomPageWithActivePage(): void
             ->method('sendRequest')
             ->with($this->callback(function ($request) {
                 $body = json_decode((string) $request->getBody(), true);
-                return str_contains($request->getUri()->getPath(), '/_doc/page_1_en')
+                return (
+                    str_contains($request->getUri()->getPath(), '/_doc/page_1_en')
                     && $body['content_type'] === 'page'
                     && $body['slug'] === 'about-us'
-                    && $body['answer'] === 'AboutInfo';
+                    && $body['answer'] === 'AboutInfo'
+                );
             }))
             ->willReturn($this->createElasticsearchResponse(200, ['result' => 'created']));
 
@@ -597,7 +600,7 @@ public function testIndexCustomPageWithInactivePageCallsDelete(): void
             ->method('sendRequest')
             ->with($this->callback(function ($request) {
                 return $request->getMethod() === 'DELETE'
-                    && str_contains($request->getUri()->getPath(), '/_doc/page_1_en');
+                && str_contains($request->getUri()->getPath(), '/_doc/page_1_en');
             }))
             ->willReturn($this->createElasticsearchResponse(200, ['result' => 'deleted']));
 
@@ -645,9 +648,11 @@ public function testUpdateCustomPageWithActivePage(): void
             ->method('sendRequest')
             ->with($this->callback(function ($request) {
                 $body = json_decode((string) $request->getBody(), true);
-                return str_contains($request->getUri()->getPath(), '/_update/page_6_de')
+                return (
+                    str_contains($request->getUri()->getPath(), '/_update/page_6_de')
                     && $body['doc']['content_type'] === 'page'
-                    && $body['doc']['answer'] === 'Updated content';
+                    && $body['doc']['answer'] === 'Updated content'
+                );
             }))
             ->willReturn($this->createElasticsearchResponse(200, ['result' => 'updated']));
 
@@ -673,7 +678,7 @@ public function testUpdateCustomPageWithInactivePageCallsDelete(): void
             ->method('sendRequest')
             ->with($this->callback(function ($request) {
                 return $request->getMethod() === 'DELETE'
-                    && str_contains($request->getUri()->getPath(), '/_doc/page_3_en');
+                && str_contains($request->getUri()->getPath(), '/_doc/page_3_en');
             }))
             ->willReturn($this->createElasticsearchResponse(200, ['result' => 'deleted']));
 
@@ -698,10 +703,9 @@ public function testUpdateCustomPageWithDocumentMissingFallsBackToIndex(): void
                 $callCount++;
                 if ($callCount === 1) {
                     // First call (update) returns 404 with document_missing_exception
-                    return $this->createElasticsearchResponse(
-                        404,
-                        ['error' => ['type' => 'document_missing_exception']]
-                    );
+                    return $this->createElasticsearchResponse(404, ['error' => [
+                        'type' => 'document_missing_exception',
+                    ]]);
                 }
                 // Second call (index fallback) returns 200
                 return $this->createElasticsearchResponse(200, ['result' => 'created']);
@@ -743,7 +747,7 @@ public function testDeleteCustomPage(): void
             ->method('sendRequest')
             ->with($this->callback(function ($request) {
                 return $request->getMethod() === 'DELETE'
-                    && str_contains($request->getUri()->getPath(), '/_doc/page_5_de');
+                && str_contains($request->getUri()->getPath(), '/_doc/page_5_de');
             }))
             ->willReturn($this->createElasticsearchResponse(200, ['result' => 'deleted']));
 
@@ -790,8 +794,7 @@ public function testBulkIndexCustomPagesWithActivePages(): void
             ->method('sendRequest')
             ->with($this->callback(function ($request) {
                 $body = (string) $request->getBody();
-                return str_contains($body, 'page_1_en')
-                    && !str_contains($body, 'page_2_en');
+                return str_contains($body, 'page_1_en') && !str_contains($body, 'page_2_en');
             }))
             ->willReturn($this->createElasticsearchResponse(200, ['errors' => false]));
 
diff --git a/tests/phpMyFAQ/Plugin/PluginManagerTest.php b/tests/phpMyFAQ/Plugin/PluginManagerTest.php
