From d65466feaeef10862ab757d3962ac5ca660f1119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dezs=C5=91=20BICZ=C3=93?= Date: Wed, 18 Jul 2018 15:07:46 +0200 Subject: [PATCH 1/2] Require at least alpha3 from the API client because of the BC breaking changes introduced since alpha2. [skip ci] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ca8cc47b9..1973e1b41 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "webflo/drupal-core-require-dev": "^8.5" }, "conflict": { - "apigee/apigee-client-php": "<= 2.0.0-alpha1" + "apigee/apigee-client-php": "< 2.0.0-alpha3" }, "config": { "sort-packages": true From a03d86f7d711f1e706f0c558e768d4df0611904c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dezs=C5=91=20BICZ=C3=93?= Date: Thu, 26 Jul 2018 10:10:01 +0200 Subject: [PATCH 2/2] Removed unnecessary patches. --- composer.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/composer.json b/composer.json index 1973e1b41..27a008a23 100644 --- a/composer.json +++ b/composer.json @@ -40,10 +40,6 @@ }, "drupal/key": { "Fix implementation of NoneKeyInput": "https://www.drupal.org/files/issues/2018-06-27/key-fix-implementation-of-nonekeyinput-2982124-2.patch" - }, - "apigee/apigee-client-php": { - "OAuth re-authentication fix with expired refresh token and minor changes": "https://github.com/apigee/apigee-client-php/pull/9.diff", - "Pagination related changes": "https://github.com/apigee/apigee-client-php/pull/10.diff" } } }