Skip to content

Commit 8179e6b

Browse files
authored
Merge pull request #12 from hetg/feature/upgrade-to-symfony-50
Feature/upgrade to symfony 5.4
2 parents 72d8b34 + 7f339f5 commit 8179e6b

18 files changed

+1768
-1386
lines changed

.env.dist

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,7 @@ DATABASE_URL=mysql://username:password@mysql/db_name?serverVersion=5.7
4040
# Delivery is disabled by default via "null://localhost"
4141
MAILER_URL=null://localhost
4242
###< symfony/swiftmailer-bundle ###
43+
44+
###> symfony/mailer ###
45+
# MAILER_DSN=null://null
46+
###< symfony/mailer ###

.env.test

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# define your env variables for the test env here
2+
KERNEL_CLASS='App\Kernel'
3+
APP_SECRET='$ecretf0rt3st'
4+
SYMFONY_DEPRECATIONS_HELPER=999999
5+
PANTHER_APP_ENV=panther
6+
PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,8 @@
6868
###> lexik/jwt-authentication-bundle ###
6969
/config/jwt/*.pem
7070
###< lexik/jwt-authentication-bundle ###
71+
72+
###> symfony/phpunit-bridge ###
73+
.phpunit.result.cache
74+
/phpunit.xml
75+
###< symfony/phpunit-bridge ###

composer.json

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,25 @@
1212
"doctrine/doctrine-bundle": "^2.0",
1313
"doctrine/doctrine-migrations-bundle": "^2",
1414
"doctrine/orm": "^2.7",
15-
"friendsofsymfony/rest-bundle": "^2.6",
16-
"friendsofsymfony/user-bundle": "~2.0",
15+
"friendsofsymfony/rest-bundle": "^3.0",
16+
"friendsofsymfony/user-bundle": "~3.1",
1717
"gesdinet/jwt-refresh-token-bundle": "^0.9.0",
1818
"jms/serializer-bundle": "^3.5",
1919
"lexik/jwt-authentication-bundle": "^2.6",
20-
"nelmio/api-doc-bundle": "^3.5",
20+
"nelmio/api-doc-bundle": "^4.0",
2121
"sensio/framework-extra-bundle": "^5.5",
22-
"symfony/asset": "4.4.*",
23-
"symfony/console": "4.4.*",
24-
"symfony/dotenv": "4.4.*",
22+
"symfony/asset": "5.4.*",
23+
"symfony/config": "5.4.*",
24+
"symfony/dotenv": "5.4.*",
2525
"symfony/flex": "^1.3.1",
26-
"symfony/framework-bundle": "4.4.*",
27-
"symfony/http-foundation": "4.4.*",
28-
"symfony/http-kernel": "4.4.*",
29-
"symfony/security": "4.4.*",
26+
"symfony/framework-bundle": "5.4.*",
27+
"symfony/http-foundation": "5.4.*",
28+
"symfony/http-kernel": "5.4.*",
29+
"symfony/mailer": "5.4.*",
30+
"symfony/security-bundle": "5.4.*",
3031
"symfony/swiftmailer-bundle": "^3.4",
31-
"symfony/translation": "4.4.*",
32-
"symfony/yaml": "4.4.*"
32+
"symfony/translation": "5.4.*",
33+
"symfony/yaml": "5.4.*"
3334
},
3435
"config": {
3536
"preferred-install": {
@@ -76,10 +77,11 @@
7677
"extra": {
7778
"symfony": {
7879
"allow-contrib": false,
79-
"require": "4.4.*"
80+
"require": "5.4.*"
8081
}
8182
},
8283
"require-dev": {
83-
"doctrine/doctrine-fixtures-bundle": "^3.4"
84+
"doctrine/doctrine-fixtures-bundle": "^3.4",
85+
"symfony/phpunit-bridge": "^6.1"
8486
}
8587
}

0 commit comments

Comments
 (0)