Skip to content

Commit

Permalink
Add Symfony 6.4 to CI and remove configuration deprecations from func…
Browse files Browse the repository at this point in the history
…tional tests
  • Loading branch information
niels-nijens committed Mar 19, 2024
1 parent dbb62b9 commit 81c76c6
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 3 deletions.
14 changes: 12 additions & 2 deletions .github/workflows/continuous-integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'
Expand All @@ -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'
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions tests/Functional/App/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 81c76c6

Please sign in to comment.