Skip to content

Commit 817a646

Browse files
authored
Merge pull request #159 from delyriand/fix/support-latest-sylius-1.11
Allows babdev/pagerfanta-bundle version 3 for the latest minor Sylius 1.11 and require message-factory for test app
2 parents 0fc4c25 + 1a04dbe commit 817a646

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

Makefile

+3
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ setup_application:
7070
(cd ${APP_DIR} && ${COMPOSER} config minimum-stability dev)
7171
(cd ${APP_DIR} && ${COMPOSER} config --no-plugins allow-plugins true)
7272
(cd ${APP_DIR} && ${COMPOSER} require --no-install --no-scripts --no-progress sylius/sylius="~${SYLIUS_VERSION}") # Make sure to install the required version of sylius because the sylius-standard has a soft constraint
73+
@if [ ${SYLIUS_VERSION} == '1.11.0' ]; then\
74+
(cd ${APP_DIR} && ${COMPOSER} require --no-install --no-scripts --no-progress php-http/message-factory)\
75+
fi
7376
$(MAKE) ${APP_DIR}/.php-version ${APP_DIR}/php.ini
7477
(cd ${APP_DIR} && ${COMPOSER} install --no-interaction)
7578
$(MAKE) apply_dist

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"license": "MIT",
77
"require": {
88
"php": "~7.4|~8.0",
9-
"babdev/pagerfanta-bundle": "^2.5",
9+
"babdev/pagerfanta-bundle": "^2.5 || ^3.0",
1010
"jacquesbh/eater": "^2.0",
1111
"jane-php/automapper-bundle": "^7.1",
1212
"jolicode/elastically": "^1.4.0",

0 commit comments

Comments
 (0)