Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: keycloak version #371

Merged
merged 4 commits into from
Jan 22, 2024
Merged

fix: keycloak version #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d8f76ef
fix: keycloak version
vincentchalamon Jan 15, 2024
650612e
chore: update pwa dependencies
vincentchalamon Jan 15, 2024
3480b78
chore: update api dependencies
vincentchalamon Jan 15, 2024
2897cc6
chore: migrate to phpunit 10
vincentchalamon Jan 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
run: docker compose exec -T php bin/console -e test doctrine:migrations:migrate --no-interaction
-
name: Run PHPUnit
run: docker compose exec -T php bin/phpunit
run: docker compose exec -T php vendor/bin/phpunit
-
name: Doctrine Schema Validator
run: docker compose exec -T php bin/console -e test doctrine:schema:validate
Expand Down
10 changes: 5 additions & 5 deletions api/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
/.php-cs-fixer.cache
###< friendsofphp/php-cs-fixer ###

###> symfony/phpunit-bridge ###
.phpunit.result.cache
/phpunit.xml
###< symfony/phpunit-bridge ###

###> phpstan/phpstan ###
phpstan.neon
###< phpstan/phpstan ###

###> phpunit/phpunit ###
/phpunit.xml
.phpunit.result.cache
###< phpunit/phpunit ###
19 changes: 0 additions & 19 deletions api/bin/phpunit
View file
Open in desktop

This file was deleted.

53 changes: 26 additions & 27 deletions api/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,33 +12,32 @@
"doctrine/orm": "^2.17",
"myclabs/php-enum": "^1.8",
"nelmio/cors-bundle": "^2.4",
"runtime/frankenphp-symfony": "^0.1.1",
"symfony/asset": "6.4.*",
"symfony/clock": "6.4.*",
"symfony/console": "6.4.*",
"symfony/dotenv": "6.4.*",
"symfony/expression-language": "6.4.*",
"runtime/frankenphp-symfony": "^0.2.0",
"symfony/asset": "7.0.*",
"symfony/clock": "7.0.*",
"symfony/console": "7.0.*",
"symfony/dotenv": "7.0.*",
"symfony/expression-language": "7.0.*",
"symfony/flex": "^2.4",
"symfony/framework-bundle": "6.4.*",
"symfony/http-client": "6.4.*",
"symfony/mercure-bundle": "^0.3.7",
"symfony/framework-bundle": "7.0.*",
"symfony/http-client": "7.0.*",
"symfony/mercure-bundle": "^0.3.8",
"symfony/monolog-bundle": "^3.10",
"symfony/property-access": "6.4.*",
"symfony/property-info": "6.4.*",
"symfony/runtime": "6.4.*",
"symfony/security-bundle": "6.4.*",
"symfony/serializer": "6.4.*",
"symfony/twig-bundle": "6.4.*",
"symfony/uid": "6.4.*",
"symfony/validator": "6.4.*",
"symfony/yaml": "6.4.*",
"symfony/property-access": "7.0.*",
"symfony/property-info": "7.0.*",
"symfony/runtime": "7.0.*",
"symfony/security-bundle": "7.0.*",
"symfony/serializer": "7.0.*",
"symfony/twig-bundle": "7.0.*",
"symfony/uid": "7.0.*",
"symfony/validator": "7.0.*",
"symfony/yaml": "7.0.*",
"web-token/jwt-checker": "^3.2",
"web-token/jwt-signature-algorithm-ecdsa": "^3.2",
"webonyx/graphql-php": "^15.8",
"zenstruck/foundry": "^1.36"
},
"require-dev": {
"api-platform/schema-generator": "^5.2",
"dama/doctrine-test-bundle": "^8.0",
"justinrainbow/json-schema": "^5.2",
"phpstan/extension-installer": "^1.3",
Expand All @@ -47,14 +46,14 @@
"phpstan/phpstan-doctrine": "^1.3",
"phpstan/phpstan-phpunit": "^1.3",
"phpstan/phpstan-symfony": "^1.3",
"symfony/browser-kit": "6.4.*",
"symfony/css-selector": "6.4.*",
"symfony/debug-bundle": "6.4.*",
"phpunit/phpunit": "^10.5",
"symfony/browser-kit": "7.0.*",
"symfony/css-selector": "7.0.*",
"symfony/debug-bundle": "7.0.*",
"symfony/maker-bundle": "^1.52",
"symfony/phpunit-bridge": "6.4.*",
"symfony/stopwatch": "6.4.*",
"symfony/var-dumper": "6.4.*",
"symfony/web-profiler-bundle": "6.4.*"
"symfony/stopwatch": "7.0.*",
"symfony/var-dumper": "7.0.*",
"symfony/web-profiler-bundle": "7.0.*"
},
"config": {
"optimize-autoloader": true,
Expand Down Expand Up @@ -108,7 +107,7 @@
"extra": {
"symfony": {
"allow-contrib": false,
"require": "6.4.*",
"require": "7.0.*",
"docker": false
}
}
Expand Down
Loading
Loading