From be848903dbc33ac1af48fd34c756b64b57813ff4 Mon Sep 17 00:00:00 2001 From: Rodrigo Aguilera Date: Tue, 20 Feb 2024 20:02:48 +0100 Subject: [PATCH] Add conflict with non-compatible versions of nikic/php-parser. Bump psy/psysh to allow for nikic/php-parser v5. --- composer.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 15a9edf5..2431073e 100644 --- a/composer.json +++ b/composer.json @@ -46,12 +46,13 @@ "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/phpstan": "^1.10", "phpunit/phpunit": "^9.5", - "psy/psysh": "^0.11", + "psy/psysh": "^0.12", "roave/security-advisories": "dev-latest" }, "conflict": { "docker-php/docker-php": "*", - "php-http/message": "<1.15" + "php-http/message": "<1.15", + "nikic/php-parser": "<4.13" }, "scripts": { "php-cs-fixer": "vendor/bin/php-cs-fixer fix --dry-run --verbose --diff",