Merge branch 'master' into pr/132

Author: limingxinleo

.devcontainer/Dockerfile

@@ -5,7 +5,7 @@
 # @contact  group@hyperf.io
 # @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
 
-FROM hyperf/hyperf:8.3-alpine-v3.19-swoole
+FROM hyperf/hyperf:8.4-alpine-v3.22-swoole
 LABEL maintainer="Hyperf Developers <group@hyperf.io>" version="1.0" license="MIT" app.name="Hyperf"
 
 ##

.github/workflows/Dockerfile

@@ -5,7 +5,7 @@
 # @contact  group@hyperf.io
 # @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
 
-FROM hyperf/hyperf:8.3-alpine-v3.19-swoole
+FROM hyperf/hyperf:8.4-alpine-v3.22-swoole
 LABEL maintainer="Hyperf Developers <group@hyperf.io>" version="1.0" license="MIT" app.name="Hyperf"
 
 ##

Dockerfile

@@ -5,7 +5,7 @@
 # @contact  group@hyperf.io
 # @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
 
-FROM hyperf/hyperf:8.3-alpine-v3.19-swoole
+FROM hyperf/hyperf:8.4-alpine-v3.22-swoole
 LABEL maintainer="Hyperf Developers <group@hyperf.io>" version="1.0" license="MIT" app.name="Hyperf"
 
 ##

bin/hyperf.php

@@ -1,5 +1,7 @@
 #!/usr/bin/env php
 <?php
+
+declare(strict_types=1);
 /**
  * This file is part of Hyperf.
  *
@@ -8,6 +10,11 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+use Hyperf\Contract\ApplicationInterface;
+use Hyperf\Di\ClassLoader;
+use Hyperf\Engine\DefaultOption;
+use Psr\Container\ContainerInterface;
+
 ini_set('display_errors', 'on');
 ini_set('display_startup_errors', 'on');
 ini_set('memory_limit', '1G');
@@ -18,14 +25,14 @@
 
 require BASE_PATH . '/vendor/autoload.php';
 
-! defined('SWOOLE_HOOK_FLAGS') && define('SWOOLE_HOOK_FLAGS', Hyperf\Engine\DefaultOption::hookFlags());
+! defined('SWOOLE_HOOK_FLAGS') && define('SWOOLE_HOOK_FLAGS', DefaultOption::hookFlags());
 
 // Self-called anonymous function that creates its own scope and keep the global namespace clean.
 (function () {
-    Hyperf\Di\ClassLoader::init();
-    /** @var Psr\Container\ContainerInterface $container */
+    ClassLoader::init();
+    /** @var ContainerInterface $container */
     $container = require BASE_PATH . '/config/container.php';
 
-    $application = $container->get(Hyperf\Contract\ApplicationInterface::class);
+    $application = $container->get(ApplicationInterface::class);
     $application->run();
 })();

composer.json

@@ -12,26 +12,27 @@
     "description": "A coroutine framework that focuses on hyperspeed and flexible, specifically use for build microservices and middlewares.",
     "license": "Apache-2.0",
     "require": {
-        "php": ">=8.1",
-        "hyperf/cache": "~3.1.0",
-        "hyperf/command": "~3.1.0",
-        "hyperf/config": "~3.1.0",
-        "hyperf/db-connection": "~3.1.0",
+        "php": ">=8.2",
+        "hyperf/cache": "~3.2.0",
+        "hyperf/command": "~3.2.0",
+        "hyperf/config": "~3.2.0",
+        "hyperf/db-connection": "~3.2.0",
         "hyperf/engine": "^2.10",
-        "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"
+        "hyperf/framework": "~3.2.0",
+        "hyperf/guzzle": "~3.2.0",
+        "hyperf/http-server": "~3.2.0",
+        "hyperf/logger": "~3.2.0",
+        "hyperf/memory": "~3.2.0",
+        "hyperf/process": "~3.2.0",
+        "hyperf/laminas-mime": "^3.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.0",
-        "hyperf/devtool": "~3.1.0",
-        "hyperf/testing": "~3.1.0",
+        "hyperf/devtool": "~3.2.0",
+        "hyperf/testing": "~3.2.0",
         "mockery/mockery": "^1.0",
         "phpstan/phpstan": "^2.0",
-        "swoole/ide-helper": "^5.0"
+        "swoole/ide-helper": "^6.0"
     },
     "suggest": {
         "ext-openssl": "Required to use HTTPS.",

config/autoload/cache.php

@@ -9,10 +9,13 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+use Hyperf\Cache\Driver\RedisDriver;
+use Hyperf\Codec\Packer\PhpSerializerPacker;
+
 return [
     'default' => [
-        'driver' => Hyperf\Cache\Driver\RedisDriver::class,
-        'packer' => Hyperf\Codec\Packer\PhpSerializerPacker::class,
+        'driver' => RedisDriver::class,
+        'packer' => PhpSerializerPacker::class,
         'prefix' => 'c:',
         'skip_cache_results' => [],
     ],

config/autoload/devtool.php

@@ -13,32 +13,32 @@
     'generator' => [
         'amqp' => [
             'consumer' => [
-                'namespace' => 'App\\Amqp\\Consumer',
+                'namespace' => 'App\Amqp\Consumer',
             ],
             'producer' => [
-                'namespace' => 'App\\Amqp\\Producer',
+                'namespace' => 'App\Amqp\Producer',
             ],
         ],
         'aspect' => [
-            'namespace' => 'App\\Aspect',
+            'namespace' => 'App\Aspect',
         ],
         'command' => [
-            'namespace' => 'App\\Command',
+            'namespace' => 'App\Command',
         ],
         'controller' => [
-            'namespace' => 'App\\Controller',
+            'namespace' => 'App\Controller',
         ],
         'job' => [
-            'namespace' => 'App\\Job',
+            'namespace' => 'App\Job',
         ],
         'listener' => [
-            'namespace' => 'App\\Listener',
+            'namespace' => 'App\Listener',
         ],
         'middleware' => [
-            'namespace' => 'App\\Middleware',
+            'namespace' => 'App\Middleware',
         ],
         'Process' => [
-            'namespace' => 'App\\Processes',
+            'namespace' => 'App\Processes',
         ],
     ],
 ];

config/autoload/exceptions.php

@@ -9,11 +9,14 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+use App\Exception\Handler\AppExceptionHandler;
+use Hyperf\HttpServer\Exception\Handler\HttpExceptionHandler;
+
 return [
     'handler' => [
         'http' => [
-            Hyperf\HttpServer\Exception\Handler\HttpExceptionHandler::class,
-            App\Exception\Handler\AppExceptionHandler::class,
+            HttpExceptionHandler::class,
+            AppExceptionHandler::class,
         ],
     ],
 ];

config/autoload/listeners.php

@@ -9,6 +9,8 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+use Hyperf\ExceptionHandler\Listener\ErrorExceptionHandler;
+
 return [
-    Hyperf\ExceptionHandler\Listener\ErrorExceptionHandler::class,
+    ErrorExceptionHandler::class,
 ];

config/autoload/logger.php

@@ -9,17 +9,21 @@
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+use Monolog\Formatter\LineFormatter;
+use Monolog\Handler\StreamHandler;
+use Monolog\Logger;
+
 return [
     'default' => [
         'handler' => [
-            'class' => Monolog\Handler\StreamHandler::class,
+            'class' => StreamHandler::class,
             'constructor' => [
                 'stream' => BASE_PATH . '/runtime/logs/hyperf.log',
-                'level' => Monolog\Logger::DEBUG,
+                'level' => Logger::DEBUG,
             ],
         ],
         'formatter' => [
-            'class' => Monolog\Formatter\LineFormatter::class,
+            'class' => LineFormatter::class,
             'constructor' => [
                 'format' => null,
                 'dateFormat' => 'Y-m-d H:i:s',