From 331c15821e1955bc5208fe5426b81997ee0def4e Mon Sep 17 00:00:00 2001 From: Michal Korotkiewicz Date: Tue, 8 Mar 2022 11:10:57 +0100 Subject: [PATCH 1/5] Downgrade guzzle to work with older project --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f338262a..ecf48a13 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "PHP binding for v4 of the Cloudflare Client API.", "type": "library", "require": { - "guzzlehttp/guzzle": "^7.0.1", + "guzzlehttp/guzzle": "^6.3.0", "php": ">=7.3", "psr/http-message": "~1.0", "ext-json": "*" From 00ac32624b4bc9219c1fee0ec45b0926950c308c Mon Sep 17 00:00:00 2001 From: Michal Korotkiewicz Date: Tue, 8 Mar 2022 11:13:55 +0100 Subject: [PATCH 2/5] Downgrade guzzle to work with older project --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ecf48a13..7d6bad2c 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "PHP binding for v4 of the Cloudflare Client API.", "type": "library", "require": { - "guzzlehttp/guzzle": "^6.3.0", + "guzzlehttp/guzzle": "^6.3", "php": ">=7.3", "psr/http-message": "~1.0", "ext-json": "*" From ecd5f0be32f0b4fcbf2abecd6d62515ac7f13c4b Mon Sep 17 00:00:00 2001 From: Michal Korotkiewicz Date: Tue, 8 Mar 2022 11:19:20 +0100 Subject: [PATCH 3/5] force actions --- tests/Endpoints/KeyValueTest.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/Endpoints/KeyValueTest.php b/tests/Endpoints/KeyValueTest.php index 8703cb4d..10aec18d 100644 --- a/tests/Endpoints/KeyValueTest.php +++ b/tests/Endpoints/KeyValueTest.php @@ -36,13 +36,11 @@ public function testListKeys() $this->assertEquals(self::TEST_KEY_NAME, $result->result[0]->name); $this->assertEquals(1, $result->result_info->count); } - public function testGetKeyValue() { $stream = $this->getPsr7StreamForFixture('Endpoints/getKeyValue.txt'); $adapter = $this->getMockBuilder(Adapter::class)->disableOriginalConstructor()->getMock(); $adapter->method('get')->willReturn(new Response(200, ['Content-Type' => 'application/json'], $stream)); - $adapter->expects($this->once()) ->method('get') ->with($this->stringStartsWith(sprintf('accounts/%s/storage/kv/namespaces/%s/values', self::TEST_ACCOUNT_ID, self::TEST_KV_NAMESPACE_ID))); From 55c3f5ae96c1cc10d9fb589a5c2a30f0179820e1 Mon Sep 17 00:00:00 2001 From: Michal Korotkiewicz Date: Tue, 8 Mar 2022 11:20:15 +0100 Subject: [PATCH 4/5] Downgrade guzzle to work with older project --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7d6bad2c..4a23d430 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "PHP binding for v4 of the Cloudflare Client API.", "type": "library", "require": { - "guzzlehttp/guzzle": "^6.3", + "guzzlehttp/guzzle": "^6.3 | ^7.0.1", "php": ">=7.3", "psr/http-message": "~1.0", "ext-json": "*" From 4f394015736c6df72e190f53b27c8415a641d218 Mon Sep 17 00:00:00 2001 From: Michal Korotkiewicz Date: Tue, 8 Mar 2022 11:21:46 +0100 Subject: [PATCH 5/5] Downgrade guzzle to work with older project --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4a23d430..0de8ab51 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "PHP binding for v4 of the Cloudflare Client API.", "type": "library", "require": { - "guzzlehttp/guzzle": "^6.3 | ^7.0.1", + "guzzlehttp/guzzle": "^6.3 || ^7.0.1", "php": ">=7.3", "psr/http-message": "~1.0", "ext-json": "*"