From b4f04636811a771764d5893d1a8e95afa8f153d1 Mon Sep 17 00:00:00 2001
From: Thorsten Rinne <thorsten@phpmyfaq.de>
Date: Sun, 29 Dec 2024 19:44:19 +0100
Subject: [PATCH 1/6] fix: added missing check on null value for group ID

---
 phpmyfaq/admin/category.main.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpmyfaq/admin/category.main.php b/phpmyfaq/admin/category.main.php
index 81ba5c8040..2801d3af1e 100644
--- a/phpmyfaq/admin/category.main.php
+++ b/phpmyfaq/admin/category.main.php
@@ -202,7 +202,7 @@
             ->setName(Filter::filterInput(INPUT_POST, 'name', FILTER_SANITIZE_SPECIAL_CHARS))
             ->setDescription(Filter::filterInput(INPUT_POST, 'description', FILTER_SANITIZE_SPECIAL_CHARS))
             ->setUserId(Filter::filterInput(INPUT_POST, 'user_id', FILTER_VALIDATE_INT))
-            ->setGroupId(Filter::filterInput(INPUT_POST, 'group_id', FILTER_VALIDATE_INT))
+            ->setGroupId(Filter::filterInput(INPUT_POST, 'group_id', FILTER_VALIDATE_INT) ?? -1)
             ->setActive(Filter::filterInput(INPUT_POST, 'active', FILTER_VALIDATE_INT))
             ->setImage($image)
             ->setShowHome(Filter::filterInput(INPUT_POST, 'show_home', FILTER_VALIDATE_INT));

From 527e14ae088401b990587d04b1cd45af6b0557ec Mon Sep 17 00:00:00 2001
From: Thorsten Rinne <thorsten@phpmyfaq.de>
Date: Mon, 30 Dec 2024 19:21:59 +0100
Subject: [PATCH 2/6] build: removed hard x86-64 dependency, updated xdebug

---
 Dockerfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2cb3b54f88..c929f21c13 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,7 +24,6 @@ RUN set -x \
  && buildDeps="libldap2-dev" \
  && apt-get update && apt-get install -y ${buildDeps} --no-install-recommends \
  \
- && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \
  && docker-php-ext-install ldap \
  \
  && apt-get purge -y ${buildDeps} \
@@ -59,8 +58,8 @@ RUN set -ex \
  && rm -rf /var/lib/apt/lists/*
 
 #=== Install xdebug PHP dependencies ===
-RUN pecl install xdebug-3.4.0beta1  \
-    && docker-php-ext-enable xdebug
+RUN pecl install xdebug-3.4.0  \
+&& docker-php-ext-enable xdebug
 
 #=== php default ===
 ENV PMF_TIMEZONE="Europe/Berlin" \

From be08db5cd80763e3466e17b8e616d662ae3c1054 Mon Sep 17 00:00:00 2001
From: Thorsten Rinne <thorsten@phpmyfaq.de>
Date: Thu, 2 Jan 2025 17:31:15 +0100
Subject: [PATCH 3/6] chore: v4.0.2 release

---
 CHANGELOG.md                     |  6 +++---
 CODE_OF_CONDUCT.md               |  2 +-
 Dockerfile                       |  4 ++--
 README.md                        |  2 +-
 SECURITY.md                      |  6 +++---
 docker-compose.yml               | 16 +++++++---------
 package.json                     |  2 +-
 phpmyfaq/src/phpMyFAQ/System.php |  2 +-
 scripts/version.sh               |  2 +-
 9 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index acf51f3c54..9b66149770 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,17 +6,17 @@
 
 This is a log of major user-visible changes in each phpMyFAQ release.
 
-### phpMyFAQ v4.0.2 - unreleased
+### 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
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index ae6289070d..c3ac4ec530 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -36,4 +36,4 @@ confidentiality with regard to the reporter of an incident.
 This Code of Conduct is adapted from the Contributor Covenant, version 1.3.0, available from
 http://contributor-covenant.org/version/1/3/0/
 
-Copyright © 2001 - 2024 Thorsten Rinne and the phpMyFAQ Team
+Copyright © 2001 - 2025 Thorsten Rinne and the phpMyFAQ Team
diff --git a/Dockerfile b/Dockerfile
index c929f21c13..0b9fd244a0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,12 @@
 #
-# This image uses a php:8.4.0RC1-apache base image and do not have any phpMyFAQ code with it.
+# This image uses a php:8.4.2-apache base image and do not have any phpMyFAQ code with it.
 # It's for development only, it's meant to be run with docker-compose
 #
 
 #####################################
 #=== Unique stage without payload ===
 #####################################
-FROM php:8.4.0RC4-apache
+FROM php:8.4.2-apache
 
 #=== Install gd PHP dependencie ===
 RUN set -x \
diff --git a/README.md b/README.md
index 681ccdc737..280ed32fa4 100644
--- a/README.md
+++ b/README.md
@@ -191,4 +191,4 @@ We're happy to help you with your questions!
 
 Mozilla Public License 2.0, see LICENSE for more information.
 
-Copyright © 2001–2024 Thorsten Rinne and the phpMyFAQ Team
+Copyright © 2001–2025 Thorsten Rinne and the phpMyFAQ Team
diff --git a/SECURITY.md b/SECURITY.md
index f2d9214155..cc7ca9994e 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -6,9 +6,9 @@ security vulnerability in phpMyFAQ, we appreciate your help in disclosing it to
 ## Supported Versions
 
 | Version | Supported | Active support / development |
-| ------- | --------- | ---------------------------- |
+| ------- | --------- |------------------------------|
 | 4.0.x   | ✓         | 2024 -                       |
-| 3.2.x   | ✓         | 2023 -                       |
+| 3.2.x   | ✓         | 2023 - 2024                  |
 | 3.1.x   | ✗         | 2022 - 2023                  |
 | 3.0.x   | ✗         | 2020 - 2022                  |
 | < 3.0   | ✗         | 2001 - 2020                  |
@@ -25,4 +25,4 @@ you or administrative action against your account if you act accordingly: White-
 
 Thank you for improving the security of phpMyFAQ.
 
-Copyright © 2001–2024 Thorsten Rinne and the phpMyFAQ Team
+Copyright © 2001–2025 Thorsten Rinne and the phpMyFAQ Team
diff --git a/docker-compose.yml b/docker-compose.yml
index 136bcd1988..6ba73dbc73 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3'
-
 # Use this file for development only
 
 services:
@@ -30,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.0'
-      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: .
diff --git a/package.json b/package.json
index 76ade63863..4e9e6db2e3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@thorsten/phpmyfaq",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "description": "phpMyFAQ",
   "repository": "git://github.com/thorsten/phpMyFAQ.git",
   "author": "Thorsten Rinne",
diff --git a/phpmyfaq/src/phpMyFAQ/System.php b/phpmyfaq/src/phpMyFAQ/System.php
index 28b049b01d..36ac26d5a4 100644
--- a/phpmyfaq/src/phpMyFAQ/System.php
+++ b/phpmyfaq/src/phpMyFAQ/System.php
@@ -47,7 +47,7 @@ class System
     /**
      * Patch level.
      */
-    private const VERSION_PATCH_LEVEL = 1;
+    private const VERSION_PATCH_LEVEL = 2;
 
     /**
      * Pre-release version.
diff --git a/scripts/version.sh b/scripts/version.sh
index 0c95481d3f..3b9b8797eb 100644
--- a/scripts/version.sh
+++ b/scripts/version.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 # Check if PMF_VERSION is not set or empty
 if [ -z "${PMF_VERSION}" ]; then
-    PMF_VERSION="4.0.1"
+    PMF_VERSION="4.0.2"
 fi

From 734e08a145ace2a4dec22f7954d74f98f26630e8 Mon Sep 17 00:00:00 2001
From: Thorsten Rinne <thorsten@phpmyfaq.de>
Date: Fri, 3 Jan 2025 08:48:57 +0100
Subject: [PATCH 4/6] fix: corrected installation bug introduced with v4.0.2,
 closes #3311

---
 CHANGELOG.md                                                  | 4 ++++
 phpmyfaq/assets/templates/setup/install.twig                  | 2 +-
 phpmyfaq/src/phpMyFAQ/Controller/Frontend/SetupController.php | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b66149770..14162c0393 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@
 
 This is a log of major user-visible changes in each phpMyFAQ release.
 
+### phpMyFAQ v4.0.3 - unreleased
+
+- fixed installation bug introduced with v4.0.2 (Thorsten)
+
 ### phpMyFAQ v4.0.2 - 2025-01-02
 
 - improved update handling of .htaccess file (Thorsten)
diff --git a/phpmyfaq/assets/templates/setup/install.twig b/phpmyfaq/assets/templates/setup/install.twig
index be6b69a653..584f9db888 100644
--- a/phpmyfaq/assets/templates/setup/install.twig
+++ b/phpmyfaq/assets/templates/setup/install.twig
@@ -1,4 +1,4 @@
-{% extends 'setup/base.twig' %}
+{% extends '@setup/base.twig' %}
 
 {% block content %}
 <main role="main">
diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Frontend/SetupController.php b/phpmyfaq/src/phpMyFAQ/Controller/Frontend/SetupController.php
index 8bc1a17aa2..53b0c13d9e 100644
--- a/phpmyfaq/src/phpMyFAQ/Controller/Frontend/SetupController.php
+++ b/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
     {

From b78d5f9c47a0b38c8a1150906c7ae07adae87dcb Mon Sep 17 00:00:00 2001
From: Thorsten Rinne <thorsten@phpmyfaq.de>
Date: Fri, 3 Jan 2025 09:38:28 +0100
Subject: [PATCH 5/6] fix: corrected check on uploaded category image

---
 phpmyfaq/admin/category.main.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpmyfaq/admin/category.main.php b/phpmyfaq/admin/category.main.php
index 2801d3af1e..ca48f52114 100644
--- a/phpmyfaq/admin/category.main.php
+++ b/phpmyfaq/admin/category.main.php
@@ -189,7 +189,7 @@
         $categoryLang = Filter::filterInput(INPUT_POST, 'catlang', FILTER_SANITIZE_SPECIAL_CHARS);
         $existingImage = Filter::filterInput(INPUT_POST, 'existing_image', FILTER_SANITIZE_SPECIAL_CHARS);
         $existingImage = is_null($existingImage) ? '' : $existingImage;
-        $image = count($uploadedFile) ? $categoryImage->getFileName(
+        $image = ($uploadedFile instanceof UploadedFile) ? $categoryImage->getFileName(
             $categoryId,
             $categoryLang
         ) : $existingImage;

From 677bbafcc31c0b38195b1022e9aba76890a14f2c Mon Sep 17 00:00:00 2001
From: Thorsten Rinne <thorsten@phpmyfaq.de>
Date: Fri, 3 Jan 2025 10:07:24 +0100
Subject: [PATCH 6/6] chore: v4.0.3 release

---
 CHANGELOG.md                     | 3 ++-
 package.json                     | 2 +-
 phpmyfaq/src/phpMyFAQ/System.php | 2 +-
 scripts/version.sh               | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14162c0393..03d1b04efe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,9 +6,10 @@
 
 This is a log of major user-visible changes in each phpMyFAQ release.
 
-### phpMyFAQ v4.0.3 - unreleased
+### phpMyFAQ v4.0.3 - 2025-01-03
 
 - fixed installation bug introduced with v4.0.2 (Thorsten)
+- fixed minor bug (Thorsten)
 
 ### phpMyFAQ v4.0.2 - 2025-01-02
 
diff --git a/package.json b/package.json
index 4e9e6db2e3..44a740277e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@thorsten/phpmyfaq",
-  "version": "4.0.2",
+  "version": "4.0.3",
   "description": "phpMyFAQ",
   "repository": "git://github.com/thorsten/phpMyFAQ.git",
   "author": "Thorsten Rinne",
diff --git a/phpmyfaq/src/phpMyFAQ/System.php b/phpmyfaq/src/phpMyFAQ/System.php
index 36ac26d5a4..ad741a7ace 100644
--- a/phpmyfaq/src/phpMyFAQ/System.php
+++ b/phpmyfaq/src/phpMyFAQ/System.php
@@ -47,7 +47,7 @@ class System
     /**
      * Patch level.
      */
-    private const VERSION_PATCH_LEVEL = 2;
+    private const VERSION_PATCH_LEVEL = 3;
 
     /**
      * Pre-release version.
diff --git a/scripts/version.sh b/scripts/version.sh
index 3b9b8797eb..45c8048e1e 100644
--- a/scripts/version.sh
+++ b/scripts/version.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 # Check if PMF_VERSION is not set or empty
 if [ -z "${PMF_VERSION}" ]; then
-    PMF_VERSION="4.0.2"
+    PMF_VERSION="4.0.3"
 fi