Skip to content

Commit 3b4889a

Browse files
committed
chore: actually suport Symfony 8
1 parent 62a1c63 commit 3b4889a

28 files changed

+443
-107
lines changed

.github/workflows/phpunit.yml

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
fail-fast: false
2828
matrix:
2929
php: [ 8.2, 8.3, 8.4 ]
30-
symfony: [ 6.4.*, 7.3.*, 8.0.*-dev ]
30+
symfony: [ 6.4.*, 7.4.*, 8.0.* ]
3131
database: [ mysql|mongo ]
3232
phpunit: [ 11, 12 ]
3333
use-php-84-lazy-objects: [ 1 ]
@@ -41,37 +41,40 @@ jobs:
4141
- {php: 8.3, phpunit: 11}
4242
- {php: 8.4, phpunit: 11}
4343

44+
- {php: 8.2, symfony: 8.0.*}
45+
- {php: 8.3, symfony: 8.0.*}
46+
4447
include:
4548
# php 8.1
4649
- {php: 8.1, symfony: 6.4.*, phpunit: 9, database: mysql}
4750

4851
# old PHPUnit versions
49-
- {php: 8.3, symfony: '*', phpunit: 9, database: mysql}
50-
- {php: 8.4, symfony: '*', phpunit: 10, database: mysql}
51-
- {php: 8.4, symfony: '*', phpunit: 11, database: mysql}
52+
- {php: 8.3, symfony: 7.4.*, phpunit: 9, database: mysql}
53+
- {php: 8.4, symfony: 7.4.*, phpunit: 10, database: mysql}
54+
- {php: 8.4, symfony: 7.4.*, phpunit: 11, database: mysql}
5255

5356
# test with no database (PHPUnit 9 is used to prevent some problems with empty data providers)
54-
- {php: 8.3, symfony: '*', phpunit: 9, database: none}
55-
- {php: 8.3, symfony: '*', phpunit: 9, database: none, deps: lowest}
57+
- {php: 8.3, symfony: 7.4.*, phpunit: 9, database: none}
58+
- {php: 8.3, symfony: 7.4.*, phpunit: 9, database: none, deps: lowest}
5659

5760
# One permutation per DBMS
58-
- {php: 8.4, symfony: '*', phpunit: 12, database: mongo}
59-
- {php: 8.4, symfony: '*', phpunit: 12, database: pgsql}
60-
- {php: 8.4, symfony: '*', phpunit: 12, database: sqlite}
61-
- {php: 8.4, symfony: '*', phpunit: 12, database: mysql}
61+
- {php: 8.4, symfony: 7.4.*, phpunit: 12, database: mongo}
62+
- {php: 8.4, symfony: 7.4.*, phpunit: 12, database: pgsql}
63+
- {php: 8.4, symfony: 7.4.*, phpunit: 12, database: sqlite}
64+
- {php: 8.4, symfony: 7.4.*, phpunit: 12, database: mysql}
6265

6366
# lowest deps (one per DBMS)
64-
- {php: 8.3, symfony: '*', phpunit: 9, database: mysql|mongo, deps: lowest}
65-
- {php: 8.3, symfony: '*', phpunit: 9, database: mongo, deps: lowest}
66-
- {php: 8.3, symfony: '*', phpunit: 9, database: pgsql, deps: lowest}
67-
- {php: 8.3, symfony: '*', phpunit: 9, database: sqlite, deps: lowest}
68-
- {php: 8.3, symfony: '*', phpunit: 9, database: mysql, deps: lowest}
67+
- {php: 8.3, symfony: 7.4.*, phpunit: 9, database: mysql|mongo, deps: lowest}
68+
- {php: 8.3, symfony: 7.4.*, phpunit: 9, database: mongo, deps: lowest}
69+
- {php: 8.3, symfony: 7.4.*, phpunit: 9, database: pgsql, deps: lowest}
70+
- {php: 8.3, symfony: 7.4.*, phpunit: 9, database: sqlite, deps: lowest}
71+
- {php: 8.3, symfony: 7.4.*, phpunit: 9, database: mysql, deps: lowest}
6972

7073
# using Foundry's PHPUnit extension
71-
- {php: 8.4, symfony: '*', phpunit: 12, database: mysql|mongo, use-phpunit-extension: 1}
74+
- {php: 8.4, symfony: 7.4.*, phpunit: 12, database: mysql|mongo, use-phpunit-extension: 1}
7275

7376
# disable lazy objects in PHP 8.4
74-
- {php: 8.4, symfony: '*', phpunit: 12, database: mysql|mongo, use-php-84-lazy-objects: 0}
77+
- {php: 8.4, symfony: 7.4.*, phpunit: 12, database: mysql|mongo, use-php-84-lazy-objects: 0}
7578
env:
7679
DATABASE_URL: ${{ contains(matrix.database, 'mysql') && 'mysql://root:root@localhost:3306/foundry?serverVersion=5.7.42' || contains(matrix.database, 'pgsql') && 'postgresql://root:root@localhost:5432/foundry?serverVersion=15' || contains(matrix.database, 'sqlite') && 'sqlite:///%kernel.project_dir%/var/data.db' || '' }}
7780
MONGO_URL: ${{ contains(matrix.database, 'mongo') && 'mongodb://127.0.0.1:27017/dbName?compressors=disabled&gssapiServiceName=mongodb' || '' }}
@@ -181,7 +184,7 @@ jobs:
181184
dependency-versions: ${{ matrix.deps }}
182185
composer-options: --prefer-dist
183186
env:
184-
SYMFONY_REQUIRE: 7.3.*
187+
SYMFONY_REQUIRE: 7.4.*
185188

186189
- name: Set up MySQL
187190
if: contains(matrix.database, 'mysql')
@@ -232,8 +235,7 @@ jobs:
232235
233236
- name: Test
234237
run: |
235-
vendor/bin/phpunit tests/Unit
236-
238+
vendor/bin/phpunit tests/Unit --exclude-group legacy-proxy
237239
238240
test-with-paratest:
239241
name: Test with paratest
@@ -264,7 +266,7 @@ jobs:
264266
dependency-versions: highest
265267
composer-options: --prefer-dist
266268
env:
267-
SYMFONY_REQUIRE: 7.3.*
269+
SYMFONY_REQUIRE: 7.4.*
268270

269271
- name: Set up MySQL
270272
run: sudo /etc/init.d/mysql start
@@ -285,7 +287,7 @@ jobs:
285287
MONGO_URL: mongodb://127.0.0.1:27017/dbName?compressors=disabled&gssapiServiceName=mongodb
286288
USE_DAMA_DOCTRINE_TEST_BUNDLE: 1
287289
USE_FOUNDRY_PHPUNIT_EXTENSION: 1
288-
PHPUNIT_VERSION: 11
290+
PHPUNIT_VERSION: 12
289291
services:
290292
mongo:
291293
image: mongo:4
@@ -311,7 +313,7 @@ jobs:
311313
- name: Setup PHP
312314
uses: shivammathur/setup-php@v2
313315
with:
314-
php-version: 8.2
316+
php-version: 8.4
315317
coverage: xdebug
316318
ini-values: xdebug.mode=coverage
317319

.github/workflows/static-analysis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,14 @@ jobs:
3535
with:
3636
php-version: 8.4
3737
coverage: none
38+
tools: flex
3839

3940
- name: Install dependencies
4041
uses: ramsey/composer-install@v2
4142
with:
4243
composer-options: --prefer-dist
44+
env:
45+
SYMFONY_REQUIRE: 7.4.*
4346

4447
- name: Install PHPStan
4548
run: composer bin phpstan install
@@ -78,7 +81,7 @@ jobs:
7881
uses: zenstruck/.github/.github/workflows/php-composer-validate.yml@main
7982

8083
composer-validate-psr:
81-
name: PhpStan
84+
name: Validate PSR-4
8285
runs-on: ubuntu-latest
8386
steps:
8487
- name: Checkout code

bin/tools/phpstan/composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"phpstan/phpstan-symfony": "^2.0",
66
"phpstan/extension-installer": "^1.2",
77
"phpstan/phpstan-doctrine": "^2.0",
8-
"phpstan/phpstan-phpunit": "^2.0"
8+
"phpstan/phpstan-phpunit": "^2.0",
9+
"symfony/var-exporter": "^7"
910
},
1011
"config": {
1112
"allow-plugins": {

bin/tools/phpstan/composer.lock

Lines changed: 160 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"dama/doctrine-test-bundle": "^8.0",
3131
"doctrine/collections": "^1.7|^2.0",
3232
"doctrine/common": "^3.2.2",
33-
"doctrine/doctrine-bundle": "^2.10",
33+
"doctrine/doctrine-bundle": "^2.10|^3.0|3.1.x-dev",
3434
"doctrine/doctrine-migrations-bundle": "^2.2|^3.0",
3535
"doctrine/mongodb-odm": "^2.4",
3636
"doctrine/mongodb-odm-bundle": "^4.6|^5.0",
@@ -40,7 +40,7 @@
4040
"symfony/browser-kit": "^6.4|^7.0|^8.0",
4141
"symfony/console": "^6.4|^7.0|^8.0",
4242
"symfony/dotenv": "^6.4|^7.0|^8.0",
43-
"symfony/event-dispatcher": "^6.4|^7.0",
43+
"symfony/event-dispatcher": "^6.4|^7.0|^8.0",
4444
"symfony/framework-bundle": "^6.4|^7.0|^8.0",
4545
"symfony/maker-bundle": "^1.55",
4646
"symfony/phpunit-bridge": "^6.4|^7.0|^8.0",

0 commit comments

Comments
 (0)