Skip to content

Commit 2e4c9f6

Browse files
committed
For tests on 'next' conflict apip main branch as this is not as up to date as 3.3.x-dev
1 parent 3f6f345 commit 2e4c9f6

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"ext-json": "*",
2525
"ext-pdo": "*",
2626
"ext-simplexml": "*",
27-
"api-platform/core": "^3.3.1",
27+
"api-platform/core": "^3.3.1 || 3.3.x-dev",
2828
"cocur/slugify": "^4.1",
2929
"doctrine/annotations": "^1.7.0",
3030
"doctrine/dbal": "^3.4",
@@ -137,6 +137,7 @@
137137
}
138138
},
139139
"conflict": {
140+
"api-platform/core": "dev-main",
140141
"willdurand/negotiation": "^2",
141142
"symfony/proxy-manager-bridge": "<5.4",
142143
"symfony/serializer": "<=6.1.2",

tests/Functional/app/config/packages/api_platform.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,9 @@ api_platform:
2323
enabled: true
2424
urls: [ 'http://test' ]
2525
public: true
26-
# tests break when using this but it's no big deal as
27-
# event listeners will always be available
26+
# tests break when not using this, but it's no big deal as
27+
# event listeners will always be available...
2828
# we do recommend using providers/processors instead
29-
# event_listeners_backward_compatibility_layer: true
30-
# for apip core 3.3.0 and remove above ^^
3129
use_symfony_listeners: true
3230
defaults:
3331
extra_properties:

0 commit comments

Comments
 (0)