Merge branch '4.0' into 'main'

CHANGELOG.md

@@ -13,18 +13,23 @@ This is a log of major user-visible changes in each phpMyFAQ release.
 - migrated from WYSIWYG editor from TinyMCE to Jodit Editor (Thorsten)
 - removed Webpack, now using Vite v6 (Thorsten)
 - migrated from Jest to vitest (Thorsten)
+- 
+### phpMyFAQ v4.0.3 - 2025-01-03
 
-### phpMyFAQ v4.0.2 - unreleased
+- fixed installation bug introduced with v4.0.2 (Thorsten)
+- fixed minor bug (Thorsten)
+
+### phpMyFAQ v4.0.2 - 2025-01-02
 
 - improved update handling of .htaccess file (Thorsten)
-- updated 3rd party dependencies (Thorsten)
+- updated third party dependencies (Thorsten)
 - fixed minor bugs (Thorsten)
 
 ### phpMyFAQ v4.0.1 - 2024-12-13
 
 - fixed security vulnerability (Thorsten)
 - improved update handling of .htaccess file (Thorsten)
-- updated 3rd party dependencies (Thorsten)
+- updated third party dependencies (Thorsten)
 - fixed minor bugs (Thorsten)
 
 ### phpMyFAQ v4.0.0 - 2024-12-06

SECURITY.md

@@ -27,4 +27,4 @@ we value the contributions of white-hat researchers in improving our security.
 
 Thank you for helping keep phpMyFAQ secure.
 
-Copyright © 2001–2025 Thorsten Rinne and the phpMyFAQ Team
+Copyright © 2001–2024 Thorsten Rinne and the phpMyFAQ Team

docker-compose.yml

@@ -28,13 +28,13 @@ services:
     volumes:
       - ./volumes/postgres:/var/lib/postgresql/data
 
-  sqlserver:
-    image: mcr.microsoft.com/mssql/server:2022-latest
-    ports:
-      - 1433:1433
-    environment:
-      SA_PASSWORD: 'phpMyFAQ-4.1'
-      ACCEPT_EULA: 'Y'
+  #sqlserver:
+  #  image: mcr.microsoft.com/mssql/server:2022-latest
+  #  ports:
+  #    - 1433:1433
+  #  environment:
+  #    SA_PASSWORD: 'phpMyFAQ-4.0'
+  #    ACCEPT_EULA: 'Y'
 
   phpmyfaq:
     build: .

phpmyfaq/assets/templates/setup/install.twig

@@ -1,4 +1,4 @@
-{% extends 'setup/base.twig' %}
+{% extends '@setup/base.twig' %}
 
 {% block content %}
 <main role="main">

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

@@ -30,6 +30,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
+use Twig\Error\LoaderError;
 
 class SetupController
 {
@@ -148,7 +149,7 @@ public function update(Request $request): Response
      * @param string[]      $templateVars
      * @param Response|null $response
      * @return Response
-     * @throws Exception
+     * @throws Exception|LoaderError
      */
     public function render(string $pathToTwigFile, array $templateVars = [], ?Response $response = null): Response
     {