Tag v3.2.0 (#1585 )

* Tag v3.2.0 * Updated 8.2 test image
Added test coverage for updated Vamana (#1584 )
2026-08-18 06:51:42 +00:00 · 2025-08-06 09:41:24 +03:00 · 2025-08-03 22:20:07 +03:00 · 2025-08-01 12:42:25 -07:00 · 2025-07-29 12:59:06 +03:00 · 2025-07-28 15:57:35 +03:00
1196 changed files with 19348 additions and 3275 deletions
@@ -3,4 +3,4 @@ skip=./.git,./src/Command/Redis/Search/FTSUGGET.php,./examples/Commands/Search/f
 check-hidden=
 check-filenames=
 builtin=clear,rare,informal,usage,code,names
-ignore-words-list=master,masters,slave,slaves,whitelist,cas,exat,smove,SUGGET,sugget,ro
+ignore-words-list=master,masters,slave,slaves,whitelist,cas,exat,smove,SUGGET,sugget,ro,DOF,dof
@@ -0,0 +1 @@
+coverage_clover: build/logs/clover-*.xml
@@ -17,6 +17,9 @@ max_line_length = 150
 [*.{md,yml,yaml,neon,sh}]
 indent_size = 2

+[VERSION]
+insert_final_newline = false
+
 [tests/**.php]
 max_line_length = unset

@@ -5,6 +5,7 @@
 /examples export-ignore
 /tests export-ignore
 /.codespellrc export-ignore linguist-language=INI
+/.coveralls.yml export-ignore
 /.editorconfig export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
@@ -1,14 +1,2 @@
-# Default
-*                                     @tillkruss
-
-# Redis commands
-src/Command/Redis/*                   @predis/team @tillkruss
-
-# Redis Stack
-src/Command/Redis/Json/*              @predis/team
-src/Command/Redis/Search/*            @predis/team
-src/Command/Redis/TopK/*              @predis/team
-src/Command/Redis/TDigest/*           @predis/team
-src/Command/Redis/BloomFilter/*       @predis/team
-src/Command/Redis/CuckooFilter/*      @predis/team
-src/Command/Redis/CountMinSketch/*    @predis/team
+*                         @predis/maintainers
+src/Relay*                @tillkruss
@@ -0,0 +1,96 @@
+---
+
+services:
+
+  redis-official:
+    image: ${REDIS_IMAGE_NAME:-redis:8.0}
+    container_name: redis-official
+    healthcheck:
+      test: [ "CMD", "redis-cli", "PING" ]
+      interval: 10s
+      timeout: 5s
+      retries: 3
+    ports:
+      - "6379:6379"
+    command:
+      - --requirepass "foobar"
+    profiles:
+      - all
+      - official
+      - standalone
+
+  redis-clients:
+    image: ${REDIS_IMAGE_NAME:-redislabs/client-libs-test:8.0.2}
+    container_name: redis-standalone
+    environment:
+      - TLS_ENABLED=yes
+      - REDIS_CLUSTER=no
+      - REDIS_PASSWORD=foobar
+      - PORT=6379
+      - TLS_PORT=6666
+    command: ${REDIS_EXTRA_ARGS:---enable-debug-command yes --enable-module-command yes --tls-auth-clients optional --save "" --requirepass "foobar"}
+    ports:
+      - 6379:6379
+      - 6666:6666 # TLS port
+    volumes:
+      - "./dockers/standalone:/redis/work"
+    profiles:
+      - all
+      - clients
+      - standalone
+
+  redis-unprotected:
+    image: ${REDIS_IMAGE_NAME:-redislabs/client-libs-test:8.0.2}
+    container_name: redis-unprotected
+    environment:
+      - TLS_ENABLED=no
+      - REDIS_CLUSTER=no
+      - PORT=6379
+      - TLS_PORT=6666
+    command: ${REDIS_EXTRA_ARGS:---enable-debug-command yes --enable-module-command yes --tls-auth-clients optional --save ""}
+    ports:
+      - 6380:6379
+    volumes:
+      - "./dockers/unprotected:/redis/work"
+    profiles:
+      - all
+      - clients
+      - unprotected
+
+  redis-cluster:
+    image: ${REDIS_IMAGE_NAME:-redislabs/client-libs-test:8.0.2}
+    container_name: redis-cluster
+    environment:
+      - REDIS_CLUSTER=yes
+      - REDIS_PASSWORD=foobar
+      - NODES=6
+      - REPLICAS=1
+      - TLS_ENABLED=yes
+      - PORT=6372
+      - TLS_PORT=27379
+    command: ${REDIS_EXTRA_ARGS:---enable-debug-command yes --enable-module-command yes --tls-auth-clients optional --save "" --requirepass "foobar"}
+    ports:
+      - "6372-6377:6372-6377"
+    volumes:
+      - "./dockers/cluster:/redis/work"
+    profiles:
+      - all
+      - clients
+      - cluster
+
+  redis-stack:
+    image: ${REDIS_STACK_IMAGE_NAME:-redislabs/client-libs-test:rs-7.4.0-v2}
+    container_name: redis-stack
+    ports:
+      - "6479:6379"
+    environment:
+      - REDIS_CLUSTER=no
+      - REDIS_PASSWORD=foobar
+      - PORT=6379
+    command: ${REDIS_EXTRA_ARGS:---enable-debug-command yes --enable-module-command yes --save "" --requirepass "foobar"}
+    volumes:
+      - "./dockers/redis-stack:/redis/work"
+    profiles:
+      - all
+      - clients
+      - stack
@@ -4,6 +4,7 @@ CAS
 Customizable
 ElastiCache
 FPM
+GC
 IANA
 Lua
 PSR
@@ -50,3 +51,4 @@ unhandled
 invalidations
 Sharded
 sharded
+Valkey
@@ -137,9 +137,38 @@ jobs:
          EXPECTED="LICENSE,README.md,autoload.php,composer.json"
          CURRENT="$(
              git archive HEAD \
-                  | tar --list --exclude="src" --exclude="src/*" --exclude="bin" --exclude="bin/*" --exclude="docker" --exclude="docker/*" \
+                  | tar --list --exclude="src" --exclude="src/*" --exclude="bin" --exclude="bin/*" \
                  | paste --serial --delimiters=","
          )"
          echo "CURRENT =${CURRENT}"
          echo "EXPECTED=${EXPECTED}"
          test "${CURRENT}" = "${EXPECTED}"
+
+  changelog:
+
+    name: Changelog
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+
+    if: >-
+      github.event_name == 'pull_request' &&
+      !contains(github.event.head_commit.message, 'nochangelog') &&
+      !contains(github.event.head_commit.message, 'no-changelog') &&
+      !contains(github.event.head_commit.message, 'no changelog') &&
+      !contains(github.event.pull_request.labels.*.name, 'no-changelog')
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Check for CHANGELOG entry
+        env:
+          TARGET: ${{ github.event.pull_request.base.ref }}
+        run:  |
+          FILES_CHANGED=$(git diff --name-only origin/$TARGET...HEAD | grep -E 'CHANGELOG\.md' -c)
+          if [ "$FILES_CHANGED" != "1" ]; then
+            echo "CHANGELOG.md was not updated";
+            exit 1;
+          fi;
@@ -23,36 +23,92 @@ jobs:
      matrix:
        php:
          - '7.2'
-          - '7.3'
+          - '8.0'
+          - '8.3'
+          - '8.4'
+        redis:
+          - '4.0'
+          - '7.2'
          - '7.4'
          - '8.0'
-          - '8.1'
          - '8.2'
-        redis:
-          - 3
-          - 4
-          - 5
-          - 6
-          - 7
-
-    services:
-      redis:
-        image: redis:${{ matrix.redis }}
-        options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
-        ports:
-          - 6379:6379

    steps:

+      - name: Resolve container name
+        run: |
+          # Mapping of original redis versions to client test containers
+          declare -A redis_clients_version_mapping=(
+            ["8.2"]="8.2"
+            ["8.0"]="8.0.2"
+            ["7.4"]="7.4.2"
+            ["7.2"]="7.2.7"
+          )
+
+          # Mapping of redis version to stack version
+          declare -A redis_stack_version_mapping=(
+            ["7.4"]="rs-7.4.0-v3"
+            ["7.2"]="rs-7.2.0-v15"
+          )
+
+          if [[ -v redis_clients_version_mapping[${{ matrix.redis }}] ]]; then
+            echo "REDIS_IMAGE_NAME=redislabs/client-libs-test:${redis_clients_version_mapping[${{ matrix.redis }}]}" >> $GITHUB_ENV
+            echo "REDIS_STACK_IMAGE_NAME=redislabs/client-libs-test:${redis_stack_version_mapping[${{ matrix.redis }}]}" >> $GITHUB_ENV
+            echo "DOCKER_SERVICE=redis-clients" >> $GITHUB_ENV
+
+            redis_major_version=$(echo "${{ matrix.redis }}" | grep -oP '^\d+')
+
+            # Some configuration options available since Redis > 7
+            if (( redis_major_version < 7 )); then
+              echo "REDIS_EXTRA_ARGS="--tls-auth-clients optional --save ''"" >> $GITHUB_ENV
+            else
+              # Since 8.0 modules are bundled with core
+              echo "REDIS_STACK_SERVER_PORT=6379" >> $GITHUB_ENV
+            fi
+
+          else
+            echo "REDIS_IMAGE_NAME=redis:${{ matrix.redis }}" >> $GITHUB_ENV
+            echo "DOCKER_SERVICE=redis-official" >> $GITHUB_ENV
+          fi
+
      - name: Checkout repository
        uses: actions/checkout@v3

-      - name: Setup PHP with Composer and extensions
+      - name: Start Redis standalone image
+        uses: hoverkraft-tech/compose-action@v2.0.1
+        with:
+          compose-file: .github/docker-compose.yml
+          services: ${{ env.DOCKER_SERVICE }}
+
+      - name: Start Redis unprotected image
+        uses: hoverkraft-tech/compose-action@v2.0.1
+        if: ${{ matrix.redis > '4.0' }}
+        with:
+          compose-file: .github/docker-compose.yml
+          services: redis-unprotected
+
+      - name: Start Redis stack image
+        id: stack_infra
+        uses: hoverkraft-tech/compose-action@v2.0.1
+        if: ${{ matrix.redis >= '7.2' && matrix.redis < '8.0' }}
+        with:
+          compose-file: .github/docker-compose.yml
+          services: redis-stack
+
+      - name: Start Redis cluster image
+        id: cluster_infra
+        uses: hoverkraft-tech/compose-action@v2.0.1
+        if: ${{ matrix.redis > '4.0' }}
+        with:
+          compose-file: .github/docker-compose.yml
+          services: redis-cluster
+
+      - name: Setup PHP
        uses: shivammathur/setup-php@v2
        with:
          php-version: ${{ matrix.php }}
          extensions: relay
-          coverage: ${{ (matrix.php == '8.1' && matrix.redis == '7') && 'xdebug' || 'none' }}
+          coverage: ${{ (matrix.php == '8.4' && matrix.redis == '8.0') && 'xdebug' || 'none' }}

      - name: Install Composer dependencies
        uses: ramsey/composer-install@v2
@@ -61,165 +117,81 @@ jobs:
          composer-options: ${{ matrix.php == '8.0' && '--ignore-platform-reqs' || '' }}

      - name: Run tests
-        if: ${{ matrix.php != '8.1' || matrix.redis != '7' }}
+        if: ${{ matrix.php != '8.4' || matrix.redis != '8.0' }}
        run: vendor/bin/phpunit

      - name: Run tests with coverage
-        if: ${{ matrix.php == '8.1' && matrix.redis == '7' }}
+        if: ${{ matrix.php == '8.4' && matrix.redis == '8.0' }}
        run: vendor/bin/phpunit --coverage-php build/cov/coverage-predis.cov --coverage-filter ./src

      - name: Run tests using Relay
-        if: ${{ matrix.redis >= '6' && (matrix.php != '8.1' || matrix.redis != '7')}}
+        if: ${{ matrix.php != '8.4' && matrix.redis >= '8.0' }}
        run: vendor/bin/phpunit -c phpunit.relay.xml

      - name: Run tests using Relay with coverage
-        if: ${{ matrix.php == '8.1' && matrix.redis == '7' }}
+        if: ${{ matrix.php == '8.4' && matrix.redis == '8.0' }}
        run: vendor/bin/phpunit -c phpunit.relay.xml --coverage-php build/cov/coverage-relay.cov --coverage-filter ./src

-      - name: Merge coverage reports
-        if: ${{ matrix.php == '8.1' && matrix.redis == '7' }}
-        run: php vendor/bin/phpcov merge --clover build/logs/clover.xml build/cov
+      - name: Run tests against unprotected Redis
+        if: ${{ (matrix.php != '8.4' || matrix.redis != '8.0') &&  matrix.redis > '4.0'}}
+        run: vendor/bin/phpunit --group unprotected

-      - name: Send coverage to Coveralls
-        uses: coverallsapp/github-action@v2
-        if: ${{ matrix.php == '8.1' && matrix.redis == '7' }}
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          parallel: true
+      - name: Run tests against unprotected Redis with coverage
+        if: ${{ matrix.php == '8.4' && matrix.redis == '8.0' }}
+        run: vendor/bin/phpunit --group unprotected --coverage-php build/cov/coverage-unprotected.cov --coverage-filter ./src

-  predis-cluster:
-
-    name: PHP ${{ matrix.php }} (Redis Cluster latest)
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        php:
-          - '7.2'
-          - '7.3'
-          - '7.4'
-          - '8.0'
-          - '8.1'
-          - '8.2'
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Run redis cluster
-        uses: isbang/compose-action@v1.4.1
-        with:
-          compose-file: "./docker/unstable_cluster/docker-compose.yml"
-
-      - name: Setup PHP with Composer and extensions
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          extensions: relay
-          coverage: ${{ (matrix.php == '8.1') && 'xdebug' || 'none' }}
-
-      - name: Install Composer dependencies
-        uses: ramsey/composer-install@v2
-        with:
-          dependency-versions: highest
-          composer-options: ${{ matrix.php == '8.0' && '--ignore-platform-reqs' || '' }}
-
-      - name: Run tests against cluster
-        run: |
-          sleep 5 # Timeout to make sure that docker image is setup
-          vendor/bin/phpunit --group cluster,gears-cluster
-
-  predis-stack:
-
-    name: PHP ${{ matrix.php }} (Redis Stack ${{ matrix.redis }})
-    needs: predis
-    runs-on: ubuntu-latest
-
-    services:
-      redis:
-        image: redis/redis-stack-server:${{ matrix.redis }}
-        options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
-        ports:
-          - 6379:6379
-
-    strategy:
-      fail-fast: false
-      matrix:
-        php:
-          - '7.2'
-          - '7.3'
-          - '7.4'
-          - '8.0'
-          - '8.1'
-          - '8.2'
-        redis:
-          - edge
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup PHP with Composer and extensions
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          extensions: relay
-
-      - name: Get Composer cache directory
-        id: composer-cache
-        run: echo "directory=$(composer config cache-dir)" >> $GITHUB_OUTPUT
-
-      - name: Cache Composer dependencies
-        uses: actions/cache@v3
-        with:
-          path: ${{ steps.composer-cache.outputs.directory }}
-          key: tests-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: tests-php-${{ matrix.php }}-composer
-
-      - name: Install Composer dependencies
-        env:
-          PHP_VERSION: ${{ matrix.php }}
-        run: composer install --ansi --no-progress --prefer-dist
-
-      - name: Run tests
-        if: ${{ matrix.php != '8.1' }}
+      - name: Run stack tests
+        if: ${{ (matrix.php != '8.4' || matrix.redis != '8.0') && matrix.redis >= '7.2' }}
        run: vendor/bin/phpunit --group realm-stack

-      - name: Run tests with coverage
-        if: ${{ matrix.php == '8.1' }}
+      - name: Run stack tests with coverage
+        if: ${{ matrix.php == '8.4' && matrix.redis == '8.0' }}
        run: vendor/bin/phpunit --group realm-stack --coverage-php build/cov/coverage-stack.cov --coverage-filter ./src

-      - name: Run redis gears tests
-        if: ${{ matrix.php != '8.1' }}
-        run: vendor/bin/phpunit --group gears
-
-      - name: Run redis gears tests with coverage
-        if: ${{ matrix.php == '8.1' }}
-        run: vendor/bin/phpunit --group gears --coverage-php build/cov/coverage-gears.cov --coverage-filter ./src
-
-      - name: Run tests using Relay
-        if: ${{ matrix.php != '8.1' }}
+      - name: Run stack tests using Relay
+        if: ${{ (matrix.php != '8.4' || matrix.redis != '8.0') && matrix.redis >= '7.2' }}
        run: vendor/bin/phpunit --group realm-stack -c phpunit.relay.xml

-      - name: Run tests using Relay with coverage
-        if: ${{ matrix.php == '8.1' }}
-        run: vendor/bin/phpunit --group realm-stack --coverage-php build/cov/coverage-relay-stack.cov --coverage-filter ./src -c phpunit.relay.xml
+      - name: Run stack tests using Relay with coverage
+        if: ${{ matrix.php == '8.4' && matrix.redis == '8.0' }}
+        run: vendor/bin/phpunit --group realm-stack -c phpunit.relay.xml --coverage-php build/cov/coverage-stack-relay.cov --coverage-filter ./src
+
+      - name: Run tests against cluster
+        if: ${{ (matrix.php != '8.4' || matrix.redis != '8.0') && steps.cluster_infra.conclusion == 'success' }}
+        run: |
+          vendor/bin/phpunit --group cluster
+
+      - name: Run tests against cluster with coverage
+        if: ${{ matrix.php == '8.4' && matrix.redis == '8.0' && steps.cluster_infra.conclusion == 'success' }}
+        run: |
+          vendor/bin/phpunit --group cluster --coverage-php build/cov/coverage-cluster.cov --coverage-filter ./src
+
+      - name: Run tests against cluster using Relay
+        if: ${{ matrix.php != '8.4' && matrix.redis == '8.0' }}
+        run: |
+          sleep 5
+          vendor/bin/phpunit -c phpunit.relay.xml --group cluster
+
+      - name: Run tests against cluster using Relay with coverage
+        if: ${{ matrix.php == '8.4' && matrix.redis == '8.0' }}
+        run: |
+          sleep 5
+          vendor/bin/phpunit -c phpunit.relay.xml --group cluster --coverage-php build/cov/coverage-cluster-relay.cov --coverage-filter ./src

      - name: Merge coverage reports
-        if: ${{ matrix.php == '8.1' }}
+        if: ${{ matrix.php == '8.4' && matrix.redis == '8.0' }}
        run: php vendor/bin/phpcov merge --clover build/logs/clover.xml build/cov

      - name: Send coverage to Coveralls
        uses: coverallsapp/github-action@v2
-        if: ${{ matrix.php == '8.1' }}
+        if: ${{ matrix.php == '8.4' && matrix.redis == '8.0' }}
        with:
          github-token: ${{ secrets.GITHUB_TOKEN }}
          parallel: true

  finish:
    name: Finish Coverall
-    needs: predis-stack
+    needs: predis
    if: ${{ always() }}
    runs-on: ubuntu-latest
    steps:
@@ -4,28 +4,34 @@ $PREDIS_HEADER = <<<EOS
 This file is part of the Predis package.

 (c) 2009-2020 Daniele Alessandri
-(c) 2021-2023 Till Krüss
+(c) 2021-2025 Till Krüss

 For the full copyright and license information, please view the LICENSE
 file that was distributed with this source code.
 EOS;

-return (new PhpCsFixer\Config)
-    ->setRules([
-        '@PHP71Migration' => true,
-        'header_comment' => ['header' => $PREDIS_HEADER],
-        '@Symfony' => true,
-        'phpdoc_separation' => false,
-        'phpdoc_annotation_without_dot' => false,
-        'no_superfluous_phpdoc_tags' => false,
-        'no_unneeded_curly_braces' => false,
-        'no_unneeded_braces' => false,
-        'global_namespace_import' => true,
-        'yoda_style' => false,
-        'single_line_throw' => false,
-        'concat_space' => ['spacing' => 'one'],
-        'increment_style' => false,
-    ])
+$fixer = new PhpCsFixer\Config;
+
+$fixer->setParallelConfig(
+    \PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect()
+);
+
+$fixer->setRules([
+    '@PHP71Migration' => true,
+    'header_comment' => ['header' => $PREDIS_HEADER],
+    '@Symfony' => true,
+    'phpdoc_separation' => false,
+    'phpdoc_annotation_without_dot' => false,
+    'no_superfluous_phpdoc_tags' => false,
+    'no_unneeded_curly_braces' => false,
+    'no_unneeded_braces' => false,
+    'global_namespace_import' => true,
+    'yoda_style' => false,
+    'single_line_throw' => false,
+    'concat_space' => ['spacing' => 'one'],
+    'increment_style' => false,
+    'trailing_comma_in_multiline' => ['after_heredoc' => true, 'elements' => ['array_destructuring', 'arrays']]
+])
    ->setFinder(
        PhpCsFixer\Finder::create()
            ->in(__DIR__ . '/bin')
@@ -33,3 +39,5 @@ return (new PhpCsFixer\Config)
            ->in(__DIR__ . '/src')
            ->in(__DIR__ . '/tests')
    );
+
+return $fixer;
@@ -1,30 +1,116 @@
 ## Changelog

-## v3.0.0-alpha1 (2024-01-19)
-
-Predis v3.0 introduces support for new communication protocol [RESP3](https://github.com/redis/redis-specifications/blob/master/protocol/RESP3.md) and [new features](README.md#resp3) based on it.
-
-### Breaking Changes
- Refactored Relay integration (#1423)
- Changed interface of `CLIENT` command (#1337)
- Changed interfaces for commands to support Redis 6.2—7.0 arguments (#1330)
-
+## Unreleased
 ### Added
+### Changed
+### Maintenance
+
+## v3.2.0 (2025-08-05)
+### Added
+- Added support for `XDELEX` and `XACKDEL` (#1580)
+- Added missing VSIM argument (#1582)
+
+### Changed
+- Extended `XTRIM` and `XADD` commands with new parameters (#1580)
+
+### Maintenance
+- Updated Redis 8.2 test image (#1583)
+- Added test coverage for updated Vamana (#1584)
+
+## v3.1.0 (2025-07-22)
+### Added
+- Add experimental support for vector sets commands (#1550)
+- Added support for `XACK` command (#1555)
+- Added support for `XCLAIM` command (#1557)
+- Added support for `XPENDING` command (#1558)
+- Added support for `XSETID` command (#1559)
+- Added validation and support for the new `BITOP` command operations (#1566)
+
+### Changed
+- Handle and retry `LOADING` errors from Sentinel replicas (#1536)
+- Retry all exceptions from Sentinel replicas (#1577)
+
+### Fixed
+- Fixed PHP 8.4 deprecated call to `stream_context_set_option()` (#1545)
+- Fixed return type for `ZCOUNT` to be `int` (#1547)
+- Fixed throwing `CommunicationException` when stream is EOF (#1548)
+- Removed automatic `conn_uid` parameter assignment (#1552)
+- Fixed wrong command API call on prefix processing (#1554)
+- Fixed `XREAD` response parsing while read null (#1563)
+- Fixed `XINFO` command responses parsing (#1560)
+- Marked missing commands as Prefixable (#1576)
+
+## v3.0.1 (2025-05-16)
+### Fixed
+- Send `default` user if only password is used for authentication (#1535)
+
+## v3.0.0 (2025-05-02)
+### Added
+- ⚠️ Added support for transactions for clustered connections (#1497)
 - Added support for RESP3 communication protocol (#1047)
- Added support for [Push notifications](https://github.com/redis/redis-specifications/blob/master/protocol/RESP3.md#push-type) (#1316)
+- Added support for RESP3 push notifications (#1316)
 - Added support for Sharded Pub/Sub (#1303)
 - Added support for `XGROUP` commands (#1324)
 - Added support for `XREADGROUP` command (#1327)
 - Added support for `XAUTOCLAIM` command (#1328)
 - Added support for `XINFO` commands (#1331)
- Added support for Redis Gears triggered functions API (#1348)
+- Added support for Redis 7.4 `XREAD` and `HSCAN` interface changes (#1452)

+### Changed
+- ⚠️ Refactored Relay integration (#1423)
+- ⚠️ Changed interface of `CLIENT` command (#1337)
+- ⚠️ Changed interfaces for commands to support Redis 6.2 — 7.0 arguments (#1330)
+- ⚠️ Changed default search `DIALECT` to `2` (#1516)
+- ⚠️ Implemented PSR-7 compatible stream abstraction (#1450)
+- ⚠️ Improved pipeline abstractions (#1438)
+- ⚠️ Improved connection handshake (#1431)
+
+### Fixed
+- Fixed single persistent connection using the same resource (#1512)
+
+### Maintenance
+- Revisit incompatible tests against Relay (#1537)
+
+## v2.4.0 (2025-04-30)
+### Added
+- Added new hash-field expiration commands (#1520)
+- Added missing `FT._LIST` and `BITFIELD_RO` commands (#1521)
+
+### Changed
+- Update `WATCH` command to accept `string|string[]` (#1476)
+- Optimize cluster slotmap with compact slot range object (#1493)
+
+### Fixed
+- Fixed `EVAL_RO` cluster support (#1449)
+- Fixed PHP 8.4 compatibility with `stream_context_set_option()` (#1503)
+- Prevent named arguments runtime failure (#1509)
+- Mark `GEOSEARCH` as read-only to ensure execution on replica (#1481)
+- Fixed protocol loss during redis cluster `MOVED` / `ASK` (#1530)
+
+### Maintenance
+- Added CI testing with Redis 8.0 (#1510)
+- Added test coverage for compatibility with Redis 8.0 (#1513)
+- Use parallel on PHP-CS-Fixer (#1489)
+
+## v2.3.0 (2024-11-21)
+### Added
+- Added `GeoShapeField` field (#1467)
+- Added hash expiration commands (#1456)
+- Added support for time series `IGNORE` filter (#1458)
+- Added `XREAD` commands (#1459)
+- Added `NOVALUES` argument support to `HSCAN` (#1459)
+- Added support for search `INDEXMISSING` and `INDEXEMPTY` arguments (#1464)
+
+### Changed
+- Explicitly mark nullable parameters as nullable (#1448)
+- Filter out available replicas based on link status flag (#1440)
+- Respect `prefix` for `ZPOPMIN`, `ZPOPMAX`, `ZMSCORE`, `LMOVE`, `BLMOVE`, `SMISMEMBER` and `GEOSEARCH` (#1451, #1453, #1455, #1468)
+- Updated test infrastructure (#1510)
+-
 ## v2.2.0 (2023-06-14)

 Predis v2.2.0 introduces official support for [Redis Stack](https://redis.io/docs/stack/) as well as a [Relay](https://github.com/cachewerk/relay) integration for substantially [faster read performance](https://github.com/predis/predis/wiki/Using-Relay).

-## v2.2.0-RC1 (2023-05-09)
-
 ### Added
 - Added support for [Relay](https://github.com/predis/predis/wiki/Using-Relay) (#1263)
 - Added support for `FCALL_RO` command (#1191)
@@ -81,65 +81,17 @@ An exception to this rule is [`SORT`](http://redis.io/commands/sort) for which m

 ## When should I use Relay? ##

-If you care about performance, __always__. [Relay](https://github.com/cachewerk/relay) is free to use.
+If you care about performance, __always__. [Relay][relay] is free to use.

 ## When should I use PhpRedis? ###

-Predis is fast enough when Redis is located on the same machine as PHP, more on that later.
+Predis is fast enough when Redis is located on the same machine as PHP.

-[PhpRedis](https://github.com/phpredis/phpredis) (and Relay) perform significantly better when
-network I/O is involved, due to their ability to compress data by ~75%. Fewer bytes and received
-sent over the network [means faster operations](https://akalongman.medium.com/phpredis-vs-predis-comparison-on-real-production-data-a819b48cbadb),
-and potentially cost savings when network traffic isn't free (e.g. AWS ElastiCache Inter-AZ transfer costs).
+[PhpRedis][phpredis] and [Relay][relay] perform significantly better when network I/O is involved,
+due to its ability to compress data by ~75%. Fewer bytes and received sent over the network
+[means faster operations][performance], and potentially cost savings when network traffic isn't
+free (e.g. AWS ElastiCache Inter-AZ transfer costs).

-## Predis is a pure-PHP implementation: it can not be fast enough! ##
-
-It really depends, but most of the times the answer is: _yes, it is fast enough_. I will give you a
-couple of easy numbers with a simple test that uses a single client and is executed by PHP 5.5.6
-against a local instance of Redis 2.8 that runs under Ubuntu 13.10 on a Intel Q6600:
-
-```
-21000 SET/sec using 12 bytes for both key and value.
-21000 GET/sec while retrieving the very same values.
-0.130 seconds to fetch 30000 keys using _KEYS *_.
-```
-
-How does it compare with [__PhpRedis__](http://github.com/phpredis/phpredis), a nice C extension
-providing an efficient client for Redis?
-
-```
-30100 SET/sec using 12 bytes for both key and value
-29400 GET/sec while retrieving the very same values
-0.035 seconds to fetch 30000 keys using "KEYS *"".
-```
-
-Wow __PhpRedis__ seems much faster! Well, we are comparing a C extension with a pure-PHP library so
-lower numbers are quite expected but there is a fundamental flaw in them: is this really how you are
-going to use Redis in your application? Are you really going to send thousands of commands using a
-for-loop on each page request using a single client instance? If so... well I guess you are probably
-doing something wrong. Also, if you need to `SET` or `GET` multiple keys you should definitely use
-commands such as `MSET` and `MGET`. You can also use pipelining to get more performances when this
-technique can be used.
-
-There is one more thing: we have tested the overhead of Predis by connecting on a localhost instance
-of Redis but how these numbers change when we hit the physical network by connecting to remote Redis
-instances?
-
-```
-Using Predis:
-3200 SET/sec using 12 bytes for both key and value
-3200 GET/sec while retrieving the very same values
-0.132 seconds to fetch 30000 keys using "KEYS *".
-
-Using PhpRedis:
-3500 SET/sec using 12 bytes for both key and value
-3500 GET/sec while retrieving the very same values
-0.045 seconds to fetch 30000 keys using "KEYS *".
-```
-
-There you go, you get almost the same average numbers and the reason is simple: network latency is a
-real performance killer and you cannot do (almost) anything about that. As a disclaimer, remember
-that we are measuring the overhead of client libraries implementations and the effects of network
-round-trip times, so we are not really measuring how fast Redis is. Redis shines best with thousands
-of concurrent clients doing requests! Also, actual performances should be measured according to how
-your application will use Redis.
+[phpredis]: https://github.com/phpredis/phpredis
+[relay]: [https://github.com/phpredis/phpredis](https://github.com/cachewerk/relay)
+[performance]: https://akalongman.medium.com/phpredis-vs-predis-comparison-on-real-production-data-a819b48cbadb
@@ -1,7 +1,7 @@
 MIT License

 Copyright (c) 2009-2020 Daniele Alessandri (original work)
-Copyright (c) 2021-2023 Till Krüss (modified work)
+Copyright (c) 2021-2024 Till Krüss (modified work)

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -7,14 +7,14 @@
 [![Build status][ico-build]][link-actions]
 [![Coverage Status][ico-coverage]][link-coverage]

-A flexible and feature-complete [Redis](http://redis.io) client for PHP 7.2 and newer.
+A flexible and feature-complete [Redis](http://redis.io) / [Valkey](https://github.com/valkey-io/valkey) client for PHP 7.2 and newer.

 More details about this project can be found on the [frequently asked questions](FAQ.md).


 ## Main features ##

- Support for Redis from __3.0__ to __7.0__.
+- Support for Redis from __3.0__ to __8.0__.
 - Support for clustering using client-side sharding and pluggable keyspace distributors.
 - Support for [redis-cluster](http://redis.io/topics/cluster-tutorial) (Redis >= 3.0).
 - Support for master-slave replication setups and [redis-sentinel](http://redis.io/topics/sentinel).
@@ -138,6 +138,50 @@ it is still desired to have control of when the connection is opened or closed:
 achieved by invoking `$client->connect()` and `$client->disconnect()`. Please note that the effect
 of these methods on aggregate connections may differ depending on each specific implementation.

+#### Persistent connections ####
+
+To increase a performance of your application you may set up a client to use persistent TCP connection, this way
+client saves a time on socket creation and connection handshake. By default, connection is created on first-command
+execution and will be automatically closed by GC before the process is being killed.
+However, if your application is backed by PHP-FPM the processes are idle, and you may set up it to be persistent and
+reusable across multiple script execution within the same process.
+
+To enable the persistent connection mode you should provide following configuration:
+
+```php
+// Standalone
+$client = new Predis\Client(['persistent' => true]);
+
+// Cluster
+$client = new Predis\Client(
+    ['tcp://host:port', 'tcp://host:port', 'tcp://host:port'],
+    ['cluster' => 'redis', 'parameters' => ['persistent' => true]]
+);
+```
+
+**Important**
+
+If you operate on multiple clients within the same application, and they communicate with the same resource, by default
+they will share the same socket (that's the default behaviour of persistent sockets). So in this case you would need
+to additionally provide a `conn_uid` identifier for each client, this way each client will create its own socket so
+the connection context won't be shared across clients. This socket behaviour explained
+[here](https://www.php.net/manual/en/function.stream-socket-client.php#105393)
+
+```php
+// Standalone
+$client1 = new Predis\Client(['persistent' => true, 'conn_uid' => 'id_1']);
+$client2 = new Predis\Client(['persistent' => true, 'conn_uid' => 'id_2']);
+
+// Cluster
+$client1 = new Predis\Client(
+    ['tcp://host:port', 'tcp://host:port', 'tcp://host:port'],
+    ['cluster' => 'redis', 'parameters' => ['persistent' => true, 'conn_uid' => 'id_1']]
+);
+$client2 = new Predis\Client(
+    ['tcp://host:port', 'tcp://host:port', 'tcp://host:port'],
+    ['cluster' => 'redis', 'parameters' => ['persistent' => true, 'conn_uid' => 'id_2']]
+);
+```

 ### Client configuration ###

@@ -336,6 +380,25 @@ This abstraction can perform check-and-set operations thanks to `WATCH` and `UNW
 automatic retries of transactions aborted by Redis when `WATCH`ed keys are touched. For an example
 of a transaction using CAS you can see [the following example](examples/transaction_using_cas.php).

+#### Support for clustered connections ####
+
+Since Predis v3.0 transactions could be used with clustered connections. However, it has some limitations due to the
+fact that Redis doesn't support distributed transactions. All keys in the transaction context should operate on the same
+hash slot, due to this limitation it's recommended to use `{}` syntax to make sure that all keys will be mapped to the same hash
+slot. Apart from it no additional configuration needed on a client side.
+
+```php
+$redis = $this->getClient();
+
+$response = $redis->transaction(function (MultiExec $tx) {
+    $tx->set('{foo}foo', 'value');
+    $tx->set('{foo}bar', 'value');
+    $tx->set('{foo}baz', 'value');
+});
+
+// ['OK', 'OK', 'OK']
+```
+

 ### Adding new commands ###

@@ -449,7 +512,7 @@ implementation of the standard connection classes available in the `Predis\Conne
 ## RESP3 ##

 ### Connection ###
-To establish the connection using RESP3 protocol, you need to set parameter `protocol => 3`. Default protocol is still RESP2.
+To establish the connection using the [RESP3](https://github.com/redis/redis-specifications/blob/master/protocol/RESP3.md) protocol, you need to set parameter `protocol => 3`. The default protocol is RESP2.

 You can pass parameter as configuration option in array or as a query parameter in `redis_url`

@@ -487,6 +550,7 @@ $client = new \Predis\Client(['protocol' => 3]);
 // RESP3 introduces new double type, that corresponds to PHP float.
 var_dump($client->geopos('my_geo', ['member1']));
 ```
+
 #### Aggregate types ####
 In RESP3 new aggregate type [Map](https://github.com/redis/redis-specifications/blob/master/protocol/RESP3.md#map-type)
 was introduced, that represents the sequence of field-value pairs. So it simplifies parsing, since we don't need to specify
@@ -495,6 +559,7 @@ parsing strategy per command (RESP2) and instead relies on the type defined by p
 In most cases RESP2 responses shouldn't differ from RESP3, since we added additional parsing for those
 command that return field-value pairs. However, since RESP2 requires additional parsing, it could be that some commands
 had lack of it and return unhandled responses. In this case there would be difference like this:
+
 ```php
 $client = new \Predis\Client();

@@ -1 +1 @@
-3.0.0-alpha1
+3.2.0
@@ -15,7 +15,7 @@
 // For example, to generate a test case for SET (which is represented by the
 // Predis\Command\Redis\StringSet class):
 //
-//   $ ./bin/generate-command-test --class=StringSet
+//   $ ./bin/create-command-test --class=StringSet
 //
 // Here is a list of optional arguments:
 //
@@ -1,7 +1,7 @@
 {
    "name": "predis/predis",
    "type": "library",
-    "description": "A flexible and feature-complete Redis client for PHP.",
+    "description": "A flexible and feature-complete Redis/Valkey client for PHP.",
    "keywords": ["nosql", "redis", "predis"],
    "homepage": "http://github.com/predis/predis",
    "license": "MIT",
@@ -22,7 +22,8 @@
        }
    ],
    "require": {
-        "php": "^7.2 || ^8.0"
+        "php": "^7.2 || ^8.0",
+        "psr/http-message": "^1.0|^2.0"
    },
    "require-dev": {
        "friendsofphp/php-cs-fixer": "^3.3",
@@ -1,7 +0,0 @@
-FROM redis/redis-stack-server:edge as rss
-
-COPY create_cluster.sh /create_cluster.sh
-RUN ls -R /opt/redis-stack
-RUN chmod a+x /create_cluster.sh
-
-ENTRYPOINT [ "/create_cluster.sh"]
@@ -1,47 +0,0 @@
-#! /bin/bash
-
-mkdir -p /nodes
-touch /nodes/nodemap
-if [ -z ${START_PORT} ]; then
-    START_PORT=6372
-fi
-if [ -z ${END_PORT} ]; then
-    END_PORT=6377
-fi
-if [ ! -z "$3" ]; then
-    START_PORT=$2
-    START_PORT=$3
-fi
-echo "STARTING: ${START_PORT}"
-echo "ENDING: ${END_PORT}"
-
-for PORT in `seq ${START_PORT} ${END_PORT}`; do
-  mkdir -p /nodes/$PORT
-  if [[ -e /redis.conf ]]; then
-    cp /redis.conf /nodes/$PORT/redis.conf
-  else
-    touch /nodes/$PORT/redis.conf
-  fi
-  cat << EOF >> /nodes/$PORT/redis.conf
-port ${PORT}
-cluster-enabled yes
-daemonize yes
-logfile /redis.log
-dir /nodes/$PORT
-EOF
-
-  set -x
-  /opt/redis-stack/bin/redis-server /nodes/$PORT/redis.conf
-  sleep 1
-  if [ $? -ne 0 ]; then
-    echo "Redis failed to start, exiting."
-    continue
-  fi
-  echo 127.0.0.1:$PORT >> /nodes/nodemap
-done
-if [ -z "${REDIS_PASSWORD}" ]; then
-    echo yes | /opt/redis-stack/bin/redis-cli --cluster create `seq -f 127.0.0.1:%g ${START_PORT} ${END_PORT}` --cluster-replicas 1
-else
-    echo yes | opt/redis-stack/bin/redis-cli -a ${REDIS_PASSWORD} --cluster create `seq -f 127.0.0.1:%g ${START_PORT} ${END_PORT}` --cluster-replicas 1
-fi
-tail -f /redis.log
@@ -1,17 +0,0 @@
-version: "3.9"
-services:
-  cluster:
-    container_name: redis-cluster
-    build:
-      context: .
-      dockerfile: Dockerfile
-    ports:
-      - "6372:6372"
-      - "6373:6373"
-      - "6374:6374"
-      - "6375:6375"
-      - "6376:6376"
-      - "6377:6377"
-    volumes:
-      - "./redis.conf:/redis.conf:ro"
-
@@ -1,10 +0,0 @@
-# Redis Cluster config file will be shared across all nodes.
-# Do not change the following configurations that are already set:
-# port, cluster-enabled, daemonize, logfile, dir
-protected-mode no
-loadmodule /opt/redis-stack/lib/redisearch.so
-loadmodule /opt/redis-stack/lib/redisgraph.so
-loadmodule /opt/redis-stack/lib/redisgears.so v8-plugin-path /opt/redis-stack/lib/libredisgears_v8_plugin.so
-loadmodule /opt/redis-stack/lib/redistimeseries.so
-loadmodule /opt/redis-stack/lib/rejson.so
-loadmodule /opt/redis-stack/lib/redisbloom.so
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2025 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Predis\Client;
+
+require __DIR__ . '/../shared.php';
+
+// Example of WAITAOF command usage:
+
+// 1. Enable appendonly mode if it's not (command works only in appendonly mode)
+$client = new Client($single_server);
+$info = $client->info();
+$enabled = false;
+
+if ($info['Persistence']['aof_enabled'] === '0') {
+    $client->config('set', 'appendonly', 'yes');
+    $enabled = true;
+}
+
+// 2. Set key value pair
+$response = $client->set('foo', 'bar');
+echo "Key-value pair set status: {$response}\n";
+
+// 3. Run WAITAOF command to make sure that all previous writes was fsynced
+$response = $client->waitaof(1, 0, 0);
+
+echo "Quantity of local instances that was fsynced - {$response[0]}, quantity of replicas - {$response[1]}";
+
+// 4. Disable appendonly mode if it was enabled during script execution
+if ($enabled) {
+    $client->config('set', 'appendonly', 'no');
+}
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -35,8 +35,8 @@ $client = new Client(
        'tcp://127.0.0.1:6373?read_write_timeout=0',
        'tcp://127.0.0.1:6374?read_write_timeout=0',
    ], [
-    'cluster' => 'redis',
-]);
+        'cluster' => 'redis',
+    ]);

 // 2. Run pub/sub loop.
 $pubSub = $client->pubSubLoop();
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -21,8 +21,8 @@ $client = new Client(
        'tcp://127.0.0.1:6373?read_write_timeout=0',
        'tcp://127.0.0.1:6374?read_write_timeout=0',
    ], [
-    'cluster' => 'redis',
-]);
+        'cluster' => 'redis',
+    ]);

 // 2. Run pub/sub loop. Sharded channels belongs to different shards.
 $pubSub = $client->pubSubLoop();
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -32,7 +32,7 @@ function zpop($client, $key)
        'cas' => true,      // Initialize with support for CAS operations
        'watch' => $key,    // Key that needs to be WATCHed to detect changes
        'retry' => 3,       // Number of retries on aborted transactions, after
-                            // which the client bails out with an exception.
+        // which the client bails out with an exception.
    ];

    $client->transaction($options, function ($tx) use ($key, &$element) {
@@ -29,6 +29,7 @@
            <group>ext-curl</group>
            <group>cluster</group>
            <group>gears</group>
+            <group>unprotected</group>
        </exclude>
    </groups>

@@ -41,11 +42,17 @@
    <php>
        <const name="REDIS_SERVER_HOST" value="127.0.0.1" />
        <const name="REDIS_SERVER_PORT" value="6379" />
+        <const name="REDIS_UNPROTECTED_SERVER_PORT" value="6380" />
        <const name="REDIS_SERVER_DBNUM" value="0" />
+        <const name="REDIS_PASSWORD" value="foobar" />
        <env name="USE_RELAY" value="true" />
+        <env name="REDIS_STACK_SERVER_PORT" value="6479" />

        <!-- Redis Cluster -->
        <!-- Only master nodes endpoints included -->
-        <const name="REDIS_CLUSTER_ENDPOINTS" value="127.0.0.1:6372,127.0.0.1:6373,127.0.0.1:6374" />
+        <const
+            name="REDIS_CLUSTER_ENDPOINTS"
+            value="127.0.0.1:6372?password=foobar,127.0.0.1:6373?password=foobar,127.0.0.1:6374?password=foobar"
+        />
    </php>
 </phpunit>
@@ -10,6 +10,9 @@
    stopOnFailure="false"
    beStrictAboutTestsThatDoNotTestAnything="true"
 >
+    <php>
+        <ini name="error_reporting" value="E_ALL &amp; ~E_DEPRECATED"/>
+    </php>

    <testsuites>
        <testsuite name="Predis Test Suite">
@@ -29,6 +32,7 @@
            <group>cluster</group>
            <group>gears</group>
            <group>gears-cluster</group>
+            <group>unprotected</group>
            <!-- <group>connected</group> -->
            <!-- <group>disconnected</group> -->
            <!-- <group>commands</group> -->
@@ -45,11 +49,17 @@
    <php>
        <const name="REDIS_SERVER_HOST" value="127.0.0.1" />
        <const name="REDIS_SERVER_PORT" value="6379" />
+        <const name="REDIS_UNPROTECTED_SERVER_PORT" value="6380" />
        <const name="REDIS_SERVER_DBNUM" value="0" />
+        <const name="REDIS_PASSWORD" value="foobar" />
        <env name="USE_RELAY" value="false" />
+        <env name="REDIS_STACK_SERVER_PORT" value="6479" />

        <!-- Redis Cluster -->
        <!-- Only master nodes endpoints included -->
-        <const name="REDIS_CLUSTER_ENDPOINTS" value="127.0.0.1:6372,127.0.0.1:6373,127.0.0.1:6374" />
+        <const
+            name="REDIS_CLUSTER_ENDPOINTS"
+            value="127.0.0.1:6372?password=foobar,127.0.0.1:6373?password=foobar,127.0.0.1:6374?password=foobar"
+        />
    </php>
 </phpunit>
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -54,7 +54,7 @@ use Traversable;
 */
 class Client implements ClientInterface, IteratorAggregate
 {
-    public const VERSION = '3.0.0-alpha1';
+    public const VERSION = '3.2.0';

    /** @var OptionsInterface */
    private $options;
@@ -478,7 +478,7 @@ class Client implements ClientInterface, IteratorAggregate
     *
     * @return Pipeline|array
     */
-    protected function createPipeline(array $options = null, $callable = null)
+    protected function createPipeline(?array $options = null, $callable = null)
    {
        if (isset($options['atomic']) && $options['atomic']) {
            $class = Atomic::class;
@@ -526,12 +526,12 @@ class Client implements ClientInterface, IteratorAggregate
    /**
     * Actual transaction context initializer method.
     *
-     * @param array $options  Options for the context.
-     * @param mixed $callable Optional callable used to execute the context.
+     * @param array|null $options  Options for the context.
+     * @param mixed      $callable Optional callable used to execute the context.
     *
     * @return MultiExecTransaction|array
     */
-    protected function createTransaction(array $options = null, $callable = null)
+    protected function createTransaction(?array $options = null, $callable = null)
    {
        $transaction = new MultiExecTransaction($this, $options);

@@ -561,7 +561,7 @@ class Client implements ClientInterface, IteratorAggregate
     * @param  callable|null $preLoopCallback Callback that should be called on client before enter a loop.
     * @return PushConsumer
     */
-    public function push(callable $preLoopCallback = null): PushConsumer
+    public function push(?callable $preLoopCallback = null): PushConsumer
    {
        return new PushConsumer($this, $preLoopCallback);
    }
@@ -569,12 +569,12 @@ class Client implements ClientInterface, IteratorAggregate
    /**
     * Actual publish/subscribe context initializer method.
     *
-     * @param array $options  Options for the context.
-     * @param mixed $callable Optional callable used to execute the context.
+     * @param array|null $options  Options for the context.
+     * @param mixed      $callable Optional callable used to execute the context.
     *
     * @return PubSubConsumer|null
     */
-    protected function createPubSub(array $options = null, $callable = null)
+    protected function createPubSub(?array $options = null, $callable = null)
    {
        if ($this->connection instanceof RelayConnection) {
            $pubsub = new RelayPubSubConsumer($this, $options);
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -44,8 +44,8 @@ use Predis\Command\Container\FUNCTIONS;
 use Predis\Command\Container\Json\JSONDEBUG;
 use Predis\Command\Container\Search\FTCONFIG;
 use Predis\Command\Container\Search\FTCURSOR;
-use Predis\Command\Container\TFUNCTION;
 use Predis\Command\Container\XGROUP;
+use Predis\Command\Redis\VADD;

 /**
 * Interface defining a client-side context such as a pipeline or transaction.
@@ -67,8 +67,8 @@ use Predis\Command\Container\XGROUP;
 * @method $this randomkey()
 * @method $this rename($key, $target)
 * @method $this renamenx($key, $target)
- * @method $this scan($cursor, array $options = null)
- * @method $this sort($key, array $options = null)
+ * @method $this scan($cursor, ?array $options = null)
+ * @method $this sort($key, ?array $options = null)
 * @method $this sort_ro(string $key, ?string $byPattern = null, ?LimitOffsetCount $limit = null, array $getPatterns = [], ?string $sorting = null, bool $alpha = false)
 * @method $this ttl($key)
 * @method $this type($key)
@@ -85,6 +85,7 @@ use Predis\Command\Container\XGROUP;
 * @method $this bitcount(string $key, $start = null, $end = null, string $index = 'byte')
 * @method $this bitop($operation, $destkey, $key)
 * @method $this bitfield($key, $subcommand, ...$subcommandArg)
+ * @method $this bitfield_ro(string $key, ?array $encodingOffsetMap = null)
 * @method $this bitpos($key, $bit, $start = null, $end = null, string $index = 'byte')
 * @method $this blmpop(int $timeout, array $keys, string $modifier = 'left', int $count = 1)
 * @method $this bzpopmax(array $keys, int $timeout)
@@ -113,6 +114,7 @@ use Predis\Command\Container\XGROUP;
 * @method $this failover(?To $to = null, bool $abort = false, int $timeout = -1)
 * @method $this fcall(string $function, array $keys, ...$args)
 * @method $this fcall_ro(string $function, array $keys, ...$args)
+ * @method $this ft_list()
 * @method $this ftaggregate(string $index, string $query, ?AggregateArguments $arguments = null)
 * @method $this ftaliasadd(string $alias, string $index)
 * @method $this ftaliasdel(string $alias)
@@ -156,8 +158,17 @@ use Predis\Command\Container\XGROUP;
 * @method $this strlen($key)
 * @method $this hdel($key, array $fields)
 * @method $this hexists($key, $field)
+ * @method $this hexpire(string $key, int $seconds, array $fields, string $flag = null)
+ * @method $this hexpireat(string $key, int $unixTimeSeconds, array $fields, string $flag = null)
+ * @method $this hexpiretime(string $key, array $fields)
+ * @method $this hpersist(string $key, array $fields)
+ * @method $this hpexpire(string $key, int $milliseconds, array $fields, string $flag = null)
+ * @method $this hpexpireat(string $key, int $unixTimeMilliseconds, array $fields, string $flag = null)
+ * @method $this hpexpiretime(string $key, array $fields)
 * @method $this hget($key, $field)
+ * @method $this hgetex(string $key, array $fields, string $modifier = HGETEX::NULL)
 * @method $this hgetall($key)
+ * @method $this hgetdel(string $key, array $fields)
 * @method $this hincrby($key, $field, $increment)
 * @method $this hincrbyfloat($key, $field, $increment)
 * @method $this hkeys($key)
@@ -165,9 +176,12 @@ use Predis\Command\Container\XGROUP;
 * @method $this hmget($key, array $fields)
 * @method $this hmset($key, array $dictionary)
 * @method $this hrandfield(string $key, int $count = 1, bool $withValues = false)
- * @method $this hscan($key, $cursor, array $options = null)
+ * @method $this hscan($key, $cursor, ?array $options = null)
 * @method $this hset($key, $field, $value)
+ * @method $this hsetex(string $key, array $fieldValueMap, string $setModifier = HSETEX::SET_NULL, string $ttlModifier = HSETEX::TTL_NULL, int|bool $ttlModifierValue = false)
 * @method $this hsetnx($key, $field, $value)
+ * @method $this httl(string $key, array $fields)
+ * @method $this hpttl(string $key, array $fields)
 * @method $this hvals($key)
 * @method $this hstrlen($key, $field)
 * @method $this jsonarrappend(string $key, string $path = '$', ...$value)
@@ -227,7 +241,7 @@ use Predis\Command\Container\XGROUP;
 * @method $this spop($key, $count = null)
 * @method $this srandmember($key, $count = null)
 * @method $this srem($key, $member)
- * @method $this sscan($key, $cursor, array $options = null)
+ * @method $this sscan($key, $cursor, ?array $options = null)
 * @method $this ssubscribe(string ...$shardChannels)
 * @method $this subscribe(string ...$channels)
 * @method $this sunsubscribe(?string ...$shardChannels = null)
@@ -247,8 +261,6 @@ use Predis\Command\Container\XGROUP;
 * @method $this tdigestreset(string $key)
 * @method $this tdigestrevrank(string $key, float ...$value)
 * @method $this tdigesttrimmed_mean(string $key, float $lowCutQuantile, float $highCutQuantile)
- * @method $this tfcall(string $libraryName, string $functionName, array $keys = [], array $arguments = [])
- * @method $this tfcallasync(string $libraryName, string $functionName, array $keys = [], array $arguments = [])
 * @method $this topkadd(string $key, ...$items)
 * @method $this topkincrby(string $key, ...$itemIncrement)
 * @method $this topkinfo(string $key)
@@ -262,7 +274,7 @@ use Predis\Command\Container\XGROUP;
 * @method $this tsdecrby(string $key, float $value, ?DecrByArguments $arguments = null)
 * @method $this tsdel(string $key, int $fromTimestamp, int $toTimestamp)
 * @method $this tsdeleterule(string $sourceKey, string $destKey)
- * @method $this tsget(string $key, GetArguments $arguments = null)
+ * @method $this tsget(string $key, ?GetArguments $arguments = null)
 * @method $this tsincrby(string $key, float $value, ?IncrByArguments $arguments = null)
 * @method $this tsinfo(string $key, ?InfoArguments $arguments = null)
 * @method $this tsmadd(mixed ...$keyTimestampValue)
@@ -272,6 +284,21 @@ use Predis\Command\Container\XGROUP;
 * @method $this tsqueryindex(string ...$filterExpression)
 * @method $this tsrange(string $key, $fromTimestamp, $toTimestamp, ?RangeArguments $arguments = null)
 * @method $this tsrevrange(string $key, $fromTimestamp, $toTimestamp, ?RangeArguments $arguments = null)
+ * @method $this xack(string $key, string $group, string ...$id)
+ * @method $this xackdel(string $key, string $group, string $mode, array $ids)
+ * @method $this xadd(string $key, array $dictionary, string $id = '*', array $options = null)
+ * @method $this xautoclaim(string $key, string $group, string $consumer, int $minIdleTime, string $start, ?int $count = null, bool $justId = false)
+ * @method $this xclaim(string $key, string $group, string $consumer, int $minIdleTime, string|array $ids, ?int $idle = null, ?int $time = null, ?int $retryCount = null, bool $force = false, bool $justId = false, ?string $lastId = null)
+ * @method $this xdel(string $key, string ...$id)
+ * @method $this xdelex(string $key, string $mode, array $ids)
+ * @method $this xlen(string $key)
+ * @method $this xpending(string $key, string $group, ?int $minIdleTime = null, ?string $start = null, ?string $end = null, ?int $count = null, ?string $consumer = null)
+ * @method $this xrevrange(string $key, string $end, string $start, ?int $count = null)
+ * @method $this xrange(string $key, string $start, string $end, ?int $count = null)
+ * @method $this xread(int $count = null, int $block = null, array $streams = null, string ...$id)
+ * @method $this xreadgroup(string $group, string $consumer, ?int $count = null, ?int $blockMs = null, bool $noAck = false, string ...$keyOrId)
+ * @method $this xsetid(string $key, string $lastId, ?int $entriesAdded = null, ?string $maxDeleteId = null)
+ * @method $this xtrim(string $key, array|string $strategy, string $threshold, array $options = null)
 * @method $this zadd($key, array $membersAndScoresDictionary)
 * @method $this zcard($key)
 * @method $this zcount($key, $min, $max)
@@ -284,22 +311,22 @@ use Predis\Command\Container\XGROUP;
 * @method $this zmpop(array $keys, string $modifier = 'min', int $count = 1)
 * @method $this zmscore(string $key, string ...$member)
 * @method $this zrandmember(string $key, int $count = 1, bool $withScores = false)
- * @method $this zrange($key, $start, $stop, array $options = null)
- * @method $this zrangebyscore($key, $min, $max, array $options = null)
+ * @method $this zrange($key, $start, $stop, ?array $options = null)
+ * @method $this zrangebyscore($key, $min, $max, ?array $options = null)
 * @method $this zrangestore(string $destination, string $source, int|string $min, string|int $max, string|bool $by = false, bool $reversed = false, bool $limit = false, int $offset = 0, int $count = 0)
 * @method $this zrank($key, $member)
 * @method $this zrem($key, $member)
 * @method $this zremrangebyrank($key, $start, $stop)
 * @method $this zremrangebyscore($key, $min, $max)
- * @method $this zrevrange($key, $start, $stop, array $options = null)
- * @method $this zrevrangebyscore($key, $max, $min, array $options = null)
+ * @method $this zrevrange($key, $start, $stop, ?array $options = null)
+ * @method $this zrevrangebyscore($key, $max, $min, ?array $options = null)
 * @method $this zrevrank($key, $member)
 * @method $this zunion(array $keys, int[] $weights = [], string $aggregate = 'sum', bool $withScores = false)
 * @method $this zunionstore(string $destination, array $keys, int[] $weights = [], string $aggregate = 'sum')
 * @method $this zscore($key, $member)
- * @method $this zscan($key, $cursor, array $options = null)
- * @method $this zrangebylex($key, $start, $stop, array $options = null)
- * @method $this zrevrangebylex($key, $start, $stop, array $options = null)
+ * @method $this zscan($key, $cursor, ?array $options = null)
+ * @method $this zrangebylex($key, $start, $stop, ?array $options = null)
+ * @method $this zrevrangebylex($key, $start, $stop, ?array $options = null)
 * @method $this zremrangebylex($key, $min, $max)
 * @method $this zlexcount($key, $min, $max)
 * @method $this pexpiretime(string $key)
@@ -312,13 +339,26 @@ use Predis\Command\Container\XGROUP;
 * @method $this exec()
 * @method $this multi()
 * @method $this unwatch()
+ * @method $this waitaof(int $numLocal, int $numReplicas, int $timeout)
 * @method $this unsubscribe(string ...$channels)
+ * @method $this vadd(string $key, string|array $vector, string $elem, int $dim = null, bool $cas = false, string $quant = VADD::QUANT_DEFAULT, ?int $BEF = null, string|array $attributes = null, int $numlinks = null)
+ * @method $this vcard(string $key)
+ * @method $this vdim(int $key)
+ * @method $this vemb(string $key, string $elem, bool $raw = false)
+ * @method $this vgetattr(string $key, string $elem, bool $asJson = false)
+ * @method $this vinfo(string $key)
+ * @method $this vlinks(string $key, string $elem, bool $withScores = false)
+ * @method $this vrandmember(string $key, int $count = null)
+ * @method $this vrem(string $key, string $elem)
+ * @method $this vsetattr(string $key, string $elem, string|array $attributes)
+ * @method $this vsim(string $key, string|array $vectorOrElem, bool $isElem = false, bool $withScores = false, int $count = null, float $epsilon = null, int $ef = null, string $filter = null, int $filterEf = null, bool $truth = false, bool $noThread = false)
 * @method $this watch($key)
 * @method $this eval($script, $numkeys, $keyOrArg1 = null, $keyOrArgN = null)
 * @method $this eval_ro(string $script, array $keys, ...$argument)
 * @method $this evalsha($script, $numkeys, $keyOrArg1 = null, $keyOrArgN = null)
 * @method $this evalsha_ro(string $sha1, array $keys, ...$argument)
 * @method $this script($subcommand, $argument = null)
+ * @method $this shutdown(?bool $noSave = null, bool $now = false, bool $force = false, bool $abort = false)
 * @method $this auth($password)
 * @method $this echo($message)
 * @method $this ping($message = null)
@@ -341,8 +381,8 @@ use Predis\Command\Container\XGROUP;
 * @method $this geohash($key, array $members)
 * @method $this geopos($key, array $members)
 * @method $this geodist($key, $member1, $member2, $unit = null)
- * @method $this georadius($key, $longitude, $latitude, $radius, $unit, array $options = null)
- * @method $this georadiusbymember($key, $member, $radius, $unit, array $options = null)
+ * @method $this georadius($key, $longitude, $latitude, $radius, $unit, ?array $options = null)
+ * @method $this georadiusbymember($key, $member, $radius, $unit, ?array $options = null)
 * @method $this geosearch(string $key, FromInterface $from, ByInterface $by, ?string $sorting = null, int $count = -1, bool $any = false, bool $withCoord = false, bool $withDist = false, bool $withHash = false)
 * @method $this geosearchstore(string $destination, string $source, FromInterface $from, ByInterface $by, ?string $sorting = null, int $count = -1, bool $any = false, bool $storeDist = false)
 *
@@ -354,7 +394,6 @@ use Predis\Command\Container\XGROUP;
 * @property JSONDEBUG $jsondebug
 * @property ACL       $acl
 * @property XGROUP    $xgroup
- * @property TFUNCTION $tfunction
 */
 interface ClientContextInterface
 {
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -44,10 +44,10 @@ use Predis\Command\Container\FUNCTIONS;
 use Predis\Command\Container\Json\JSONDEBUG;
 use Predis\Command\Container\Search\FTCONFIG;
 use Predis\Command\Container\Search\FTCURSOR;
-use Predis\Command\Container\TFUNCTION;
 use Predis\Command\Container\XGROUP;
 use Predis\Command\Container\XINFO;
 use Predis\Command\FactoryInterface;
+use Predis\Command\Redis\VADD;
 use Predis\Configuration\OptionsInterface;
 use Predis\Connection\ConnectionInterface;
 use Predis\Response\Status;
@@ -77,8 +77,8 @@ use Predis\Response\Status;
 * @method string|null       randomkey()
 * @method mixed             rename(string $key, string $target)
 * @method int               renamenx(string $key, string $target)
- * @method array             scan($cursor, array $options = null)
- * @method array             sort(string $key, array $options = null)
+ * @method array             scan($cursor, ?array $options = null)
+ * @method array             sort(string $key, ?array $options = null)
 * @method array             sort_ro(string $key, ?string $byPattern = null, ?LimitOffsetCount $limit = null, array $getPatterns = [], ?string $sorting = null, bool $alpha = false)
 * @method int               ttl(string $key)
 * @method mixed             type(string $key)
@@ -95,6 +95,7 @@ use Predis\Response\Status;
 * @method int               bitcount(string $key, $start = null, $end = null, string $index = 'byte')
 * @method int               bitop($operation, $destkey, $key)
 * @method array|null        bitfield(string $key, $subcommand, ...$subcommandArg)
+ * @method array|null        bitfield_ro(string $key, ?array $encodingOffsetMap = null)
 * @method int               bitpos(string $key, $bit, $start = null, $end = null, string $index = 'byte')
 * @method array             blmpop(int $timeout, array $keys, string $modifier = 'left', int $count = 1)
 * @method array             bzpopmax(array $keys, int $timeout)
@@ -112,7 +113,7 @@ use Predis\Response\Status;
 * @method array             cfinsertnx(string $key, int $capacity = -1, bool $noCreate = false, string ...$item)
 * @method Status            cfreserve(string $key, int $capacity, int $bucketSize = -1, int $maxIterations = -1, int $expansion = -1)
 * @method array             cfscandump(string $key, int $iterator)
- * @method array             cmsincrby(string $key, string|int...$itemIncrementDictionary)
+ * @method array             cmsincrby(string $key, string|int ...$itemIncrementDictionary)
 * @method array             cmsinfo(string $key)
 * @method Status            cmsinitbydim(string $key, int $width, int $depth)
 * @method Status            cmsinitbyprob(string $key, float $errorRate, float $probability)
@@ -123,6 +124,7 @@ use Predis\Response\Status;
 * @method Status            failover(?To $to = null, bool $abort = false, int $timeout = -1)
 * @method mixed             fcall(string $function, array $keys, ...$args)
 * @method mixed             fcall_ro(string $function, array $keys, ...$args)
+ * @method array             ft_list()
 * @method array             ftaggregate(string $index, string $query, ?AggregateArguments $arguments = null)
 * @method Status            ftaliasadd(string $alias, string $index)
 * @method Status            ftaliasdel(string $alias)
@@ -158,7 +160,7 @@ use Predis\Response\Status;
 * @method mixed             mset(array $dictionary)
 * @method int               msetnx(array $dictionary)
 * @method Status            psetex(string $key, $milliseconds, $value)
- * @method Status            set(string $key, $value, $expireResolution = null, $expireTTL = null, $flag = null)
+ * @method Status|null       set(string $key, $value, $expireResolution = null, $expireTTL = null, $flag = null)
 * @method int               setbit(string $key, $offset, $value)
 * @method Status            setex(string $key, $seconds, $value)
 * @method int               setnx(string $key, $value)
@@ -166,8 +168,17 @@ use Predis\Response\Status;
 * @method int               strlen(string $key)
 * @method int               hdel(string $key, array $fields)
 * @method int               hexists(string $key, string $field)
+ * @method array|null        hexpire(string $key, int $seconds, array $fields, string $flag = null)
+ * @method array|null        hexpireat(string $key, int $unixTimeSeconds, array $fields, string $flag = null)
+ * @method array|null        hexpiretime(string $key, array $fields)
+ * @method array|null        hpersist(string $key, array $fields)
+ * @method array|null        hpexpire(string $key, int $milliseconds, array $fields, string $flag = null)
+ * @method array|null        hpexpireat(string $key, int $unixTimeMilliseconds, array $fields, string $flag = null)
+ * @method array|null        hpexpiretime(string $key, array $fields)
 * @method string|null       hget(string $key, string $field)
+ * @method array|null        hgetex(string $key, array $fields, string $modifier = HGETEX::NULL, int|bool $modifierValue = false)
 * @method array             hgetall(string $key)
+ * @method array             hgetdel(string $key, array $fields)
 * @method int               hincrby(string $key, string $field, int $increment)
 * @method string            hincrbyfloat(string $key, string $field, int|float $increment)
 * @method array             hkeys(string $key)
@@ -175,9 +186,12 @@ use Predis\Response\Status;
 * @method array             hmget(string $key, array $fields)
 * @method mixed             hmset(string $key, array $dictionary)
 * @method array             hrandfield(string $key, int $count = 1, bool $withValues = false)
- * @method array             hscan(string $key, $cursor, array $options = null)
+ * @method array             hscan(string $key, $cursor, ?array $options = null)
 * @method int               hset(string $key, string $field, string $value)
+ * @method int               hsetex(string $key, array $fieldValueMap, string $setModifier = HSETEX::SET_NULL, string $ttlModifier = HSETEX::TTL_NULL, int|bool $ttlModifierValue = false)
 * @method int               hsetnx(string $key, string $field, string $value)
+ * @method array|null        httl(string $key, array $fields)
+ * @method array|null        hpttl(string $key, array $fields)
 * @method array             hvals(string $key)
 * @method int               hstrlen(string $key, string $field)
 * @method array             jsonarrappend(string $key, string $path = '$', ...$value)
@@ -234,8 +248,8 @@ use Predis\Response\Status;
 * @method string[]          smembers(string $key)
 * @method array             smismember(string $key, string ...$members)
 * @method int               smove(string $source, string $destination, string $member)
- * @method string|array|null spop(string $key, int $count = null)
- * @method string|null       srandmember(string $key, int $count = null)
+ * @method string|array|null spop(string $key, ?int $count = null)
+ * @method string|null       srandmember(string $key, ?int $count = null)
 * @method int               srem(string $key, array|string $member)
 * @method array             sscan(string $key, int $cursor, array $options = null)
 * @method array             ssubscribe(string ...$shardChannels)
@@ -258,8 +272,6 @@ use Predis\Response\Status;
 * @method Status            tdigestreset(string $key)
 * @method array             tdigestrevrank(string $key, float ...$value)
 * @method string            tdigesttrimmed_mean(string $key, float $lowCutQuantile, float $highCutQuantile)
- * @method mixed             tfcall(string $libraryName, string $functionName, array $keys = [], array $arguments = [])
- * @method mixed             tfcallasync(string $libraryName, string $functionName, array $keys = [], array $arguments = [])
 * @method array             topkadd(string $key, ...$items)
 * @method array             topkincrby(string $key, ...$itemIncrement)
 * @method array             topkinfo(string $key)
@@ -273,7 +285,7 @@ use Predis\Response\Status;
 * @method int               tsdecrby(string $key, float $value, ?DecrByArguments $arguments = null)
 * @method int               tsdel(string $key, int $fromTimestamp, int $toTimestamp)
 * @method Status            tsdeleterule(string $sourceKey, string $destKey)
- * @method array             tsget(string $key, GetArguments $arguments = null)
+ * @method array             tsget(string $key, ?GetArguments $arguments = null)
 * @method int               tsincrby(string $key, float $value, ?IncrByArguments $arguments = null)
 * @method array             tsinfo(string $key, ?InfoArguments $arguments = null)
 * @method array             tsmadd(mixed ...$keyTimestampValue)
@@ -283,17 +295,24 @@ use Predis\Response\Status;
 * @method array             tsqueryindex(string ...$filterExpression)
 * @method array             tsrange(string $key, $fromTimestamp, $toTimestamp, ?RangeArguments $arguments = null)
 * @method array             tsrevrange(string $key, $fromTimestamp, $toTimestamp, ?RangeArguments $arguments = null)
+ * @method int               xack(string $key, string $group, string ...$id)
+ * @method array             xackdel(string $key, string $group, string $mode, array $ids)
 * @method string            xadd(string $key, array $dictionary, string $id = '*', array $options = null)
 * @method array             xautoclaim(string $key, string $group, string $consumer, int $minIdleTime, string $start, ?int $count = null, bool $justId = false)
+ * @method array             xclaim(string $key, string $group, string $consumer, int $minIdleTime, string|array $ids, ?int $idle = null, ?int $time = null, ?int $retryCount = null, bool $force = false, bool $justId = false, ?string $lastId = null)
 * @method int               xdel(string $key, string ...$id)
+ * @method array             xdelex(string $key, string $mode, array $ids)
 * @method int               xlen(string $key)
+ * @method array             xpending(string $key, string $group, ?int $minIdleTime = null, ?string $start = null, ?string $end = null, ?int $count = null, ?string $consumer = null)
 * @method array             xrevrange(string $key, string $end, string $start, ?int $count = null)
 * @method array             xrange(string $key, string $start, string $end, ?int $count = null)
+ * @method array|null        xread(int $count = null, int $block = null, array $streams = null, string ...$id)
 * @method array             xreadgroup(string $group, string $consumer, ?int $count = null, ?int $blockMs = null, bool $noAck = false, string ...$keyOrId)
+ * @method Status            xsetid(string $key, string $lastId, ?int $entriesAdded = null, ?string $maxDeleteId = null)
 * @method string            xtrim(string $key, array|string $strategy, string $threshold, array $options = null)
 * @method int               zadd(string $key, array $membersAndScoresDictionary)
 * @method int               zcard(string $key)
- * @method string            zcount(string $key, int|string $min, int|string $max)
+ * @method int               zcount(string $key, int|string $min, int|string $max)
 * @method array             zdiff(array $keys, bool $withScores = false)
 * @method int               zdiffstore(string $destination, array $keys)
 * @method string            zincrby(string $key, int $increment, string $member)
@@ -305,22 +324,22 @@ use Predis\Response\Status;
 * @method array             zpopmin(string $key, int $count = 1)
 * @method array             zpopmax(string $key, int $count = 1)
 * @method mixed             zrandmember(string $key, int $count = 1, bool $withScores = false)
- * @method array             zrange(string $key, int|string $start, int|string $stop, array $options = null)
- * @method array             zrangebyscore(string $key, int|string $min, int|string $max, array $options = null)
+ * @method array             zrange(string $key, int|string $start, int|string $stop, ?array $options = null)
+ * @method array             zrangebyscore(string $key, int|string $min, int|string $max, ?array $options = null)
 * @method int               zrangestore(string $destination, string $source, int|string $min, int|string $max, string|bool $by = false, bool $reversed = false, bool $limit = false, int $offset = 0, int $count = 0)
 * @method int|null          zrank(string $key, string $member)
 * @method int               zrem(string $key, string ...$member)
 * @method int               zremrangebyrank(string $key, int|string $start, int|string $stop)
 * @method int               zremrangebyscore(string $key, int|string $min, int|string $max)
- * @method array             zrevrange(string $key, int|string $start, int|string $stop, array $options = null)
- * @method array             zrevrangebyscore(string $key, int|string $max, int|string $min, array $options = null)
+ * @method array             zrevrange(string $key, int|string $start, int|string $stop, ?array $options = null)
+ * @method array             zrevrangebyscore(string $key, int|string $max, int|string $min, ?array $options = null)
 * @method int|null          zrevrank(string $key, string $member)
 * @method array             zunion(array $keys, int[] $weights = [], string $aggregate = 'sum', bool $withScores = false)
 * @method int               zunionstore(string $destination, array $keys, int[] $weights = [], string $aggregate = 'sum')
 * @method string|null       zscore(string $key, string $member)
- * @method array             zscan(string $key, int $cursor, array $options = null)
- * @method array             zrangebylex(string $key, string $start, string $stop, array $options = null)
- * @method array             zrevrangebylex(string $key, string $start, string $stop, array $options = null)
+ * @method array             zscan(string $key, int $cursor, ?array $options = null)
+ * @method array             zrangebylex(string $key, string $start, string $stop, ?array $options = null)
+ * @method array             zrevrangebylex(string $key, string $start, string $stop, ?array $options = null)
 * @method int               zremrangebylex(string $key, string $min, string $max)
 * @method int               zlexcount(string $key, string $min, string $max)
 * @method int               pexpiretime(string $key)
@@ -334,15 +353,28 @@ use Predis\Response\Status;
 * @method mixed             multi()
 * @method mixed             unwatch()
 * @method array             unsubscribe(string ...$channels)
- * @method mixed             watch(string $key)
+ * @method bool              vadd(string $key, string|array $vector, string $elem, int $dim = null, bool $cas = false, string $quant = VADD::QUANT_DEFAULT, int $bef = null, string|array $attributes = null, int $numlinks = null)
+ * @method int               vcard(string $key)
+ * @method int               vdim(string $key)
+ * @method array             vemb(string $key, string $elem, bool $raw = false)
+ * @method string|array|null vgetattr(string $key, string $elem, bool $asJson = false)
+ * @method array|null        vinfo(string $key)
+ * @method array|null        vlinks(string $key, string $elem, bool $withScores = false)
+ * @method string|array|null vrandmember(string $key, int $count = null)
+ * @method bool              vrem(string $key, string $elem)
+ * @method array             vsim(string $key, string|array $vectorOrElem, bool $isElem = false, bool $withScores = false, int $count = null, float $epsilon = null, int $ef = null, string $filter = null, int $filterEf = null, bool $truth = false, bool $noThread = false)
+ * @method bool              vsetattr(string $key, string $elem, string|array $attributes)
+ * @method array             waitaof(int $numLocal, int $numReplicas, int $timeout)
+ * @method mixed             watch(string[]|string $keyOrKeys)
 * @method mixed             eval(string $script, int $numkeys, string ...$keyOrArg = null)
 * @method mixed             eval_ro(string $script, array $keys, ...$argument)
 * @method mixed             evalsha(string $script, int $numkeys, string ...$keyOrArg = null)
 * @method mixed             evalsha_ro(string $sha1, array $keys, ...$argument)
 * @method mixed             script($subcommand, $argument = null)
+ * @method Status            shutdown(?bool $noSave = null, bool $now = false, bool $force = false, bool $abort = false)
 * @method mixed             auth(string $password)
 * @method string            echo(string $message)
- * @method mixed             ping(string $message = null)
+ * @method mixed             ping(?string $message = null)
 * @method mixed             select(int $database)
 * @method mixed             bgrewriteaof()
 * @method mixed             bgsave()
@@ -362,8 +394,8 @@ use Predis\Response\Status;
 * @method array             geohash(string $key, array $members)
 * @method array             geopos(string $key, array $members)
 * @method string|null       geodist(string $key, $member1, $member2, $unit = null)
- * @method array             georadius(string $key, $longitude, $latitude, $radius, $unit, array $options = null)
- * @method array             georadiusbymember(string $key, $member, $radius, $unit, array $options = null)
+ * @method array             georadius(string $key, $longitude, $latitude, $radius, $unit, ?array $options = null)
+ * @method array             georadiusbymember(string $key, $member, $radius, $unit, ?array $options = null)
 * @method array             geosearch(string $key, FromInterface $from, ByInterface $by, ?string $sorting = null, int $count = -1, bool $any = false, bool $withCoord = false, bool $withDist = false, bool $withHash = false)
 * @method int               geosearchstore(string $destination, string $source, FromInterface $from, ByInterface $by, ?string $sorting = null, int $count = -1, bool $any = false, bool $storeDist = false)
 *
@@ -376,7 +408,6 @@ use Predis\Response\Status;
 * @property ACL       $acl
 * @property XGROUP    $xgroup
 * @property XINFO     $xinfo
- * @property TFUNCTION $tfunction
 */
 interface ClientInterface
 {
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -163,6 +163,8 @@ abstract class ClusterStrategy implements StrategyInterface
            /* scripting */
            'EVAL' => [$this, 'getKeyFromScriptingCommands'],
            'EVALSHA' => [$this, 'getKeyFromScriptingCommands'],
+            'EVAL_RO' => [$this, 'getKeyFromScriptingCommands'],
+            'EVALSHA_RO' => [$this, 'getKeyFromScriptingCommands'],

            /* server */
            'INFO' => [$this, 'getFakeKey'],
@@ -180,10 +182,8 @@ abstract class ClusterStrategy implements StrategyInterface
            'SUNSUBSCRIBE' => [$this, 'getKeyFromSUnsubscribeCommand'],
            'SPUBLISH' => $getKeyFromFirstArgument,

-            /* gears */
-            'TFUNCTION' => [$this, 'getFakeKey'],
-            'TFCALL' => [$this, 'getFakeKey'],
-            'TFCALLASYNC' => [$this, 'getFakeKey'],
+            /* cluster */
+            'CLUSTER' => [$this, 'getFakeKey'],
        ];
    }

@@ -470,13 +470,9 @@ abstract class ClusterStrategy implements StrategyInterface
    }

    /**
-     * Checks if the specified array of keys will generate the same hash.
-     *
-     * @param array $keys Array of keys.
-     *
-     * @return bool
+     * {@inheritdoc}
     */
-    protected function checkSameSlotForKeys(array $keys)
+    public function checkSameSlotForKeys(array $keys): bool
    {
        if (!$count = count($keys)) {
            return false;
@@ -490,8 +486,6 @@ abstract class ClusterStrategy implements StrategyInterface
            if ($currentSlot !== $nextSlot) {
                return false;
            }
-
-            $currentSlot = $nextSlot;
        }

        return true;
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2025 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Cluster;
+
+/**
+ * Represents the gap between slot ranges.
+ */
+class NullSlotRange extends SlotRange
+{
+    public function __construct(int $start, int $end)
+    {
+        parent::__construct($start, $end, '');
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function toArray(): array
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function count(): int
+    {
+        return 0;
+    }
+}
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -23,9 +23,9 @@ class PredisStrategy extends ClusterStrategy
    protected $distributor;

    /**
-     * @param DistributorInterface $distributor Optional distributor instance.
+     * @param DistributorInterface|null $distributor Optional distributor instance.
     */
-    public function __construct(DistributorInterface $distributor = null)
+    public function __construct(?DistributorInterface $distributor = null)
    {
        parent::__construct();

@@ -46,7 +46,7 @@ class PredisStrategy extends ClusterStrategy
    /**
     * {@inheritdoc}
     */
-    protected function checkSameSlotForKeys(array $keys)
+    public function checkSameSlotForKeys(array $keys): bool
    {
        if (!$count = count($keys)) {
            return false;
@@ -60,8 +60,6 @@ class PredisStrategy extends ClusterStrategy
            if ($currentKey !== $nextKey) {
                return false;
            }
-
-            $currentKey = $nextKey;
        }

        return true;
@@ -4,7 +4,7 @@
 * This file is part of the Predis package.
 *
 * (c) 2009-2020 Daniele Alessandri
- * (c) 2021-2023 Till Krüss
+ * (c) 2021-2025 Till Krüss
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@@ -25,9 +25,9 @@ class RedisStrategy extends ClusterStrategy
    protected $hashGenerator;

    /**
-     * @param HashGeneratorInterface $hashGenerator Hash generator instance.
+     * @param HashGeneratorInterface|null $hashGenerator Hash generator instance.
     */
-    public function __construct(HashGeneratorInterface $hashGenerator = null)
+    public function __construct(?HashGeneratorInterface $hashGenerator = null)
    {
        parent::__construct();

@@ -0,0 +1,209 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2025 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Cluster;
+
+use ArrayAccess;
+use ArrayIterator;
+use Countable;
+use IteratorAggregate;
+use OutOfBoundsException;
+use Predis\Connection\NodeConnectionInterface;
+use ReturnTypeWillChange;
+use Traversable;
+
+/**
+ * Slot map for redis-cluster.
+ */
+class SimpleSlotMap implements ArrayAccess, IteratorAggregate, Countable
+{
+    private $slots = [];
+
+    /**
+     * Checks if the given slot is valid.
+     *
+     * @param int $slot Slot index.
+     *
+     * @return bool
+     */
+    public static function isValid($slot)
+    {
+        return $slot >= 0x0000 && $slot <= 0x3FFF;
+    }
+
+    /**
+     * Checks if the given slot range is valid.
+     *
+     * @param int $first Initial slot of the range.
+     * @param int $last  Last slot of the range.
+     *
+     * @return bool
+     */
+    public static function isValidRange($first, $last)
+    {
+        return $first >= 0x0000 && $first <= 0x3FFF && $last >= 0x0000 && $last <= 0x3FFF && $first <= $last;
+    }
+
+    /**
+     * Resets the slot map.
+     */
+    public function reset()
+    {
+        $this->slots = [];
+    }
+
+    /**
+     * Checks if the slot map is empty.
+     *
+     * @return bool
+     */
+    public function isEmpty()
+    {
+        return empty($this->slots);
+    }
+
+    /**
+     * Returns the current slot map as a dictionary of $slot => $node.
+     *
+     * The order of the slots in the dictionary is not guaranteed.
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        return $this->slots;
+    }
+
+    /**
+     * Returns the list of unique nodes in the slot map.
+     *
+     * @return array
+     */
+    public function getNodes()
+    {
+        return array_keys(array_flip($this->slots));
+    }
+
+    /**
+     * Assigns the specified slot range to a node.
+     *
+     * @param int                            $first      Initial slot of the range.
+     * @param int                            $last       Last slot of the range.
+     * @param NodeConnectionInterface|string $connection ID or connection instance.
+     *
+     * @throws OutOfBoundsException
+     */
+    public function setSlots($first, $last, $connection)
+    {
+        if (!static::isValidRange($first, $last)) {
+            throw new OutOfBoundsException("Invalid slot range $first-$last for `$connection`");
+        }
+
+        $this->slots += array_fill($first, $last - $first + 1, (string) $connection);
+    }
+
+    /**
+     * Returns the specified slot range.
+     *
+     * @param int $first Initial slot of the range.
+     * @param int $last  Last slot of the range.
+     *
+     * @return array
+     */
+    public function getSlots($first, $last)
+    {
+        if (!static::isValidRange($first, $last)) {
+            throw new OutOfBoundsException("Invalid slot range $first-$last");
+        }
+
+        return array_intersect_key($this->slots, array_fill($first, $last - $first + 1, null));
+    }
+
+    /**
+     * Checks if the specified slot is assigned.
+     *
+     * @param int $slot Slot index.
+     *
+     * @return bool
+     */
+    #[ReturnTypeWillChange]
+    public function offsetExists($slot)
+    {
+        return isset($this->slots[$slot]);
+    }
+
+    /**
+     * Returns the node assigned to the specified slot.
+     *
+     * @param int $slot Slot index.
+     *
+     * @return string|null
+     */
+    #[ReturnTypeWillChange]
+    public function offsetGet($slot)
+    {
+        return $this->slots[$slot] ?? null;
+    }
+
+    /**
+     * Assigns the specified slot to a node.
+     *
+     * @param int                            $slot       Slot index.
+     * @param NodeConnectionInterface|string $connection ID or connection instance.
+     *
+     * @return void
+     */
+    #[ReturnTypeWillChange]
+    public function offsetSet($slot, $connection)
+    {
+        if (!static::isValid($slot)) {
+            throw new OutOfBoundsException("Invalid slot $slot for `$connection`");
+        }
+
+        $this->slots[(int) $slot] = (string) $connection;
+    }
+
+    /**
+     * Returns the node assigned to the specified slot.
+     *
+     * @param int $slot Slot index.
+     *
+     * @return void
+     */
+    #[ReturnTypeWillChange]
+    public function offsetUnset($slot)
+    {
+        unset($this->slots[$slot]);
+    }
+
+    /**
+     * Returns the current number of assigned slots.
+     *
+     * @return int
+     */
+    #[ReturnTypeWillChange]
+    public function count()
+    {
+        return count($this->slots);
+    }
+
+    /**
+     * Returns an iterator over the slot map.
+     *
+     * @return Traversable<int, string>
+     */
+    #[ReturnTypeWillChange]
+    public function getIterator()
+    {
+        return new ArrayIterator($this->slots);
+    }
+}
--- a/Show More
+++ b/Show More