Support For Hyperf Version 3.1.0 Or Newer

qiutuleng · May 8, 2024 · 91fe239 · 91fe239
1 parent 5de12af
commit 91fe239
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 110 deletions.
diff --git a/.php_cs b/.php_cs
diff --git a/composer.json b/composer.json
@@ -27,26 +27,19 @@
         }
     },
     "require": {
-        "php": ">=7.4",
-        "ext-swoole": ">=4.5",
-        "hyperf/framework": "^3.0",
-        "hyperf/di": "^3.0",
+        "php": ">=8.1",
         "symfony/var-dumper": "^5.0",
-        "hyperf/command": "^3.0"
+        "hyperf/command": "^3.1",
+        "hyperf/framework": "^3.1"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.14",
-        "phpstan/phpstan": "^0.12",
-        "hyperf/testing": "^2.0",
-        "swoole/ide-helper": "dev-master"
+        "hyperf/testing": "^3.1"
     },
     "config": {
         "sort-packages": true
     },
     "scripts": {
-        "test": "co-phpunit -c phpunit.xml --colors=always",
-        "analyse": "phpstan analyse --memory-limit 1024M -l 0 ./src",
-        "cs-fix": "php-cs-fixer fix $1"
+        "test": "co-phpunit -c phpunit.xml --colors=always"
     },
     "extra": {
         "hyperf": {

diff --git a/src/Commands/DumpServerCommand.php b/src/Commands/DumpServerCommand.php
@@ -6,8 +6,6 @@
 
 use Hyperf\Command\Command;
 use Hyperf\Contract\ConfigInterface;
-use Hyperf\Contract\StdoutLoggerInterface;
-use Hyperf\Di\Container;
 use Hyperf\Context\ApplicationContext;
 use InvalidArgumentException;
 use Symfony\Component\Console\Style\SymfonyStyle;
@@ -76,7 +74,6 @@ public function configure()
 
     protected function getServer(): DumpServer
     {
-        /** @var Container $container */
         $container = ApplicationContext::getContainer();
         $config = $container->get(ConfigInterface::class);
 

diff --git a/src/ConfigProvider.php b/src/ConfigProvider.php
@@ -13,9 +13,6 @@
 
 namespace Qiutuleng\HyperfDumpServer;
 
-use Hyperf\Contract\ConfigInterface;
-use Hyperf\Contract\StdoutLoggerInterface;
-use Hyperf\Di\Container;
 use Qiutuleng\HyperfDumpServer\Commands\DumpServerCommand;
 use Qiutuleng\HyperfDumpServer\Listeners\DumpServerListener;
 

diff --git a/src/Listeners/DumpServerListener.php b/src/Listeners/DumpServerListener.php
@@ -8,7 +8,6 @@
 use Hyperf\Di\Container;
 use Hyperf\Event\Contract\ListenerInterface;
 use Hyperf\Framework\Event\AfterWorkerStart;
-use Hyperf\Framework\Event\BeforeWorkerStart;
 use Hyperf\Framework\Event\OnStart;
 use Hyperf\HttpServer\Request;
 use Qiutuleng\HyperfDumpServer\Dumper;

diff --git a/src/RequestContextProvider.php b/src/RequestContextProvider.php
@@ -8,9 +8,8 @@
 use Hyperf\HttpServer\Request;
 use Hyperf\HttpServer\Router\Dispatched;
 use Hyperf\Context\Context;
-use Hyperf\Utils\Str;
+use Hyperf\Stringable\Str;
 use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\UriInterface;
 use Symfony\Component\VarDumper\Cloner\VarCloner;
 use Symfony\Component\VarDumper\Dumper\ContextProvider\ContextProviderInterface;