Skip to content

Commit 22332ba

Browse files
Merge pull request #371 from api-platform/fix/e2e-tests
2 parents d6fd0a4 + 2897cc6 commit 22332ba

29 files changed

+3565
-3291
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
run: docker compose exec -T php bin/console -e test doctrine:migrations:migrate --no-interaction
6565
-
6666
name: Run PHPUnit
67-
run: docker compose exec -T php bin/phpunit
67+
run: docker compose exec -T php vendor/bin/phpunit
6868
-
6969
name: Doctrine Schema Validator
7070
run: docker compose exec -T php bin/console -e test doctrine:schema:validate

api/.gitignore

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
/.php-cs-fixer.cache
1616
###< friendsofphp/php-cs-fixer ###
1717

18-
###> symfony/phpunit-bridge ###
19-
.phpunit.result.cache
20-
/phpunit.xml
21-
###< symfony/phpunit-bridge ###
22-
2318
###> phpstan/phpstan ###
2419
phpstan.neon
2520
###< phpstan/phpstan ###
21+
22+
###> phpunit/phpunit ###
23+
/phpunit.xml
24+
.phpunit.result.cache
25+
###< phpunit/phpunit ###

api/bin/phpunit

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

api/composer.json

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,32 @@
1212
"doctrine/orm": "^2.17",
1313
"myclabs/php-enum": "^1.8",
1414
"nelmio/cors-bundle": "^2.4",
15-
"runtime/frankenphp-symfony": "^0.1.1",
16-
"symfony/asset": "6.4.*",
17-
"symfony/clock": "6.4.*",
18-
"symfony/console": "6.4.*",
19-
"symfony/dotenv": "6.4.*",
20-
"symfony/expression-language": "6.4.*",
15+
"runtime/frankenphp-symfony": "^0.2.0",
16+
"symfony/asset": "7.0.*",
17+
"symfony/clock": "7.0.*",
18+
"symfony/console": "7.0.*",
19+
"symfony/dotenv": "7.0.*",
20+
"symfony/expression-language": "7.0.*",
2121
"symfony/flex": "^2.4",
22-
"symfony/framework-bundle": "6.4.*",
23-
"symfony/http-client": "6.4.*",
24-
"symfony/mercure-bundle": "^0.3.7",
22+
"symfony/framework-bundle": "7.0.*",
23+
"symfony/http-client": "7.0.*",
24+
"symfony/mercure-bundle": "^0.3.8",
2525
"symfony/monolog-bundle": "^3.10",
26-
"symfony/property-access": "6.4.*",
27-
"symfony/property-info": "6.4.*",
28-
"symfony/runtime": "6.4.*",
29-
"symfony/security-bundle": "6.4.*",
30-
"symfony/serializer": "6.4.*",
31-
"symfony/twig-bundle": "6.4.*",
32-
"symfony/uid": "6.4.*",
33-
"symfony/validator": "6.4.*",
34-
"symfony/yaml": "6.4.*",
26+
"symfony/property-access": "7.0.*",
27+
"symfony/property-info": "7.0.*",
28+
"symfony/runtime": "7.0.*",
29+
"symfony/security-bundle": "7.0.*",
30+
"symfony/serializer": "7.0.*",
31+
"symfony/twig-bundle": "7.0.*",
32+
"symfony/uid": "7.0.*",
33+
"symfony/validator": "7.0.*",
34+
"symfony/yaml": "7.0.*",
3535
"web-token/jwt-checker": "^3.2",
3636
"web-token/jwt-signature-algorithm-ecdsa": "^3.2",
3737
"webonyx/graphql-php": "^15.8",
3838
"zenstruck/foundry": "^1.36"
3939
},
4040
"require-dev": {
41-
"api-platform/schema-generator": "^5.2",
4241
"dama/doctrine-test-bundle": "^8.0",
4342
"justinrainbow/json-schema": "^5.2",
4443
"phpstan/extension-installer": "^1.3",
@@ -47,14 +46,14 @@
4746
"phpstan/phpstan-doctrine": "^1.3",
4847
"phpstan/phpstan-phpunit": "^1.3",
4948
"phpstan/phpstan-symfony": "^1.3",
50-
"symfony/browser-kit": "6.4.*",
51-
"symfony/css-selector": "6.4.*",
52-
"symfony/debug-bundle": "6.4.*",
49+
"phpunit/phpunit": "^10.5",
50+
"symfony/browser-kit": "7.0.*",
51+
"symfony/css-selector": "7.0.*",
52+
"symfony/debug-bundle": "7.0.*",
5353
"symfony/maker-bundle": "^1.52",
54-
"symfony/phpunit-bridge": "6.4.*",
55-
"symfony/stopwatch": "6.4.*",
56-
"symfony/var-dumper": "6.4.*",
57-
"symfony/web-profiler-bundle": "6.4.*"
54+
"symfony/stopwatch": "7.0.*",
55+
"symfony/var-dumper": "7.0.*",
56+
"symfony/web-profiler-bundle": "7.0.*"
5857
},
5958
"config": {
6059
"optimize-autoloader": true,
@@ -108,7 +107,7 @@
108107
"extra": {
109108
"symfony": {
110109
"allow-contrib": false,
111-
"require": "6.4.*",
110+
"require": "7.0.*",
112111
"docker": false
113112
}
114113
}

0 commit comments

Comments
 (0)