test: added more web tests

Author: thorsten

phpmyfaq/src/phpMyFAQ/Administration/Session.php

@@ -122,7 +122,7 @@ public function getLast30DaysVisits(int $endDate): array
     {
         $stats = [];
         $completeData = [];
-        $startDate = strtotime(datetime: '-1 month');
+        $startDate = strtotime('-1 month', $endDate);
 
         $visits = $this->sessionRepository->getSessionTimestamps($startDate, $endDate);
 

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

@@ -23,6 +23,7 @@
 use phpMyFAQ\Permission\MediumPermission;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Attribute\Route;
 
 final class GroupController extends AbstractApiController
 {

phpmyfaq/src/phpMyFAQ/Controller/Frontend/Api/CaptchaController.php

@@ -19,15 +19,16 @@
 
 namespace phpMyFAQ\Controller\Frontend\Api;
 
-use phpMyFAQ\Captcha\Captcha;
+use phpMyFAQ\Captcha\BuiltinCaptcha;
+use phpMyFAQ\Captcha\CaptchaInterface;
 use phpMyFAQ\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
 
 final class CaptchaController extends AbstractController
 {
     public function __construct(
-        private readonly Captcha $captcha,
+        private readonly CaptchaInterface $captcha,
     ) {
         parent::__construct();
     }
@@ -38,6 +39,10 @@ public function __construct(
     #[Route(path: 'captcha', name: 'api.private.captcha', methods: ['GET'])]
     public function renderImage(): Response
     {
+        if (!$this->captcha instanceof BuiltinCaptcha) {
+            return new Response('', Response::HTTP_NOT_FOUND);
+        }
+
         $response = new Response();
         $response->setStatusCode(Response::HTTP_OK);
         $response->headers->set('Content-Type', 'image/jpeg');

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

@@ -226,7 +226,7 @@ private function getSubCategoryContent(Category $category, int $selectedCategory
 
         $currentGroups = $this->currentUser->perm->getUserGroups($this->currentUser->getUserId());
         $subCategory = new Category($this->configuration, $currentGroups, true);
-        $subCategory->setUser($this->currentUser);
+        $subCategory->setUser($this->currentUser->getUserId());
         $subCategory->transform($selectedCategoryId);
         $this->categoryHelper->setConfiguration($this->configuration)->setCategory($subCategory);
 

phpmyfaq/src/phpMyFAQ/Controller/Frontend/NewsController.php

@@ -20,7 +20,7 @@
 
 namespace phpMyFAQ\Controller\Frontend;
 
-use phpMyFAQ\Captcha\Captcha;
+use phpMyFAQ\Captcha\CaptchaInterface;
 use phpMyFAQ\Captcha\Helper\CaptchaHelper;
 use phpMyFAQ\Comments;
 use phpMyFAQ\Core\Exception;
@@ -29,7 +29,7 @@
 use phpMyFAQ\Filter;
 use phpMyFAQ\Mail;
 use phpMyFAQ\News\NewsService;
-use phpMyFAQ\Services\Gravatar;
+use phpMyFAQ\Service\Gravatar;
 use phpMyFAQ\Session\Token;
 use phpMyFAQ\Strings;
 use phpMyFAQ\Translation;
@@ -43,7 +43,7 @@ final class NewsController extends AbstractFrontController
 {
     public function __construct(
         private readonly UserSession $faqSession,
-        private readonly Captcha $captcha,
+        private readonly CaptchaInterface $captcha,
         private readonly Date $date,
         private readonly Mail $mail,
         private readonly Gravatar $gravatar,
@@ -82,6 +82,15 @@ public function index(Request $request): Response
         $newsService = new NewsService($this->configuration, $this->currentUser);
         $news = $newsService->getProcessedNews($newsId);
 
+        if ($news === []) {
+            $response = $this->render('404.twig', [
+                ...$this->getHeader($request),
+            ]);
+            $response->setStatusCode(Response::HTTP_NOT_FOUND);
+
+            return $response;
+        }
+
         $captchaHelper = CaptchaHelper::getInstance($this->configuration);
 
         $comment = new Comments($this->configuration);

phpmyfaq/src/phpMyFAQ/News/NewsService.php

@@ -57,6 +57,9 @@ public function __construct(
     public function getProcessedNews(int $newsId): array
     {
         $news = $this->news->get($newsId);
+        if ($news === []) {
+            return [];
+        }
 
         // Process content with glossary
         $news['processedContent'] = $this->processContent($news['content'] ?? '');

phpmyfaq/src/phpMyFAQ/Visits.php

@@ -67,7 +67,7 @@ public function logViews(int $faqId): void
     public function add(int $faqId): bool
     {
         $language = $this->configuration->getLanguage()->getLanguage();
-        $timestamp = Request::createFromGlobals()->server->get(key: 'REQUEST_TIME');
+        $timestamp = $this->getRequestTimestamp();
 
         // If a row already exists for this (id, lang), update it instead of inserting to avoid unique constraint errors
         if ($this->visitsRepository->exists($faqId, $language)) {
@@ -86,7 +86,7 @@ public function add(int $faqId): bool
     private function update(int $faqId): void
     {
         $language = $this->configuration->getLanguage()->getLanguage();
-        $timestamp = Request::createFromGlobals()->server->get(key: 'REQUEST_TIME');
+        $timestamp = $this->getRequestTimestamp();
 
         $this->visitsRepository->update($faqId, $language, $timestamp);
     }
@@ -106,7 +106,14 @@ public function getAllData(): array
      */
     public function resetAll(): bool
     {
-        $timestamp = Request::createFromGlobals()->server->get(key: 'REQUEST_TIME');
+        $timestamp = $this->getRequestTimestamp();
         return $this->visitsRepository->resetAll($timestamp);
     }
+
+    private function getRequestTimestamp(): int
+    {
+        $timestamp = Request::createFromGlobals()->server->get(key: 'REQUEST_TIME');
+
+        return is_int($timestamp) ? $timestamp : time();
+    }
 }

tests/phpMyFAQ/Command/UpdateCommandTest.php

@@ -4,6 +4,7 @@
 
 use DateTime;
 use phpMyFAQ\Configuration;
+use phpMyFAQ\Database\Sqlite3;
 use phpMyFAQ\System;
 use PHPUnit\Framework\Attributes\AllowMockObjectsWithoutExpectations;
 use PHPUnit\Framework\TestCase;
@@ -27,6 +28,10 @@ protected function setUp(): void
     {
         parent::setUp();
 
+        $dbHandle = new Sqlite3();
+        $dbHandle->connect(PMF_TEST_DIR . '/test.db', '', '');
+        new Configuration($dbHandle);
+
         $this->command = new UpdateCommand();
         $this->commandTester = new CommandTester($this->command);
     }

tests/phpMyFAQ/Comment/CommentsRepositoryTest.php

@@ -12,21 +12,35 @@
 use phpMyFAQ\Language;
 use PHPUnit\Framework\Attributes\AllowMockObjectsWithoutExpectations;
 use PHPUnit\Framework\TestCase;
+use ReflectionClass;
 use Symfony\Component\HttpFoundation\Session\Session;
 
 #[AllowMockObjectsWithoutExpectations]
 class CommentsRepositoryTest extends TestCase
 {
     private Configuration $configuration;
     private CommentsRepository $repository;
+    private string $databasePath;
+    private Sqlite3 $dbHandle;
+    private ?Configuration $previousConfiguration = null;
 
     protected function setUp(): void
     {
         parent::setUp();
 
-        $dbHandle = new Sqlite3();
-        $dbHandle->connect(PMF_TEST_DIR . '/test.db', '', '');
-        $this->configuration = new Configuration($dbHandle);
+        $configurationReflection = new ReflectionClass(Configuration::class);
+        $configurationProperty = $configurationReflection->getProperty('configuration');
+        $this->previousConfiguration = $configurationProperty->getValue();
+
+        $databasePath = tempnam(sys_get_temp_dir(), 'pmf-comments-repository-');
+        self::assertNotFalse($databasePath);
+        self::assertTrue(copy(PMF_TEST_DIR . '/test.db', $databasePath));
+        $this->databasePath = $databasePath;
+
+        $this->dbHandle = new Sqlite3();
+        $this->dbHandle->connect($this->databasePath, '', '');
+        $this->configuration = new Configuration($this->dbHandle);
+        $this->initializeDatabaseStatics($this->dbHandle);
         $language = new Language($this->configuration, $this->createStub(Session::class));
         $language->setLanguageFromConfiguration('en');
         $this->configuration->setLanguage($language);
@@ -36,14 +50,19 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
+        $configurationReflection = new ReflectionClass(Configuration::class);
+        $configurationProperty = $configurationReflection->getProperty('configuration');
+        $configurationProperty->setValue(null, $this->previousConfiguration);
+
+        if (isset($this->dbHandle)) {
+            $this->dbHandle->close();
+        }
+
+        if (isset($this->databasePath) && is_file($this->databasePath)) {
+            unlink($this->databasePath);
+        }
+
         parent::tearDown();
-        // Best-effort cleanup: remove comment with id_comment = 1 if exists (first insert in clean DB)
-        $this->repository->deleteByTypeAndId(CommentType::FAQ, 1);
-        // Remove potential category relation
-        $category = new Category($this->configuration);
-        $category->setLanguage('en');
-        $relation = new Relation($this->configuration, $category);
-        $relation->delete(1, 'en');
     }
 
     private function makeComment(): CommentEntity
@@ -147,4 +166,17 @@ public function testIsCommentAllowed(): void
 
         $this->assertTrue($this->repository->isCommentAllowed(1, 'en', CommentType::FAQ));
     }
+
+    private function initializeDatabaseStatics(Sqlite3 $dbHandle): void
+    {
+        $databaseReflection = new ReflectionClass(Database::class);
+
+        $databaseDriverProperty = $databaseReflection->getProperty('databaseDriver');
+        $databaseDriverProperty->setValue(null, $dbHandle);
+
+        $dbTypeProperty = $databaseReflection->getProperty('dbType');
+        $dbTypeProperty->setValue(null, 'sqlite3');
+
+        Database::setTablePrefix('');
+    }
 }

tests/phpMyFAQ/Controller/Administration/Api/CommentControllerTest.php

@@ -7,6 +7,7 @@
 use phpMyFAQ\Comments;
 use phpMyFAQ\Configuration;
 use phpMyFAQ\Core\Exception;
+use phpMyFAQ\Database\Sqlite3;
 use phpMyFAQ\Strings;
 use phpMyFAQ\Translation;
 use PHPUnit\Framework\Attributes\AllowMockObjectsWithoutExpectations;
@@ -34,7 +35,16 @@ protected function setUp(): void
             ->setCurrentLanguage('en')
             ->setMultiByteLanguage();
 
-        $this->configuration = Configuration::getConfigurationInstance();
+        $configuration = null;
+        try {
+            $configuration = Configuration::getConfigurationInstance();
+        } catch (\TypeError) {
+            $dbHandle = new Sqlite3();
+            $dbHandle->connect(PMF_TEST_DIR . '/test.db', '', '');
+            $configuration = new Configuration($dbHandle);
+        }
+
+        $this->configuration = $configuration;
         $this->comments = $this->createStub(Comments::class);
     }