10000 Merge branch '6.0' into 6.1 · symfony/symfony@ff92697 · GitHub
[go: up one dir, main page]
Skip to content

Commit ff92697

Browse files
derrabusderrabus
committed
Merge branch '6.0' into 6.1
* 6.0: [PasswordHasher] Fix composer.json Don't replace symfony/security-guard
2 parents 2a38810 + 2ac2593 commit ff92697

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
@@ -94,7 +94,6 @@
9494
"symfony/security-bundle": "self.version",
9595
"symfony/security-core": "self.version",
9696
"symfony/security-csrf": "self.version",
97-
"symfony/security-guard": "self.version",
9897
"symfony/security-http": "self.version",
9998
"symfony/semaphore": "self.version",
10099
"symfony/serializer": "self.version",

‎src/Symfony/Component/PasswordHasher/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
},
2121
"require-dev": {
2222
"symfony/security-core": "^5.4|^6.0",
23-
"symfony/console": "^5"
23+
"symfony/console": "^5.4|^6.0"
2424
},
2525
"conflict": {
2626
"symfony/security-core": "<5.4"

0 commit comments

Comments
 (0)
0