Skip to content

Commit d5e22e9

Browse files
chore: update CI matrix + dependencies (#159)
1 parent 4091a5c commit d5e22e9

File tree

3 files changed

+36
-49
lines changed

3 files changed

+36
-49
lines changed

.github/workflows/ci.yml

Lines changed: 19 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -24,43 +24,34 @@ jobs:
2424
matrix:
2525
php:
2626
# Only PHP supported versions: https://www.php.net/supported-versions.php
27-
- '8.1'
2827
- '8.2'
2928
- '8.3'
3029
- '8.4'
30+
- '8.5'
3131
symfony:
3232
# Only Symfony supported versions: https://symfony.com/releases
3333
- '6.4.*'
34-
- '7.1.*'
35-
- '7.2.*'
34+
- '7.4.*'
35+
- '8.0.*'
3636
api-platform:
37-
- '^3.4'
38-
- '^4.0'
37+
# Only API Platform supported versions: https://api-platform.com/docs/extra/releases/#the-release-process
3938
- '^4.1'
39+
- '^4.2'
4040
include:
41-
- phpunit: 'phpunit.xml.dist'
42-
- php: '8.1'
43-
phpunit: 'phpunit-legacy.xml.dist'
44-
- php: '8.4'
45-
symfony: '7.2.*'
46-
api-platform: '^4.1'
41+
- php: '8.5'
42+
symfony: '8.0.*'
43+
api-platform: '^4.2'
4744
bootable: true
4845
quality: true
4946
exclude:
5047
# Symfony 7 requires PHP 8.2
51-
- php: '8.1'
52-
symfony: '7.1.*'
5348
- php: '8.2'
54-
symfony: '7.1.*'
55-
- php: '8.1'
56-
symfony: '7.2.*'
49+
symfony: '7.4.*'
50+
# Symfony 8 requires PHP 8.4
5751
- php: '8.2'
58-
symfony: '7.2.*'
59-
# API Platform 4 requires PHP 8.2
60-
- php: '8.1'
61-
api-platform: '^4.0'
62-
- php: '8.1'
63-
api-platform: '^4.1'
52+
symfony: '8.0.*'
53+
- php: '8.3'
54+
symfony: '8.0.*'
6455
fail-fast: false
6556
steps:
6657
- name: Checkout
@@ -81,24 +72,22 @@ jobs:
8172
restore-keys: ${{ runner.os }}-composer-
8273
- name: Configure Symfony
8374
run: composer config extra.symfony.require "${{ matrix.symfony }}"
84-
- name: Configure API Platform 3.4
85-
if: ${{ matrix.api-platform == '^3.4' }}
86-
run: composer require --dev "api-platform/core:${{ matrix.api-platform }}"
87-
- name: Configure API Platform > 3.4
88-
if: ${{ matrix.api-platform != '^3.4' }}
75+
- name: Configure API Platform
8976
run: composer require --dev "api-platform/openapi:${{ matrix.api-platform }}" "api-platform/symfony:${{ matrix.api-platform }}" "api-platform/doctrine-orm:${{ matrix.api-platform }}"
9077
- name: Update project dependencies
9178
run: composer update --no-progress --ansi --prefer-stable --prefer-dist --no-scripts
9279
- name: Run PHPUnit tests
93-
run: vendor/bin/phpunit --colors=always --testdox -c ${{ matrix.phpunit }}
80+
run: vendor/bin/phpunit --colors=always --testdox
81+
- name: Install Behat
82+
run: composer global require behat/behat
9483
- name: Run Behat tests
9584
run: |
9685
mkdir -p features/app/cache/test/doctrine/orm/Proxies features/app/logs
97-
vendor/bin/behat
86+
$(composer config -g home)/vendor/bin/behat
9887
- name: Run Behat tests with jms/serializer-bundle
9988
run: |
10089
mkdir -p features/app/cache/jmsserializer/doctrine/orm/Proxies features/app/logs
101-
vendor/bin/behat -p jmsserializer
90+
$(composer config -g home)/vendor/bin/behat -p jmsserializer
10291
- name: Run php-cs-fixer tests
10392
if: matrix.quality
10493
env:

composer.json

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,35 +17,34 @@
1717
],
1818
"require": {
1919
"php": ">=8.1",
20-
"symfony/config": "^5.1 || ^6.0 || ^7.0",
21-
"symfony/dependency-injection": "^5.1 || ^6.0 || ^7.0",
22-
"symfony/event-dispatcher": "^5.1 || ^6.0 || ^7.0",
23-
"symfony/http-foundation": "^5.1 || ^6.0 || ^7.0",
24-
"symfony/http-kernel": "^5.1.5 || ^6.0 || ^7.0",
25-
"symfony/serializer": "^5.1 || ^6.0 || ^7.0"
20+
"symfony/config": "^5.1 || ^6.0 || ^7.0 || ^8.0",
21+
"symfony/dependency-injection": "^5.1 || ^6.0 || ^7.0 || ^8.0",
22+
"symfony/event-dispatcher": "^5.1 || ^6.0 || ^7.0 || ^8.0",
23+
"symfony/http-foundation": "^5.1 || ^6.0 || ^7.0 || ^8.0",
24+
"symfony/http-kernel": "^5.1.5 || ^6.0 || ^7.0 || ^8.0",
25+
"symfony/serializer": "^5.1 || ^6.0 || ^7.0 || ^8.0"
2626
},
2727
"require-dev": {
2828
"ext-json": "*",
29-
"behat/behat": "^3.1",
3029
"dg/bypass-finals": "^1.1",
3130
"doctrine/data-fixtures": "^1.2 || ^2.0",
32-
"doctrine/doctrine-bundle": "^2.11",
31+
"doctrine/doctrine-bundle": "^2.11 || ^3.0",
3332
"doctrine/orm": "^2.6.3 || ^3.0",
3433
"friends-of-behat/symfony-extension": "^2.0.11 || ^2.1.0",
3534
"jms/serializer-bundle": "^1.4 || ^2.3 || ^3.0 || ^4.0 || ^5.0",
3635
"laminas/laminas-code": "^3.4 || ^4.0",
3736
"ocramius/proxy-manager": "^2.0.4",
3837
"phpunit/phpunit": "^10.0 || ^11.0 || ^12.0",
39-
"symfony/asset": "^5.1 || ^6.0 || ^7.0",
40-
"symfony/browser-kit": "^5.1 || ^6.0 || ^7.0",
41-
"symfony/framework-bundle": "^5.1 || ^6.0 || ^7.0",
42-
"symfony/mailer": "^5.1 || ^6.0 || ^7.0",
43-
"symfony/property-access": "^5.1 || ^6.0 || ^7.0",
44-
"symfony/security-bundle": "^5.1 || ^6.0 || ^7.0",
45-
"symfony/stopwatch": "^5.1 || ^6.0 || ^7.0",
46-
"symfony/templating": "^5.1 || ^6.0 || ^7.0",
47-
"symfony/twig-bundle": "^5.1 || ^6.0 || ^7.0",
48-
"symfony/var-dumper": "^5.1 || ^6.0 || ^7.0"
38+
"symfony/asset": "^5.1 || ^6.0 || ^7.0 || ^8.0",
39+
"symfony/browser-kit": "^5.1 || ^6.0 || ^7.0 || ^8.0",
40+
"symfony/framework-bundle": "^5.1 || ^6.0 || ^7.0 || ^8.0",
41+
"symfony/mailer": "^5.1 || ^6.0 || ^7.0 || ^8.0",
42+
"symfony/property-access": "^5.1 || ^6.0 || ^7.0 || ^8.0",
43+
"symfony/security-bundle": "^5.1 || ^6.0 || ^7.0 || ^8.0",
44+
"symfony/stopwatch": "^5.1 || ^6.0 || ^7.0 || ^8.0",
45+
"symfony/templating": "^5.1 || ^6.0 || ^7.0 || ^8.0",
46+
"symfony/twig-bundle": "^5.1 || ^6.0 || ^7.0 || ^8.0",
47+
"symfony/var-dumper": "^5.1 || ^6.0 || ^7.0 || ^8.0"
4948
},
5049
"suggest": {
5150
"doctrine/doctrine-bundle": "To connect with Doctrine in Symfony project",

features/app/AppKernel.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ protected function configureContainer($container, LoaderInterface $loader): void
164164
'charset' => 'UTF8',
165165
],
166166
'orm' => [
167-
'auto_generate_proxy_classes' => true,
168167
'naming_strategy' => 'doctrine.orm.naming_strategy.underscore',
169168
'auto_mapping' => true,
170169
'mappings' => [

0 commit comments

Comments
 (0)