Complete Redis cache driver refactor with enhanced tagging

.env.example

@@ -0,0 +1,25 @@
+# Integration tests environment example
+# Copy this file to .env and configure to run integration tests locally.
+#
+# ## Database Configuration##
+# Set DB_CONNECTION to the database you want to test against.
+# Tests in tests/Integration/Database will run against this connection.
+# 
+# ## Redis Configuration ##
+# Integration tests auto-skip if Redis is unavailable on default host/port.
+# Set REDIS_HOST to run tests against a specific Redis instance.
+# If REDIS_HOST is set explicitly, tests will fail (not skip) if Redis is unavailable.
+
+# Database
+# DB_CONNECTION=mysql
+# DB_HOST=127.0.0.1
+# DB_PORT=3306
+# DB_DATABASE=testing
+# DB_USERNAME=root
+# DB_PASSWORD=password
+
+# Redis
+# REDIS_HOST=127.0.0.1
+# REDIS_PORT=6379
+# REDIS_AUTH=
+# REDIS_DB=8

.github/workflows/redis.yml

@@ -0,0 +1,98 @@
+name: redis
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  redis_8:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    services:
+      redis:
+        image: redis:8
+        ports:
+          - 6379:6379
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    container:
+      image: phpswoole/swoole:6.1.4-php8.4
+
+    strategy:
+      fail-fast: true
+
+    name: Redis 8
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Cache Composer dependencies
+        uses: actions/cache@v4
+        with:
+          path: /root/.composer/cache
+          key: composer-8.4-${{ hashFiles('composer.lock') }}
+          restore-keys: composer-8.4-
+
+      - name: Install dependencies
+        run: COMPOSER_MEMORY_LIMIT=-1 composer install --prefer-dist -n -o
+
+      - name: Execute Redis integration tests
+        env:
+          REDIS_HOST: redis
+          REDIS_PORT: 6379
+          REDIS_DB: 8
+        run: |
+          vendor/bin/phpunit tests/Integration/Cache/Redis
+          vendor/bin/phpunit tests/Redis/Integration
+
+  valkey_9:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    services:
+      valkey:
+        image: valkey/valkey:9
+        ports:
+          - 6379:6379
+        options: >-
+          --health-cmd "valkey-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    container:
+      image: phpswoole/swoole:6.1.4-php8.4
+
+    strategy:
+      fail-fast: true
+
+    name: Valkey 9
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Cache Composer dependencies
+        uses: actions/cache@v4
+        with:
+          path: /root/.composer/cache
+          key: composer-8.4-${{ hashFiles('composer.lock') }}
+          restore-keys: composer-8.4-
+
+      - name: Install dependencies
+        run: COMPOSER_MEMORY_LIMIT=-1 composer install --prefer-dist -n -o
+
+      - name: Execute Redis integration tests
+        env:
+          REDIS_HOST: valkey
+          REDIS_PORT: 6379
+          REDIS_DB: 8
+        run: |
+          vendor/bin/phpunit tests/Integration/Cache/Redis
+          vendor/bin/phpunit tests/Redis/Integration

.github/workflows/static-analysis.yml

@@ -34,4 +34,6 @@ jobs:
             COMPOSER_MEMORY_LIMIT=-1 composer install --prefer-dist -n -o
 
       - name: Execute static analysis
-        run: vendor/bin/phpstan --configuration="phpstan.neon.dist" --memory-limit=-1
+        run: |
+          vendor/bin/phpstan --configuration="phpstan.neon.dist" --memory-limit=-1
+          vendor/bin/phpstan --configuration="phpstan.types.neon.dist" --memory-limit=-1

.github/workflows/tests.yml

@@ -29,6 +29,13 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Cache Composer dependencies
+        uses: actions/cache@v4
+        with:
+          path: /root/.composer/cache
+          key: composer-${{ matrix.php }}-${{ hashFiles('composer.lock') }}
+          restore-keys: composer-${{ matrix.php }}-
+
       - name: Install dependencies
         run: |
             COMPOSER_MEMORY_LIMIT=-1 composer install --prefer-dist -n -o

.gitignore

@@ -1,5 +1,7 @@
 .idea
+/.env
 /.phpunit.cache
+/.tmp
 /vendor
 composer.lock
 /phpunit.xml

phpunit.xml.dist

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit backupGlobals="false"
+         bootstrap="tests/bootstrap.php"
          beStrictAboutTestsThatDoNotTestAnything="false"
          colors="true"
          processIsolation="false"

src/cache/publish/cache.php

@@ -49,6 +49,7 @@
         'redis' => [
             'driver' => 'redis',
             'connection' => 'default',
+            'tag_mode' => env('REDIS_CACHE_TAG_MODE', 'all'), // Redis 8.0+ and PhpRedis 6.3.0+ required for 'any'
             'lock_connection' => 'default',
         ],
 
@@ -101,11 +102,11 @@
     | Cache Key Prefix
     |--------------------------------------------------------------------------
     |
-    | When utilizing a RAM based store such as APC or Memcached, there might
-    | be other applications utilizing the same cache. So, we'll specify a
-    | value to get prefixed to all our keys so we can avoid collisions.
+    | When utilizing the database or Redis cache stores, there might be other
+    | applications using the same cache. For that reason, you may prefix
+    | every cache key to avoid collisions.
     |
     */
 
-    'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'hyperf'), '_') . '_cache'),
+    'prefix' => env('CACHE_PREFIX', Str::slug((string) env('APP_NAME', 'hypervel')) . '-cache-'),
 ];

src/cache/src/CacheManager.php

@@ -237,6 +237,7 @@ protected function createRedisDriver(array $config): Repository
         $connection = $config['connection'] ?? 'default';
 
         $store = new RedisStore($redis, $this->getPrefix($config), $connection);
+        $store->setTagMode($config['tag_mode'] ?? 'all');
 
         return $this->repository(
             $store->setLockConnection($config['lock_connection'] ?? $connection),

src/cache/src/ConfigProvider.php

@@ -10,6 +10,9 @@
 use Hypervel\Cache\Contracts\Store;
 use Hypervel\Cache\Listeners\CreateSwooleTable;
 use Hypervel\Cache\Listeners\CreateTimer;
+use Hypervel\Cache\Redis\Console\BenchmarkCommand;
+use Hypervel\Cache\Redis\Console\DoctorCommand;
+use Hypervel\Cache\Redis\Console\PruneStaleTagsCommand;
 
 class ConfigProvider
 {
@@ -25,8 +28,11 @@ public function __invoke(): array
                 CreateTimer::class,
             ],
             'commands' => [
+                BenchmarkCommand::class,
                 ClearCommand::class,
+                DoctorCommand::class,
                 PruneDbExpiredCommand::class,
+                PruneStaleTagsCommand::class,
             ],
             'publish' => [
                 [

src/cache/src/Redis/AllTagSet.php

@@ -0,0 +1,76 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hypervel\Cache\Redis;
+
+use Hyperf\Collection\LazyCollection;
+use Hypervel\Cache\Contracts\Store;
+use Hypervel\Cache\RedisStore;
+use Hypervel\Cache\TagSet;
+
+class AllTagSet extends TagSet
+{
+    /**
+     * The cache store implementation.
+     *
+     * @var RedisStore
+     */
+    protected Store $store;
+
+    /**
+     * Add a reference entry to the tag set's underlying sorted set.
+     */
+    public function addEntry(string $key, int $ttl = 0, ?string $updateWhen = null): void
+    {
+        $this->store->allTagOps()->addEntry()->execute($key, $ttl, $this->tagIds(), $updateWhen);
+    }
+
+    /**
+     * Get all of the cache entry keys for the tag set.
+     */
+    public function entries(): LazyCollection
+    {
+        return $this->store->allTagOps()->getEntries()->execute($this->tagIds());
+    }
+
+    /**
+     * Flush the tag from the cache.
+     */
+    public function flushTag(string $name): string
+    {
+        return $this->resetTag($name);
+    }
+
+    /**
+     * Reset the tag and return the new tag identifier.
+     */
+    public function resetTag(string $name): string
+    {
+        $this->store->forget($this->tagKey($name));
+
+        return $this->tagId($name);
+    }
+
+    /**
+     * Get the unique tag identifier for a given tag.
+     *
+     * Delegates to StoreContext which delegates to TagMode (single source of truth).
+     * Format: "_all:tag:{name}:entries"
+     */
+    public function tagId(string $name): string
+    {
+        return $this->store->getContext()->tagId($name);
+    }
+
+    /**
+     * Get the tag identifier key for a given tag.
+     *
+     * Same as tagId() - the identifier without cache prefix.
+     * Used with store->forget() which adds the prefix.
+     */
+    public function tagKey(string $name): string
+    {
+        return $this->store->getContext()->tagId($name);
+    }
+}