Skip to content

Commit ffb1acb

Browse files
authored
Update CI versions (#339)
1 parent 44877e6 commit ffb1acb

4 files changed

Lines changed: 10 additions & 37 deletions

File tree

.github/workflows/run-tests.yml

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,37 +20,27 @@ jobs:
2020

2121
strategy:
2222
matrix:
23-
php-version: ['7.2.5', '7.3', '7.4', '8.0']
23+
php-version: ['7.2.5', '7.4', '8.0', '8.1']
2424
variant: [normal]
2525
dependencies: [highest]
2626
allowed-to-fail: [true]
2727
symfony-version: [latest]
2828
include:
29-
- php-version: 7.2.5
29+
- php-version: '7.4'
3030
dependencies: highest
3131
variant: normal
3232
allowed-to-fail: false
3333
symfony-version: latest
3434
- php-version: '8.0'
3535
dependencies: highest
3636
variant: normal
37-
allowed-to-fail: true
38-
symfony-version: latest
39-
- php-version: '7.4'
40-
dependencies: highest
41-
variant: 'symfony/symfony:"4.4.*"'
4237
allowed-to-fail: false
43-
symfony-version: 4.4
44-
- php-version: '7.4'
45-
dependencies: highest
46-
variant: 'symfony/symfony:"5.1"'
47-
allowed-to-fail: false
48-
symfony-version: 5.1
49-
- php-version: '8.0'
38+
symfony-version: latest
39+
- php-version: '8.1'
5040
dependencies: highest
51-
variant: 'symfony/symfony:"6.0.*"'
41+
variant: normal
5242
allowed-to-fail: false
53-
symfony-version: 6.0
43+
symfony-version: latest
5444
steps:
5545
- name: "Checkout code"
5646
uses: actions/checkout@v2.3.3

Tests/Fixtures/app/AppKernel.php

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,9 @@ public function getLogDir(): string
6767
public function registerContainerConfiguration(LoaderInterface $loader)
6868
{
6969
$loader->load(__DIR__.'/config/'.$this->environment.'.yml');
70+
$loader->load(__DIR__.'/config/base_config.yml');
71+
$loader->load(__DIR__.'/config/disable_annotations.yml');
7072

71-
if (self::VERSION_ID >= 40400) {
72-
$loader->load(__DIR__.'/config/base_config_44.yml');
73-
} else {
74-
$loader->load(__DIR__.'/config/base_config.yml');
75-
}
76-
77-
if (self::VERSION_ID > 30200) {
78-
$loader->load(__DIR__.'/config/disable_annotations.yml');
79-
}
80-
8173
if (self::VERSION_ID < 40200 && file_exists(__DIR__.'/Resources/translations') === false) {
8274
self::recurseCopy(__DIR__.'/../translations', __DIR__.'/Resources/translations');
8375
}

Tests/Fixtures/app/config/base_config.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
framework:
22
secret: test
3-
router: { resource: "%kernel.project_dir%/app/config/routing.yml" }
3+
router: { resource: "%kernel.project_dir%/app/config/routing.yml", utf8: true }
44
test: ~
55
translator: { enabled: true }
66
validation: { enabled: false }
7+
http_method_override: false
78

89
# Twig Configuration
910
twig:

Tests/Fixtures/app/config/base_config_44.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)