Merge branch '8.0' of github.com:top-think/framework into 8.0

top-think · Oct 17, 2023 · 5e59fb1 · 5e59fb1
2 parents b8e1baf + a272dd0
commit 5e59fb1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/src/think/Cache.php b/src/think/Cache.php
@@ -16,6 +16,7 @@
 use DateTimeInterface;
 use Psr\SimpleCache\CacheInterface;
 use think\cache\Driver;
+use think\cache\TagSet;
 use think\exception\InvalidArgumentException;
 use think\helper\Arr;
 
@@ -185,4 +186,15 @@ public function has($key): bool
         return $this->store()->has($key);
     }
 
+    /**
+     * 缓存标签
+     * @access public
+     * @param string|array $name 标签名
+     * @return TagSet
+     */
+    public function tag($name)
+    {
+        return $this->store()->tag($name);
+    }
+
 }
diff --git a/src/think/cache/Driver.php b/src/think/cache/Driver.php
@@ -192,7 +192,7 @@ public function remember($name, $value, $expire = null)
      * @param string|array $name 标签名
      * @return TagSet
      */
-    public function tag($name): TagSet
+    public function tag($name)
     {
         $name = (array) $name;
         $key  = implode('-', $name);

diff --git a/src/think/contract/CacheHandlerInterface.php b/src/think/contract/CacheHandlerInterface.php
@@ -60,7 +60,7 @@ public function remember($name, $value, $expire = null);
      * @param string|array $name 标签名
      * @return TagSet
      */
-    public function tag($name): TagSet;
+    public function tag($name);
 
     /**
      * 删除缓存标签