From 3f927258feace7a88120d4d649be7dc48c618fe9 Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Thu, 28 Mar 2024 08:58:59 +0100 Subject: [PATCH] make sure we install php-interop 1 when asking for the psr factory, the 0.x versions are for the php-http factories --- composer.json | 4 ++-- src/Composer/Plugin.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index bd39db8..9d718bb 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,8 @@ "php-http/httplug": "^1.0 || ^2.0", "php-http/message-factory": "^1.0", "phpspec/phpspec": "^5.1 || ^6.1 || ^7.3", - "symfony/phpunit-bridge": "^6.4.4 || ^7.0.1" + "symfony/phpunit-bridge": "^6.4.4 || ^7.0.1", + "sebastian/comparator": "^3.0.5 || ^4.0.8" }, "autoload": { "psr-4": { @@ -56,7 +57,6 @@ }, "conflict": { "nyholm/psr7": "<1.0", - "sebastian/comparator": ">=5.0", "zendframework/zend-diactoros": "*" }, "prefer-stable": true, diff --git a/src/Composer/Plugin.php b/src/Composer/Plugin.php index 32ef401..12a8faa 100644 --- a/src/Composer/Plugin.php +++ b/src/Composer/Plugin.php @@ -78,7 +78,7 @@ class Plugin implements PluginInterface, EventSubscriberInterface 'slim/psr7' => [], 'laminas/laminas-diactoros' => [], 'phalcon/cphalcon:^4' => [], - 'http-interop/http-factory-guzzle' => [], + 'http-interop/http-factory-guzzle:>=1' => [], 'http-interop/http-factory-diactoros' => [], 'http-interop/http-factory-slim' => [], 'httpsoft/http-message' => [], @@ -98,7 +98,7 @@ class Plugin implements PluginInterface, EventSubscriberInterface 'php-http/react-adapter' => 'react/event-loop', 'php-http/buzz-adapter' => 'kriswallsmith/buzz:^0.15.1', 'php-http/artax-adapter' => 'amphp/artax:^3', - 'http-interop/http-factory-guzzle' => 'guzzlehttp/psr7:^1', + 'http-interop/http-factory-guzzle:>=1' => 'guzzlehttp/psr7:^1', 'http-interop/http-factory-slim' => 'slim/slim:^3', ];