Skip to content

Commit 34ac39a

Browse files
committed
chore: revert conflicts from api-platform#5329
1 parent f565f07 commit 34ac39a

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

composer.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
"symfony/property-info": "^6.1",
2525
"symfony/serializer": "^6.1",
2626
"symfony/web-link": "^6.1",
27-
"willdurand/negotiation": "^3.0"
27+
"willdurand/negotiation": "^2.0.3 || ^3.0"
2828
},
2929
"require-dev": {
3030
"behat/behat": "^3.1",
3131
"behat/mink": "^1.9@dev",
3232
"doctrine/cache": "^1.11 || ^2.1",
33-
"doctrine/common": "^2.11 || ^3.1",
33+
"doctrine/common": "^2.11 || ^3.0",
3434
"doctrine/data-fixtures": "^1.2.2",
3535
"doctrine/dbal": "^2.6 || ^3.0",
3636
"doctrine/doctrine-bundle": "^1.12 || ^2.0",
@@ -94,9 +94,6 @@
9494
"doctrine/dbal": "<2.10",
9595
"doctrine/mongodb-odm": "<2.2",
9696
"doctrine/persistence": "<1.3",
97-
"symfony/service-contracts": "<3",
98-
"phpunit/phpunit": "<9.5",
99-
"phpspec/prophecy": "<1.15",
10097
"elasticsearch/elasticsearch": ">=8.0"
10198
},
10299
"suggest": {

0 commit comments

Comments
 (0)