Skip to content

Commit 0f54009

Browse files
committed
test GH actions changes
1 parent 5f778cb commit 0f54009

File tree

4 files changed

+34
-19
lines changed

4 files changed

+34
-19
lines changed

.github/workflows/test.yaml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@ jobs:
3030
strategy:
3131
matrix:
3232
php-version:
33-
- '8.1'
3433
- '8.2'
3534
- '8.3'
3635
- '8.4'
36+
- '8.5'
3737
dependencies: [highest]
3838
allowed-to-fail: [false]
3939
symfony-require: ['']
4040
variant: [normal]
4141
include:
42-
- php-version: '8.1'
42+
- php-version: '8.2'
4343
dependencies: lowest
4444
allowed-to-fail: false
4545
variant: normal
@@ -52,12 +52,17 @@ jobs:
5252
dependencies: highest
5353
allowed-to-fail: false
5454
symfony-require: 7.1.*
55-
variant: symfony/symfony:"7.1.*"
56-
- php-version: '8.4'
55+
variant: symfony/symfony:"7.3.*"
56+
- php-version: '8.5'
57+
dependencies: highest
58+
allowed-to-fail: false
59+
symfony-require: 7.4.*
60+
variant: symfony/symfony:"7.4.*"
61+
- php-version: '8.5'
5762
dependencies: highest
5863
allowed-to-fail: false
59-
symfony-require: 7.2.*
60-
variant: symfony/symfony:"7.2.*"
64+
symfony-require: 8.0.*
65+
variant: symfony/symfony:"8.0.*"
6166

6267
steps:
6368
- name: Checkout
@@ -73,6 +78,10 @@ jobs:
7378
- name: Add PHPUnit matcher
7479
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
7580

81+
- name: Remove psalm
82+
if: matrix.symfony-require == '8.0.*'
83+
run: composer remove vimeo/psalm psalm/plugin-symfony psalm/plugin-phpunit --dev --no-update
84+
7685
- name: Install variant
7786
if: matrix.variant != 'normal' && !startsWith(matrix.variant, 'symfony/symfony')
7887
run: composer require ${{ matrix.variant }} --no-update

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ phpunit.xml
1111
phpstan.neon
1212
/.phpunit.result.cache
1313
/docs/_build/
14+
tests/App/config/reference.php

composer.json

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,33 +21,39 @@
2121
],
2222
"homepage": "https://docs.sonata-project.org/projects/twig-extensions",
2323
"require": {
24-
"php": "^8.1",
25-
"symfony/config": "^6.4 || ^7.1",
26-
"symfony/twig-bridge": "^6.4 || ^7.1",
24+
"php": "^8.2",
25+
"symfony/config": "^6.4 || ^7.3 || ^8.0",
26+
"symfony/twig-bridge": "^6.4 || ^7.3 || ^8.0",
2727
"twig/twig": "^3.13"
2828
},
2929
"require-dev": {
3030
"friendsofphp/php-cs-fixer": "^3.4",
3131
"matthiasnoback/symfony-config-test": "^6.1",
32-
"matthiasnoback/symfony-dependency-injection-test": "^6.1",
32+
"matthiasnoback/symfony-dependency-injection-test": "dev-ci-updates as 6.1.0.1",
3333
"phpstan/extension-installer": "^1.0",
3434
"phpstan/phpstan": "^1.0 || ^2.0",
3535
"phpstan/phpstan-phpunit": "^1.0 || ^2.0",
3636
"phpstan/phpstan-strict-rules": "^1.0 || ^2.0",
3737
"phpstan/phpstan-symfony": "^1.0 || ^2.0",
38-
"phpunit/phpunit": "^10.5.54 || ^11.5.38 || ^12.3.10",
38+
"phpunit/phpunit": "^11.5.38 || ^12.3.10",
3939
"psalm/plugin-phpunit": "^0.18 || ^0.19",
4040
"psalm/plugin-symfony": "^5.0",
4141
"rector/rector": "^1.1 || ^2.0",
42-
"symfony/browser-kit": "^6.4 || ^7.1",
43-
"symfony/dependency-injection": "^6.4 || ^7.1",
44-
"symfony/framework-bundle": "^6.4 || ^7.1",
45-
"symfony/http-foundation": "^6.4 || ^7.1",
46-
"symfony/http-kernel": "^6.4 || ^7.1",
47-
"symfony/translation": "^6.4 || ^7.1",
48-
"symfony/twig-bundle": "^6.4 || ^7.1",
42+
"symfony/browser-kit": "^6.4 || ^7.3 || ^8.0",
43+
"symfony/dependency-injection": "^6.4 || ^7.3 || ^8.0",
44+
"symfony/framework-bundle": "^6.4 || ^7.3 || ^8.0",
45+
"symfony/http-foundation": "^6.4 || ^7.3 || ^8.0",
46+
"symfony/http-kernel": "^6.4 || ^7.3 || ^8.0",
47+
"symfony/translation": "^6.4 || ^7.3 || ^8.0",
48+
"symfony/twig-bundle": "^6.4 || ^7.3 || ^8.0",
4949
"vimeo/psalm": "^5.0 || ^6.10"
5050
},
51+
"repositories": [
52+
{
53+
"type": "git",
54+
"url": "git@github.com:mbabker/SymfonyDependencyInjectionTest.git"
55+
}
56+
],
5157
"minimum-stability": "dev",
5258
"prefer-stable": true,
5359
"autoload": {

tests/App/AppKernel.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ protected function configureContainer(ContainerBuilder $containerBuilder, Loader
7373

7474
$containerBuilder->loadFromExtension('twig', [
7575
'strict_variables' => '%kernel.debug%',
76-
'exception_controller' => null,
7776
'paths' => ['%kernel.project_dir%/templates'],
7877
]);
7978
}

0 commit comments

Comments
 (0)