Merge branch 'develop'

# Conflicts:
#	composer.json

Author: crazywhalecc

composer.json

@@ -27,9 +27,10 @@
     "require": {
         "php": "^7.4 || ^8.0 || ^8.1 || ^8.2",
         "ext-json": "*",
-        "psr/cache": "^1.0",
+        "psr/cache": "^1.0 || ^3.0",
         "psr/event-dispatcher": "^1.0",
-        "psr/log": "^1.1",
+        "psr/http-client": "^1.0",
+        "psr/log": "^1.1 || ^3.0",
         "rybakit/msgpack": "^0.9.0",
         "choir/psr-http": "^1.0",
         "workerman/workerman": "^4.0",