fix Cache::spy with Cache::get (#46689)

coleshirley · web-flow · commit 4307b852c4f0 · 2023-04-05T14:11:08.000-05:00
diff --git a/src/Illuminate/Cache/CacheManager.php b/src/Illuminate/Cache/CacheManager.php
@@ -58,7 +58,7 @@ public function store($name = null)
     {
         $name = $name ?: $this->getDefaultDriver();
 
-        return $this->stores[$name] = $this->get($name);
+        return $this->stores[$name] ??= $this->resolve($name);
     }
 
     /**
@@ -72,17 +72,6 @@ public function driver($driver = null)
         return $this->store($driver);
     }
 
-    /**
-     * Attempt to get the store from the local cache.
-     *
-     * @param  string  $name
-     * @return \Illuminate\Contracts\Cache\Repository
-     */
-    protected function get($name)
-    {
-        return $this->stores[$name] ?? $this->resolve($name);
-    }
-
     /**
      * Resolve the given store.
      *

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function store($name = null)`
`58`	`58`	`{`
`59`	`59`	`$name = $name ?: $this->getDefaultDriver();`
`60`	`60`
`61`		`- return $this->stores[$name] = $this->get($name);`
	`61`	`+ return $this->stores[$name] ??= $this->resolve($name);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`/**`
`@@ -72,17 +72,6 @@ public function driver($driver = null)`
`72`	`72`	`return $this->store($driver);`
`73`	`73`	`}`
`74`	`74`
`75`		`- /**`
`76`		`- * Attempt to get the store from the local cache.`
`77`		`- *`
`78`		`- * @param string $name`
`79`		`- * @return \Illuminate\Contracts\Cache\Repository`
`80`		`- */`
`81`		`- protected function get($name)`
`82`		`- {`
`83`		`- return $this->stores[$name] ?? $this->resolve($name);`
`84`		`- }`
`85`		`-`
`86`	`75`	`/**`
`87`	`76`	`* Resolve the given store.`
`88`	`77`	`*`