Skip to content

Commit 5b4a695

Browse files
committed
Merge branch '4.4' into 5.2
* 4.4: doctrine/doctrine-bundle should not be a dep
2 parents af74dac + c995f1c commit 5b4a695

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@
134134
"doctrine/data-fixtures": "^1.1",
135135
"doctrine/dbal": "^2.10|^3.0",
136136
"doctrine/orm": "^2.7.3",
137-
"doctrine/doctrine-bundle": "^2.0",
138137
"guzzlehttp/promises": "^1.4",
139138
"masterminds/html5": "^2.6",
140139
"monolog/monolog": "^1.25.1|^2",

src/Symfony/Bundle/SecurityBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"symfony/security-http": "^5.2"
3131
},
3232
"require-dev": {
33-
"doctrine/doctrine-bundle": "^2.0",
33+
"doctrine/annotations": "^1.10.4",
3434
"symfony/asset": "^4.4|^5.0",
3535
"symfony/browser-kit": "^4.4|^5.0",
3636
"symfony/console": "^4.4|^5.0",

0 commit comments

Comments
 (0)