Upgrade to 3.1 (#105)

xuanyanwow · limingxinleo · web-flow · commit 21c53f75fda2 · 2023-12-01T10:16:27.000+08:00
Co-authored-by: 李铭昕 &lt;715557344@qq.com&gt;
diff --git a/.github/workflows/Dockerfile b/.github/workflows/Dockerfile
@@ -5,7 +5,7 @@
 # @contact  group@hyperf.io
 # @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
 
-FROM hyperf/hyperf:8.0-alpine-v3.16-swoole
+FROM hyperf/hyperf:8.1-alpine-v3.18-swoole
 LABEL maintainer="Hyperf Developers <group@hyperf.io>" version="1.0" license="MIT" app.name="Hyperf"
 
 ##
diff --git a/Dockerfile b/Dockerfile
@@ -5,7 +5,7 @@
 # @contact  group@hyperf.io
 # @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
 
-FROM hyperf/hyperf:8.1-alpine-v3.18-swoole-v5.0
+FROM hyperf/hyperf:8.1-alpine-v3.18-swoole
 LABEL maintainer="Hyperf Developers <group@hyperf.io>" version="1.0" license="MIT" app.name="Hyperf"
 
 ##
diff --git a/app/Controller/AbstractController.php b/app/Controller/AbstractController.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace App\Controller;
 
 use Hyperf\Di\Annotation\Inject;
diff --git a/app/Controller/IndexController.php b/app/Controller/IndexController.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace App\Controller;
 
 class IndexController extends AbstractController
diff --git a/app/Exception/Handler/AppExceptionHandler.php b/app/Exception/Handler/AppExceptionHandler.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace App\Exception\Handler;
 
 use Hyperf\Contract\StdoutLoggerInterface;
diff --git a/app/Listener/DbQueryExecutedListener.php b/app/Listener/DbQueryExecutedListener.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace App\Listener;
 
 use Hyperf\Collection\Arr;
diff --git a/app/Listener/ResumeExitCoordinatorListener.php b/app/Listener/ResumeExitCoordinatorListener.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace App\Listener;
 
 use Hyperf\Command\Event\AfterExecute;
diff --git a/app/Model/Model.php b/app/Model/Model.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace App\Model;
 
 use Hyperf\DbConnection\Model\Model as BaseModel;
diff --git a/composer.json b/composer.json
@@ -12,23 +12,23 @@
     "description": "A coroutine framework that focuses on hyperspeed and flexible, specifically use for build microservices and middlewares.",
     "license": "Apache-2.0",
     "require": {
-        "php": ">=8.0",
-        "hyperf/cache": "~3.0.0",
-        "hyperf/command": "~3.0.0",
-        "hyperf/config": "~3.0.0",
-        "hyperf/db-connection": "~3.0.0",
+        "php": ">=8.1",
+        "hyperf/cache": "~3.1.0",
+        "hyperf/command": "~3.1.0",
+        "hyperf/config": "~3.1.0",
+        "hyperf/db-connection": "~3.1.0",
         "hyperf/engine": "^2.10",
-        "hyperf/framework": "~3.0.0",
-        "hyperf/guzzle": "~3.0.0",
-        "hyperf/http-server": "~3.0.0",
-        "hyperf/logger": "~3.0.0",
-        "hyperf/memory": "~3.0.0",
-        "hyperf/process": "~3.0.0"
+        "hyperf/framework": "~3.1.0",
+        "hyperf/guzzle": "~3.1.0",
+        "hyperf/http-server": "~3.1.0",
+        "hyperf/logger": "~3.1.0",
+        "hyperf/memory": "~3.1.0",
+        "hyperf/process": "~3.1.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.0",
-        "hyperf/devtool": "~3.0.0",
-        "hyperf/testing": "~3.0.0",
+        "hyperf/devtool": "~3.1.0",
+        "hyperf/testing": "~3.1.0",
         "mockery/mockery": "^1.0",
         "phpstan/phpstan": "^1.0",
         "swoole/ide-helper": "^5.0"
diff --git a/installer/OptionalPackages.php b/installer/OptionalPackages.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Installer;
 
 use Composer\Composer;
diff --git a/installer/Script.php b/installer/Script.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Installer;
 
 use Composer\Script\Event;
diff --git a/installer/config.php b/installer/config.php
@@ -12,64 +12,64 @@
 return [
     'packages' => [
         'hyperf/amqp' => [
-            'version' => '~3.0.0',
+            'version' => '~3.1.0',
         ],
         'hyperf/async-queue' => [
-            'version' => '~3.0.0',
+            'version' => '~3.1.0',
         ],
         'hyperf/database' => [
-            'version' => '~3.0.0',
+            'version' => '~3.1.0',
         ],
         'hyperf/db-connection' => [
-            'version' => '~3.0.0',
+            'version' => '~3.1.0',
         ],
         'hyperf/model-cache' => [
-            'version' => '~3.0.0',
+            'version' => '~3.1.0',
         ],
         'hyperf/constants' => [
-            'version' => '~3.0.0',
+            'version' => '~3.1.0',
         ],
         'hyperf/json-rpc' => [
-            'version' => '~3.0.0',
+            'version' => '~3.1.0',
         ],
         'hyperf/redis' => [
-            'version' => '~3.0.0',
+            'version' => '~3.1.0',
         ],
         'hyperf/rpc' => [
-            'version' => '~3.0.0',
+            'version' => '~3.1.0',
         ],
         'hyperf/rpc-client' => [
-            'version' => '~3.0.0',
+            'version' => '~3.1.0',
         ],
         'hyperf/rpc-server' => [
-            'version' => '~3.0.0',
+            'version' => '~3.1.0',
         ],
         'hyperf/grpc-client' => [
-            'version' => '~3.0.0',
+            'version' => '~3.1.0',
         ],
         'hyperf/grpc-server' => [
-            'version' => '~3.0.0',
+            'version' => '~3.1.0',
         ],
         'hyperf/elasticsearch' => [
-            'version' => '~3.0.0',
+            'version' => '~3.1.0',
         ],
         'hyperf/config-apollo' => [
-            'version' => '~3.0.0',
+            'version' => '~3.1.0',
         ],
         'hyperf/config-aliyun-acm' => [
-            'version' => '~3.0.0',
+            'version' => '~3.1.0',
         ],
         'hyperf/config-etcd' => [
-            'version' => '~3.0.0',
+            'version' => '~3.1.0',
         ],
         'hyperf/config-nacos' => [
-            'version' => '~3.0.0',
+            'version' => '~3.1.0',
         ],
         'hyperf/tracer' => [
-            'version' => '~3.0.0',
+            'version' => '~3.1.0',
         ],
         'hyperf/service-governance' => [
-            'version' => '~3.0.0',
+            'version' => '~3.1.0',
         ],
     ],
     'require-dev' => [
diff --git a/installer/resources/amqp/amqp.php b/installer/resources/amqp/amqp.php
@@ -9,6 +9,8 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+use function Hyperf\Support\env;
+
 return [
     'default' => [
         'host' => env('AMQP_HOST', 'localhost'),
diff --git a/installer/resources/async_queue/AsyncQueueConsumer.php b/installer/resources/async_queue/AsyncQueueConsumer.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace App\Process;
 
 use Hyperf\AsyncQueue\Process\ConsumerProcess;
diff --git a/installer/resources/async_queue/QueueHandleListener.php b/installer/resources/async_queue/QueueHandleListener.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace App\Listener;
 
 use Hyperf\AsyncQueue\AnnotationJob;
diff --git a/installer/resources/async_queue/async_queue.php b/installer/resources/async_queue/async_queue.php
@@ -11,7 +11,7 @@
  */
 return [
     'default' => [
-        'driver' => Hyperf\AsyncQueue\Driver\RedisDriver::class,
+        'driver' => \Hyperf\AsyncQueue\Driver\RedisDriver::class,
         'redis' => [
             'pool' => 'default',
         ],
diff --git a/installer/resources/bin/hyperf.stub b/installer/resources/bin/hyperf.stub
@@ -9,7 +9,7 @@ error_reporting(E_ALL);
 date_default_timezone_set('%TIME_ZONE%');
 
 ! defined('BASE_PATH') && define('BASE_PATH', dirname(__DIR__, 1));
-! defined('SWOOLE_HOOK_FLAGS') && define('SWOOLE_HOOK_FLAGS', SWOOLE_HOOK_ALL);
+! defined('SWOOLE_HOOK_FLAGS') && define('SWOOLE_HOOK_FLAGS', Hyperf\Engine\DefaultOption::hookFlags());
 
 require BASE_PATH . '/vendor/autoload.php';
 
diff --git a/installer/resources/config_center/config_acm.php b/installer/resources/config_center/config_acm.php
@@ -11,6 +11,8 @@
  */
 use Hyperf\ConfigCenter\Mode;
 
+use function Hyperf\Support\env;
+
 return [
     'enable' => (bool) env('CONFIG_CENTER_ENABLE', true),
     'driver' => env('CONFIG_CENTER_DRIVER', 'aliyun_acm'),
diff --git a/installer/resources/config_center/config_apollo.php b/installer/resources/config_center/config_apollo.php
@@ -12,6 +12,8 @@
 use Hyperf\ConfigApollo\PullMode;
 use Hyperf\ConfigCenter\Mode;
 
+use function Hyperf\Support\env;
+
 return [
     'enable' => (bool) env('CONFIG_CENTER_ENABLE', true),
     'driver' => env('CONFIG_CENTER_DRIVER', 'apollo'),
diff --git a/installer/resources/config_center/config_etcd.php b/installer/resources/config_center/config_etcd.php
@@ -11,6 +11,8 @@
  */
 use Hyperf\ConfigCenter\Mode;
 
+use function Hyperf\Support\env;
+
 return [
     'enable' => (bool) env('CONFIG_CENTER_ENABLE', true),
     'driver' => env('CONFIG_CENTER_DRIVER', 'etcd'),
diff --git a/installer/resources/config_center/config_nacos.php b/installer/resources/config_center/config_nacos.php
@@ -11,6 +11,8 @@
  */
 use Hyperf\ConfigCenter\Mode;
 
+use function Hyperf\Support\env;
+
 return [
     'enable' => (bool) env('CONFIG_CENTER_ENABLE', true),
     'driver' => env('CONFIG_CENTER_DRIVER', 'nacos'),
diff --git a/installer/resources/constants/BusinessException.php b/installer/resources/constants/BusinessException.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace App\Exception;
 
 use App\Constants\ErrorCode;
diff --git a/installer/resources/constants/ErrorCode.php b/installer/resources/constants/ErrorCode.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace App\Constants;
 
 use Hyperf\Constants\AbstractConstants;
diff --git a/installer/resources/database/databases.php b/installer/resources/database/databases.php
@@ -9,6 +9,8 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+use function Hyperf\Support\env;
+
 return [
     'default' => [
         'driver' => env('DB_DRIVER', 'mysql'),
diff --git a/installer/resources/database/redis.php b/installer/resources/database/redis.php
@@ -9,6 +9,8 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+use function Hyperf\Support\env;
+
 return [
     'default' => [
         'host' => env('REDIS_HOST', 'localhost'),
diff --git a/installer/resources/model_cache/Model.php b/installer/resources/model_cache/Model.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace App\Model;
 
 use Hyperf\DbConnection\Model\Model as BaseModel;
diff --git a/installer/resources/model_cache/databases.php b/installer/resources/model_cache/databases.php
@@ -9,6 +9,8 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+use function Hyperf\Support\env;
+
 return [
     'default' => [
         'driver' => env('DB_DRIVER', 'mysql'),
diff --git a/installer/resources/tracer/opentracing.php b/installer/resources/tracer/opentracing.php
@@ -11,6 +11,8 @@
  */
 use Zipkin\Samplers\BinarySampler;
 
+use function Hyperf\Support\env;
+
 return [
     'default' => env('TRACER_DRIVER', 'zipkin'),
     'enable' => [
diff --git a/test/Cases/ExampleTest.php b/test/Cases/ExampleTest.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace HyperfTest\Cases;
 
 use Hyperf\Testing\TestCase;
diff --git a/test/HttpTestCase.php b/test/HttpTestCase.php
@@ -9,6 +9,7 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace HyperfTest;
 
 use Hyperf\Testing\Client;

-Original file line number
+Diff line change
 # @contact  [email protected]
 # @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
 -FROM hyperf/hyperf:8.0-alpine-v3.16-swoole
 +FROM hyperf/hyperf:8.1-alpine-v3.18-swoole
 LABEL maintainer="Hyperf Developers <[email protected]>" version="1.0" license="MIT" app.name="Hyperf"
 ##