Skip to content

Commit 69f4f80

Browse files
committed
Merge branch '4.0' into 'main'
2 parents 2acc2ea + 677bbaf commit 69f4f80

File tree

5 files changed

+19
-13
lines changed

5 files changed

+19
-13
lines changed

CHANGELOG.md

+8-3
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,23 @@ This is a log of major user-visible changes in each phpMyFAQ release.
1313
- migrated from WYSIWYG editor from TinyMCE to Jodit Editor (Thorsten)
1414
- removed Webpack, now using Vite v6 (Thorsten)
1515
- migrated from Jest to vitest (Thorsten)
16+
-
17+
### phpMyFAQ v4.0.3 - 2025-01-03
1618

17-
### phpMyFAQ v4.0.2 - unreleased
19+
- fixed installation bug introduced with v4.0.2 (Thorsten)
20+
- fixed minor bug (Thorsten)
21+
22+
### phpMyFAQ v4.0.2 - 2025-01-02
1823

1924
- improved update handling of .htaccess file (Thorsten)
20-
- updated 3rd party dependencies (Thorsten)
25+
- updated third party dependencies (Thorsten)
2126
- fixed minor bugs (Thorsten)
2227

2328
### phpMyFAQ v4.0.1 - 2024-12-13
2429

2530
- fixed security vulnerability (Thorsten)
2631
- improved update handling of .htaccess file (Thorsten)
27-
- updated 3rd party dependencies (Thorsten)
32+
- updated third party dependencies (Thorsten)
2833
- fixed minor bugs (Thorsten)
2934

3035
### phpMyFAQ v4.0.0 - 2024-12-06

SECURITY.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ we value the contributions of white-hat researchers in improving our security.
2727

2828
Thank you for helping keep phpMyFAQ secure.
2929

30-
Copyright © 2001–2025 Thorsten Rinne and the phpMyFAQ Team
30+
Copyright © 2001–2024 Thorsten Rinne and the phpMyFAQ Team

docker-compose.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ services:
2828
volumes:
2929
- ./volumes/postgres:/var/lib/postgresql/data
3030

31-
sqlserver:
32-
image: mcr.microsoft.com/mssql/server:2022-latest
33-
ports:
34-
- 1433:1433
35-
environment:
36-
SA_PASSWORD: 'phpMyFAQ-4.1'
37-
ACCEPT_EULA: 'Y'
31+
#sqlserver:
32+
# image: mcr.microsoft.com/mssql/server:2022-latest
33+
# ports:
34+
# - 1433:1433
35+
# environment:
36+
# SA_PASSWORD: 'phpMyFAQ-4.0'
37+
# ACCEPT_EULA: 'Y'
3838

3939
phpmyfaq:
4040
build: .

phpmyfaq/assets/templates/setup/install.twig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends 'setup/base.twig' %}
1+
{% extends '@setup/base.twig' %}
22

33
{% block content %}
44
<main role="main">

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
use Symfony\Component\HttpFoundation\Request;
3131
use Symfony\Component\HttpFoundation\Response;
3232
use Symfony\Component\Routing\Annotation\Route;
33+
use Twig\Error\LoaderError;
3334

3435
class SetupController
3536
{
@@ -148,7 +149,7 @@ public function update(Request $request): Response
148149
* @param string[] $templateVars
149150
* @param Response|null $response
150151
* @return Response
151-
* @throws Exception
152+
* @throws Exception|LoaderError
152153
*/
153154
public function render(string $pathToTwigFile, array $templateVars = [], ?Response $response = null): Response
154155
{

0 commit comments

Comments
 (0)