From f142407481f1d210eb27b8e027803bb176dcc027 Mon Sep 17 00:00:00 2001 From: belmeopmenieuwesim Date: Wed, 16 Feb 2022 12:12:25 +0100 Subject: [PATCH 1/5] removes the dependency on guzzle 6 and instead accepts any other impl. --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index c471f56..9bfb2f9 100755 --- a/composer.json +++ b/composer.json @@ -23,8 +23,7 @@ "php": "^7.2 | ^8.0", "payum/core": "^1.6.1", "omnipay/common": "^3.0", - "guzzlehttp/guzzle": "^6.0", - "php-http/guzzle6-adapter": "^2.0" + "php-http/client-implementation": "^1.0" }, "require-dev": { "phpunit/phpunit": "^8.5 || ^9.5", From a2e76208391e8ee12163cf0f2ab200a467ef6642 Mon Sep 17 00:00:00 2001 From: belmeopmenieuwesim Date: Thu, 17 Feb 2022 09:43:57 +0100 Subject: [PATCH 2/5] fix tests by using guzzle6 instead of guzzle7 in phpunit --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9bfb2f9..eea3930 100755 --- a/composer.json +++ b/composer.json @@ -27,7 +27,8 @@ }, "require-dev": { "phpunit/phpunit": "^8.5 || ^9.5", - "omnipay/dummy": "^3.0" + "omnipay/dummy": "^3.0", + "php-http/guzzle6-adapter": "^2.0" }, "config": { "bin-dir": "bin" From 7ae70b436bb219584fefeeefa6689f5156106818 Mon Sep 17 00:00:00 2001 From: belmeopmenieuwesim Date: Thu, 17 Feb 2022 09:56:56 +0100 Subject: [PATCH 3/5] suggest using the guzzle7-adapter if there was no default HTTP Adapter yet. --- composer.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/composer.json b/composer.json index eea3930..890ebbe 100755 --- a/composer.json +++ b/composer.json @@ -30,6 +30,9 @@ "omnipay/dummy": "^3.0", "php-http/guzzle6-adapter": "^2.0" }, + "suggest": { + "php-http/guzzle7-adapter": "Guzzle 7 HTTP Adapter" + }, "config": { "bin-dir": "bin" }, From 41ead0d861f87b8d3727a2ae6bab689b89b9dddf Mon Sep 17 00:00:00 2001 From: belmeopmenieuwesim Date: Thu, 17 Feb 2022 10:16:04 +0100 Subject: [PATCH 4/5] bump omnipay/common to ^3.1 --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 890ebbe..334b5f1 100755 --- a/composer.json +++ b/composer.json @@ -22,13 +22,13 @@ "require": { "php": "^7.2 | ^8.0", "payum/core": "^1.6.1", - "omnipay/common": "^3.0", + "omnipay/common": "^3.1", "php-http/client-implementation": "^1.0" }, "require-dev": { "phpunit/phpunit": "^8.5 || ^9.5", "omnipay/dummy": "^3.0", - "php-http/guzzle6-adapter": "^2.0" + "php-http/guzzle7-adapter": "^1.0" }, "suggest": { "php-http/guzzle7-adapter": "Guzzle 7 HTTP Adapter" From d5038104f085f40c8d7eac659c02c133420ce0ae Mon Sep 17 00:00:00 2001 From: belmeopmenieuwesim Date: Thu, 17 Feb 2022 10:33:33 +0100 Subject: [PATCH 5/5] bump omnipay/common to ^3.2 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 334b5f1..3837989 100755 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "require": { "php": "^7.2 | ^8.0", "payum/core": "^1.6.1", - "omnipay/common": "^3.1", + "omnipay/common": "^3.2", "php-http/client-implementation": "^1.0" }, "require-dev": {