File tree Expand file tree Collapse file tree 2 files changed +6
-2
lines changed
Expand file tree Collapse file tree 2 files changed +6
-2
lines changed Original file line number Diff line number Diff line change 2727 if [ -f composer.lock ]; then \
2828 composer install --no-interaction -o; \
2929 else \
30- if echo "${SHOPWARE_VERSION}" | grep -qE '^(trunk|v6\. 7\. )' ; then \
30+ if echo "${SHOPWARE_VERSION}" | grep -qE '^v6\. 6\. ' ; then \
31+ jq '.conflict = (.conflict // {}) + { "squirrelphp/twig-php-syntax": "<1.11.0", "symfony/polyfill-php85": "<1.33.0" }' composer.json > composer.tmp.json && mv composer.tmp.json composer.json; \
32+ elif echo "${SHOPWARE_VERSION}" | grep -qE '^(trunk|v6\. 7\. )' ; then \
3133 jq '.conflict["symfony/type-info"] = "<7.1.8"' composer.json > composer.tmp.json && mv composer.tmp.json composer.json; \
3234 fi && \
3335 composer update --prefer-lowest --prefer-stable --no-interaction -o; \
Original file line number Diff line number Diff line change 3939 if [ -f composer.lock ]; then \
4040 composer install --no-interaction -o; \
4141 else \
42- if echo "${SHOPWARE_VERSION}" | grep -qE '^(trunk|v6\. 7\. )' ; then \
42+ if echo "${SHOPWARE_VERSION}" | grep -qE '^v6\. 6\. ' ; then \
43+ jq '.conflict = (.conflict // {}) + { "squirrelphp/twig-php-syntax": "<1.11.0", "symfony/polyfill-php85": "<1.33.0" }' composer.json > composer.tmp.json && mv composer.tmp.json composer.json; \
44+ elif echo "${SHOPWARE_VERSION}" | grep -qE '^(trunk|v6\. 7\. )' ; then \
4345 jq '.conflict["symfony/type-info"] = "<7.1.8"' composer.json > composer.tmp.json && mv composer.tmp.json composer.json; \
4446 fi && \
4547 composer update --prefer-lowest --prefer-stable --no-interaction -o; \
You can’t perform that action at this time.
0 commit comments