From 1b47dee19447b85f3f4e14c92e2af976bef14480 Mon Sep 17 00:00:00 2001 From: "Barry vd. Heuvel" Date: Wed, 9 Sep 2020 13:10:38 +0200 Subject: [PATCH 01/10] Use Guzzle7 as default implementation --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 0b095eb6..751356bd 100644 --- a/composer.json +++ b/composer.json @@ -21,9 +21,9 @@ } ], "require": { - "php": "^5.6|^7", + "php": "^7.2", "omnipay/common": "^3", - "php-http/guzzle6-adapter": "^1.1|^2" + "guzzlehttp/guzzle": "^7" }, "require-dev": { "omnipay/tests": "^3" From bba6cb5cff512eac56d60ec3d4722341425339de Mon Sep 17 00:00:00 2001 From: "Barry vd. Heuvel" Date: Wed, 9 Sep 2020 13:11:03 +0200 Subject: [PATCH 02/10] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 751356bd..c307671f 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ }, "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "3.1.x-dev" } }, "prefer-stable": true From 8cb4f8a178d2a2cbe15a33082c14977984299c6b Mon Sep 17 00:00:00 2001 From: "Barry vd. Heuvel" Date: Wed, 9 Sep 2020 13:12:38 +0200 Subject: [PATCH 03/10] Update .travis.yml --- .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 884e3944..fc2a5f5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,9 @@ language: php php: - - 5.6 - - 7.0 - - 7.1 - 7.2 - 7.3 - - 7.4snapshot + - 7.4 # This triggers builds to run on the new TravisCI infrastructure. # See: http://docs.travis-ci.com/user/workers/container-based-infrastructure/ From 8983ec90271688fde9d0ed837e0d298c586d621e Mon Sep 17 00:00:00 2001 From: "Barry vd. Heuvel" Date: Wed, 9 Sep 2020 13:25:08 +0200 Subject: [PATCH 04/10] Update composer.json --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index c307671f..d4b1058c 100644 --- a/composer.json +++ b/composer.json @@ -33,5 +33,6 @@ "dev-master": "3.1.x-dev" } }, + "minimum-stability": "dev", "prefer-stable": true } From a0ddc9d23fe2fae1e7329295503615d09a5aa648 Mon Sep 17 00:00:00 2001 From: "Barry vd. Heuvel" Date: Mon, 21 Sep 2020 17:06:11 +0200 Subject: [PATCH 05/10] Use http-interop/http-factory-guzzle --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d4b1058c..4919cd0f 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,8 @@ "require": { "php": "^7.2", "omnipay/common": "^3", - "guzzlehttp/guzzle": "^7" + "guzzlehttp/guzzle": "^7", + "http-interop/http-factory-guzzle": "^1" }, "require-dev": { "omnipay/tests": "^3" From c4c798a0329c887cc86e23dfa56ddb1a6f2697d5 Mon Sep 17 00:00:00 2001 From: "Barry vd. Heuvel" Date: Mon, 21 Sep 2020 17:27:25 +0200 Subject: [PATCH 06/10] Update composer.json --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 4919cd0f..d4b1058c 100644 --- a/composer.json +++ b/composer.json @@ -23,8 +23,7 @@ "require": { "php": "^7.2", "omnipay/common": "^3", - "guzzlehttp/guzzle": "^7", - "http-interop/http-factory-guzzle": "^1" + "guzzlehttp/guzzle": "^7" }, "require-dev": { "omnipay/tests": "^3" From 596d04d6dd274093971685c7d8d0c3d9afaa8db7 Mon Sep 17 00:00:00 2001 From: "Barry vd. Heuvel" Date: Mon, 21 Sep 2020 17:30:44 +0200 Subject: [PATCH 07/10] Update composer.json --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a96157e7..9fa1b13d 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,8 @@ "require": { "php": "^7.2", "omnipay/common": "^3", - "guzzlehttp/guzzle": "^7" + "guzzlehttp/guzzle": "^7", + "http-interop/http-factory-guzzle": "^1" }, "require-dev": { "omnipay/tests": "^3" From 769235b484e8972bd21b50530f6f5718f057a712 Mon Sep 17 00:00:00 2001 From: "Barry vd. Heuvel" Date: Tue, 22 Sep 2020 09:31:26 +0200 Subject: [PATCH 08/10] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9fa1b13d..4d7142f4 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "php": "^7.2", "omnipay/common": "^3", "guzzlehttp/guzzle": "^7", - "http-interop/http-factory-guzzle": "^1" + "php-http/guzzle7-adapter": "^1" }, "require-dev": { "omnipay/tests": "^3" From 2fa71fd3dc8e474c812a39fc1fdd7546cb1e994d Mon Sep 17 00:00:00 2001 From: "Barry vd. Heuvel" Date: Tue, 22 Sep 2020 09:32:58 +0200 Subject: [PATCH 09/10] Update composer.json --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 4d7142f4..6bd5f2ed 100644 --- a/composer.json +++ b/composer.json @@ -23,8 +23,7 @@ "require": { "php": "^7.2", "omnipay/common": "^3", - "guzzlehttp/guzzle": "^7", - "php-http/guzzle7-adapter": "^1" + "php-http/guzzle7-adapter": "^0.1" }, "require-dev": { "omnipay/tests": "^3" From e08cc6600c141868b56b5dfee7360b0b3d5d0d5d Mon Sep 17 00:00:00 2001 From: "Barry vd. Heuvel" Date: Tue, 22 Sep 2020 15:55:13 +0200 Subject: [PATCH 10/10] Update composer.json --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 6bd5f2ed..48419677 100644 --- a/composer.json +++ b/composer.json @@ -23,6 +23,7 @@ "require": { "php": "^7.2", "omnipay/common": "^3", + "php-http/discovery": "^1.12", "php-http/guzzle7-adapter": "^0.1" }, "require-dev": {