From ef4faf15981dbfe4fe63e10748b1988184d34e10 Mon Sep 17 00:00:00 2001
From: Tobias Sette <me@tobias.ws>
Date: Thu, 17 Feb 2022 11:15:49 -0300
Subject: [PATCH 1/2] chore: allow psr/simple-cache v2 or v3

---
 composer.json                                  | 2 +-
 src/Plugin/composer.json                       | 2 +-
 src/Provider/Cache/Tests/ProviderCacheTest.php | 4 ++--
 src/Provider/Cache/composer.json               | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 14ce30e47..aafca9a0a 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
         "php-http/message-factory": "^1.0.2",
         "php-http/httplug": "^1.0",
         "php-http/discovery": "^1.4",
-        "psr/simple-cache": "^1.0",
+        "psr/simple-cache": "^1.0 || ^2.0 || ^3.0",
         "php-http/promise": "^1.0"
     },
     "require-dev": {
diff --git a/src/Plugin/composer.json b/src/Plugin/composer.json
index 3073972f0..bbf447c2b 100644
--- a/src/Plugin/composer.json
+++ b/src/Plugin/composer.json
@@ -15,7 +15,7 @@
         "php": "^7.0",
         "willdurand/geocoder": "^4.0",
         "psr/log": "^1.0",
-        "psr/simple-cache": "^1.0",
+        "psr/simple-cache": "^1.0 || ^2.0 || ^3.0",
         "php-http/promise": "^1.0"
     },
     "require-dev": {
diff --git a/src/Provider/Cache/Tests/ProviderCacheTest.php b/src/Provider/Cache/Tests/ProviderCacheTest.php
index 1aa66cce8..5c040d700 100644
--- a/src/Provider/Cache/Tests/ProviderCacheTest.php
+++ b/src/Provider/Cache/Tests/ProviderCacheTest.php
@@ -83,7 +83,7 @@ public function testGeocodeMiss()
         $this->cacheMock->expects($this->once())
             ->method('set')
             ->with($this->anything(), $result, $ttl)
-            ->willReturn(null);
+            ->willReturn(true);
 
         $this->providerMock->expects($this->once())
             ->method('geocodeQuery')
@@ -127,7 +127,7 @@ public function testReverseMiss()
         $this->cacheMock->expects($this->once())
             ->method('set')
             ->with($this->anything(), $result, $ttl)
-            ->willReturn(null);
+            ->willReturn(true);
 
         $this->providerMock->expects($this->once())
             ->method('reverseQuery')
diff --git a/src/Provider/Cache/composer.json b/src/Provider/Cache/composer.json
index 50f421be4..1690b5424 100644
--- a/src/Provider/Cache/composer.json
+++ b/src/Provider/Cache/composer.json
@@ -13,7 +13,7 @@
     ],
     "require": {
         "php": "^7.0",
-        "psr/simple-cache": "^1.0",
+        "psr/simple-cache": "^1.0 || ^2.0 || ^3.0",
         "willdurand/geocoder": "^4.0.0"
     },
     "require-dev": {

From ab4cfe4ecb0552d509783fe13468832771fd85a0 Mon Sep 17 00:00:00 2001
From: Tobias Sette <me@tobias.ws>
Date: Thu, 17 Feb 2022 11:21:46 -0300
Subject: [PATCH 2/2] a

---
 composer.json                    | 2 +-
 src/Plugin/composer.json         | 2 +-
 src/Provider/Cache/composer.json | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index e97f61e98..07081360a 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
         "php-http/promise": "^1.0",
         "psr/http-message-implementation": "^1.0",
         "psr/log": "^1.0|^2.0|^3.0",
-        "psr/simple-cache": "^1.0"
+        "psr/simple-cache": "^1.0|^2.0|^3.0"
     },
     "require-dev": {
         "cache/array-adapter": "^1.0",
diff --git a/src/Plugin/composer.json b/src/Plugin/composer.json
index 44f3bf60a..358cd16e8 100644
--- a/src/Plugin/composer.json
+++ b/src/Plugin/composer.json
@@ -17,7 +17,7 @@
         "php": "^7.3 || ^8.0",
         "php-http/promise": "^1.0",
         "psr/log": "^1.0|^2.0|^3.0",
-        "psr/simple-cache": "^1.0",
+        "psr/simple-cache": "^1.0|^2.0|^3.0",
         "willdurand/geocoder": "^4.0"
     },
     "require-dev": {
diff --git a/src/Provider/Cache/composer.json b/src/Provider/Cache/composer.json
index 77a2aabcd..7e72f07c8 100644
--- a/src/Provider/Cache/composer.json
+++ b/src/Provider/Cache/composer.json
@@ -13,7 +13,7 @@
     ],
     "require": {
         "php": "^7.3 || ^8.0",
-        "psr/simple-cache": "^1.0",
+        "psr/simple-cache": "^1.0|^2.0|^3.0",
         "willdurand/geocoder": "^4.0.0"
     },
     "provide": {
@@ -41,4 +41,4 @@
         "test": "vendor/bin/phpunit",
         "test-ci": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml"
     }
-}
\ No newline at end of file
+}