Merge branch 'master' into 3.1

limingxinleo · limingxinleo · commit 728e350fff07 · 2023-09-14T15:30:36.000+08:00
# Conflicts:
#	src/redis/composer.json
#	src/validation/tests/Cases/ValidateAttributesTest.php
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
     },
     "require": {
         "php": ">=8.1",
-        "ext-redis": "*",
+        "ext-redis": "<6.0",
         "hyperf/contract": "~3.1.0",
         "hyperf/pool": "~3.1.0",
         "hyperf/support": "~3.1.0",
