From 81c76c6652c99cf657c1d9317ecea70e49517dae Mon Sep 17 00:00:00 2001
From: Niels Nijens <nn@ehvg.nl>
Date: Tue, 19 Mar 2024 14:33:29 +0100
Subject: [PATCH] Add Symfony 6.4 to CI and remove configuration deprecations
 from functional tests

---
 .github/workflows/continuous-integration.yaml | 14 ++++++++++++--
 Makefile                                      |  2 +-
 tests/Functional/App/config.yaml              |  7 +++++++
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml
index c457a83..0e0c4c1 100755
--- a/.github/workflows/continuous-integration.yaml
+++ b/.github/workflows/continuous-integration.yaml
@@ -9,8 +9,8 @@ jobs:
 
         strategy:
             matrix:
-                php-version: ['7.4', '8.0', '8.1', '8.2']
-                symfony-version: ['4.4', '5.0', '5.1', '5.2', '5.3', '5.4', '6.0', '6.1', '6.2', '6.3']
+                php-version: ['7.4', '8.0', '8.1', '8.2', '8.3']
+                symfony-version: ['4.4', '5.0', '5.1', '5.2', '5.3', '5.4', '6.0', '6.1', '6.2', '6.3', '6.4']
                 test-options: ['']
                 coverage: [false]
                 include:
@@ -29,6 +29,8 @@ jobs:
                       symfony-version: '6.2'
                     - php-version: '7.4'
                       symfony-version: '6.3'
+                    - php-version: '7.4'
+                      symfony-version: '6.4'
                     - php-version: '8.0'
                       symfony-version: '5.0'
                     - php-version: '8.0'
@@ -37,6 +39,8 @@ jobs:
                       symfony-version: '6.2'
                     - php-version: '8.0'
                       symfony-version: '6.3'
+                    - php-version: '8.0'
+                      symfony-version: '6.4'
                     - php-version: '8.1'
                       symfony-version: '5.0'
                     - php-version: '8.1'
@@ -49,6 +53,12 @@ jobs:
                       symfony-version: '5.1'
                     - php-version: '8.2'
                       symfony-version: '5.2'
+                    - php-version: '8.3'
+                      symfony-version: '5.0'
+                    - php-version: '8.3'
+                      symfony-version: '5.1'
+                    - php-version: '8.3'
+                      symfony-version: '5.2'
 
         steps:
             - uses: actions/checkout@v4
diff --git a/Makefile b/Makefile
index 6af294b..b7ba1c0 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ ifndef version
 	@exit 1
 endif
 
-ifeq ($(filter $(version),5.3 5.4 6.0 6.1 6.2 6.3),)
+ifeq ($(filter $(version),5.3 5.4 6.0 6.1 6.2 6.3 6.4),)
 	sed -i -e "s/\(\s\+\)# \(storage_id:\)/\1\2/" tests/Functional/App/config.yaml
 	sed -i -e "s/\(\s\+\)\(storage_factory_id:\)/\1# \2/" tests/Functional/App/config.yaml
 endif
diff --git a/tests/Functional/App/config.yaml b/tests/Functional/App/config.yaml
index 8faf4a7..6cc3945 100644
--- a/tests/Functional/App/config.yaml
+++ b/tests/Functional/App/config.yaml
@@ -15,9 +15,16 @@ framework:
         # storage_id: session.storage.mock_file
         storage_factory_id: session.storage.factory.mock_file
 
+        cookie_secure: auto
+        cookie_samesite: lax
+
     profiler:
         collect: false
 
+    handle_all_throwables: false # Changing this to true causes failing tests. Needs investigation.
+    php_errors:
+      log: true
+
 services:
     logger:
         class: Symfony\Component\HttpKernel\Log\Logger