From 62a2ed163c8f5f5f3b23dc5c78d7187d0aabed9f Mon Sep 17 00:00:00 2001
From: lukinovec <lukinovec@gmail.com>
Date: Tue, 31 Jan 2023 08:13:06 +0100
Subject: [PATCH] Use my Laravel fork

---
 composer.json                                        |  8 +++++++-
 src/Bootstrappers/PrefixCacheTenancyBootstrapper.php |  4 +++-
 src/CacheManager.php                                 | 12 ------------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/composer.json b/composer.json
index 098b1cc4..d453f506 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "stancl/virtualcolumn": "^1.3"
     },
     "require-dev": {
-        "laravel/framework": "^9.0",
+        "laravel/framework": "dev-cache-methods as 9.21",
         "orchestra/testbench": "^7.0",
         "league/flysystem-aws-s3-v3": "^3.0",
         "doctrine/dbal": "^2.10",
@@ -33,6 +33,12 @@
         "nunomaduro/larastan": "^1.0",
         "spatie/invade": "^1.1"
     },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "http://github.com/lukinovec/framework"
+        }
+    ],
     "autoload": {
         "psr-4": {
             "Stancl\\Tenancy\\": "src/"
diff --git a/src/Bootstrappers/PrefixCacheTenancyBootstrapper.php b/src/Bootstrappers/PrefixCacheTenancyBootstrapper.php
index faa12a49..9f17cc2f 100644
--- a/src/Bootstrappers/PrefixCacheTenancyBootstrapper.php
+++ b/src/Bootstrappers/PrefixCacheTenancyBootstrapper.php
@@ -42,7 +42,9 @@ class PrefixCacheTenancyBootstrapper implements TenancyBootstrapper
     {
         $this->config->set('cache.prefix', $prefix);
 
-        $this->cacheManager->refreshStore();
+        $newStore = $this->cacheManager->resolve($this->storeName ?? $this->cacheManager->getDefaultDriver())->getStore();
+
+        $this->cacheManager->driver($this->storeName)->setStore($newStore);
 
         // It is needed when a call to the facade has been made before bootstrapping tenancy
         // The facade has its own cache, separate from the container
diff --git a/src/CacheManager.php b/src/CacheManager.php
index 70c335ad..d9c35521 100644
--- a/src/CacheManager.php
+++ b/src/CacheManager.php
@@ -42,16 +42,4 @@ class CacheManager extends BaseCacheManager
 
         return $this->store()->tags($tags)->$method(...$parameters);
     }
-
-    public function refreshStore(string|null $repository = null): void
-    {
-        // Could be public setStore(string $store) in Illuminate\Cache\Repository
-        Repository::macro('setStore', function ($store) {
-            $this->store = $store;
-        });
-
-        $newStore = $this->resolve($repository ?? $this->getDefaultDriver())->getStore();
-
-        $this->driver($repository)->setStore($newStore);
-    }
 }