chore(release): 1.0.0-beta.4

Signed-off-by: 李东云 <dongyu.li@luxcreo.ai>

.idea/HDK-Core.iml

@@ -177,6 +177,14 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/webmozart/assert" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/carbonphp/carbon-doctrine-types" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php82" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/clue/ndjson-react" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/evenement/evenement" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/react/cache" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/react/child-process" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/react/dns" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/react/event-loop" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/react/socket" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/react/stream" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

.idea/php.xml

@@ -192,12 +192,25 @@
       <path value="$PROJECT_DIR$/vendor/spatie/pest-plugin-test-time" />
       <path value="$PROJECT_DIR$/vendor/carbonphp/carbon-doctrine-types" />
       <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php82" />
+      <path value="$PROJECT_DIR$/vendor/sebastian/resource-operations" />
+      <path value="$PROJECT_DIR$/vendor/facade/ignition-contracts" />
+      <path value="$PROJECT_DIR$/vendor/cooper/hyperf-pest" />
+      <path value="$PROJECT_DIR$/vendor/clue/ndjson-react" />
+      <path value="$PROJECT_DIR$/vendor/evenement/evenement" />
+      <path value="$PROJECT_DIR$/vendor/react/child-process" />
+      <path value="$PROJECT_DIR$/vendor/react/cache" />
+      <path value="$PROJECT_DIR$/vendor/react/dns" />
+      <path value="$PROJECT_DIR$/vendor/react/stream" />
+      <path value="$PROJECT_DIR$/vendor/react/event-loop" />
+      <path value="$PROJECT_DIR$/vendor/react/socket" />
     </include_path>
   </component>
   <component name="PhpProjectSharedConfiguration" php_language_level="8.1" />
   <component name="PhpStan">
     <PhpStan_settings>
       <PhpStanConfiguration tool_path="$PROJECT_DIR$/vendor/bin/phpstan" />
+      <PhpStanConfiguration tool_path="$PROJECT_DIR$/vendor/bin/phpstan" />
+      <PhpStanConfiguration tool_path="$PROJECT_DIR$/vendor/bin/phpstan" />
     </PhpStan_settings>
   </component>
   <component name="PhpStanOptionsConfiguration">

.idea/phpspec.xml

@@ -47,6 +47,9 @@
       <PhpSpecSuiteConfiguration>
         <option name="myPath" value="$PROJECT_DIR$" />
       </PhpSpecSuiteConfiguration>
+      <PhpSpecSuiteConfiguration>
+        <option name="myPath" value="$PROJECT_DIR$" />
+      </PhpSpecSuiteConfiguration>
     </suites>
   </component>
 </project>

CHANGELOG.md

@@ -1,4 +1,83 @@
 # 版本更新日志
+## [1.0.0-beta.4](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-beta.3...v1.0.0-beta.4) (2024-06-23)
+
+
+### 🐛 Bug Fixes | Bug 修复
+
+* **core-middleware:** 修复 JsonResource 不走响应格式化的问题 ([d524fb4](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/d524fb4e890dd06da8c4fe2f0853e34944cd0e28))
+
+
+### 📦‍ Build System | 打包构建
+
+* **composer:** 更新依赖 ([d20718d](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/d20718db32a9dc05535ff66598475186e8016167))
+
+## [1.0.0-beta.3](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-beta.2...v1.0.0-beta.3) (2024-05-17)
+
+
+### 🐛 Bug Fixes | Bug 修复
+
+* **i18n:** 在没有配置项目默认语言，且传入意料之外的语言时，默认为英文 ([44c26b6](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/44c26b64918702062f28499d566eaa54d8aff491))
+
+
+### 📦‍ Build System | 打包构建
+
+* **composer:** 更新依赖 ([bac22a8](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/bac22a8ea683c42f597e070e1395881b46b2bd83))
+
+## [1.0.0-beta.2](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-beta.1...v1.0.0-beta.2) (2024-01-18)
+
+
+### ⚡ Performance Improvements | 性能优化
+
+* **exception:** 取消了必须是 apifox/postman 的设计 ([2167fd2](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/2167fd209a3cc46ea77fc64909ff8adf71ec6ef0))
+
+
+### 🐛 Bug Fixes | Bug 修复
+
+* **CoreMiddleware:** 修复如果直接输出 ResponseInterface 实例会报错的问题 ([762acbb](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/762acbb368d6a901478fe3d6b2a3e30793f2c57c))
+
+## [1.0.0-beta.1](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-beta.0...v1.0.0-beta.1) (2023-12-15)
+
+
+### 🐛 Bug Fixes | Bug 修复
+
+* **bin:** 更新了迁移脚本的目录 ([da51879](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/da518799b3b4301302217af1faa452adbcacf02b))
+
+## [1.0.0-beta.0](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-alpha.19...v1.0.0-beta.0) (2023-12-15)
+
+
+### 🐛 Bug Fixes | Bug 修复
+
+* **bin:** 更新了迁移脚本的目录 ([01aa833](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/01aa8335371fce4f7663eb1c16e4ef7f108e2bc5))
+
+
+### 📦‍ Build System | 打包构建
+
+* **release:** 将版本号改为 beta ([cfbb770](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/cfbb770559e748c77d52e7d913398b1d2a1d8edd))
+
+## [1.0.0-alpha.19](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-alpha.18...v1.0.0-alpha.19) (2023-12-15)
+
+
+### ✨ Features | 新功能
+
+* **bin:** 增加了迁移到最新版本的脚本 ([a84b812](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/a84b812dd0577186379e2df19493cb0fcf9b4fd9))
+
+## [1.0.0-alpha.18](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-alpha.17...v1.0.0-alpha.18) (2023-12-14)
+
+
+### 📦‍ Build System | 打包构建
+
+* **composer:** 清理 composer 配置 ([08d00a7](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/08d00a785f3be1846333777edae94e0ae237c8a2))
+
+
+### ♻️ Code Refactoring | 代码重构
+
+* 迁移到 hyperf3.1 的写法 ([97131d2](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/97131d224cfb601ba075ff1af1c4ca333680b459))
+
+
+### ✨ Features | 新功能
+
+* **bin:** 增加了迁移到最新版本的脚本 ([7d6dc7f](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/7d6dc7fe9f9bc637755768852518420e98176d56))
+
 ## [1.0.0-alpha.17](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-alpha.16...v1.0.0-alpha.17) (2023-12-14)
 
 

VERSION_TRACKER.txt

@@ -1 +1 @@
-1.0.0-alpha.17
+1.0.0-beta.4

bin/hdk-migrate-core.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+# shellcheck disable=SC2039
+
+LIB_HOME_DIR="$(pwd)/vendor/singularity/hdk-core"
+LATEST_VERSION=$(cat "${LIB_HOME_DIR}/VERSION_TRACKER.txt")
+
+echo -e '\033[44;34;5m=============================\033[0m'
+echo ''
+
+$(pwd)/vendor/bin/rector \
+  process \
+  --autoload-file=vendor/autoload.php \
+  --config="${LIB_HOME_DIR}/hyperf31_rector.php"
+
+echo ''
+echo -e '\033[44;34;5m=============================\033[0m'
+echo -e '\033[;31;1m🎉Congratulations!\033[0m'
+echo "Now you have been migrated to HDK-Core v${LATEST_VERSION}!"
+echo ''

composer.json

@@ -14,6 +14,9 @@
       "email": "dongyun.li@luxcreo.ai"
     }
   ],
+  "bin": [
+    "bin/hdk-migrate-core.sh"
+  ],
   "require": {
     "php": ">=8.1",
     "ext-dom": "*",
@@ -22,6 +25,7 @@
     "ext-swoole": "*",
     "composer/composer": ">=2.0",
     "ergebnis/http-method": "^2.5",
+    "friendsofhyperf/rector": "^0.1.5",
     "hyperf/config": "3.1.*",
     "hyperf/constants": "3.1.*",
     "hyperf/context": "3.1.*",
@@ -45,7 +49,6 @@
     "alibabacloud/dysmsapi-20170525": "^2.0",
     "firebase/php-jwt": "^6.9",
     "friendsofhyperf/pest-plugin-hyperf": "3.1.*",
-    "friendsofhyperf/rector": "^0.1.5",
     "friendsofphp/php-cs-fixer": "^3.41.1",
     "guzzlehttp/guzzle": "^7.8",
     "hyperf/crontab": "3.1.*",
@@ -57,6 +60,7 @@
     "hyperf/validation": "3.1.*",
     "pestphp/pest": "^2.23",
     "phpstan/phpstan": "^1.10.49",
+    "rector/rector": "^0.15.25",
     "roave/security-advisories": "dev-latest",
     "spatie/pest-plugin-test-time": "^2.0",
     "swoole/ide-helper": "*",
@@ -76,7 +80,6 @@
   "config": {
     "optimize-autoloader": true,
     "sort-packages": true,
-    "secure-http": false,
     "allow-plugins": {
       "pestphp/pest-plugin": true
     }
@@ -91,7 +94,6 @@
       "Singularity\\HDK\\Test\\Core\\": "tests/"
     }
   },
-  "minimum-stability": "alpha",
   "archive": {
     "exclude": [
       ".idea",
@@ -105,6 +107,7 @@
       "phpunit.xml"
     ]
   },
+  "minimum-stability": "dev",
   "prefer-stable": true,
   "scripts": {
     "post-root-package-install": [],
@@ -122,14 +125,10 @@
     ]
   },
   "repositories": {
-    "lux-map": {
-      "type": "composer",
-      "url": "https://satis.luxcreo.cn/"
-    },
     "packagist": {
       "type": "composer",
       "url": "https://mirrors.aliyun.com/composer/"
     }
   },
-  "version": "1.0.0-alpha.17"
+  "version": "1.0.0-beta.4"
 }

hyperf31_rector.php

@@ -0,0 +1,198 @@
+<?php
+
+/**
+ * hyperf31_rector.php@LuxLink
+ *
+ * @author 李东云 <Dongyun.Li@LuxCreo.Ai>
+ * Powered by PhpStorm
+ * Created on 2023/12/14
+ */
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\Renaming\Rector\FuncCall\RenameFunctionRector;
+use Rector\Renaming\Rector\MethodCall\RenameMethodRector;
+use Rector\Renaming\Rector\Name\RenameClassRector;
+use Rector\Renaming\ValueObject\MethodCallRename;
+
+return static function (RectorConfig $rectorConfig): void {
+    defined('BASE_PATH') || define('BASE_PATH', dirname(__DIR__, 3));
+    $rectorConfig->importNames(true, false);
+
+    $rectorConfig->paths([
+        BASE_PATH . '/app',
+        BASE_PATH . '/config',
+        BASE_PATH . '/tests',
+    ]);
+
+    $rectorConfig
+        ->ruleWithConfiguration(RenameClassRector::class, [
+            // AsyncQueue
+            'Hyperf\AsyncQueue\Message' => 'Hyperf\AsyncQueue\JobMessage',
+
+            // DbConnection
+            'Hyperf\DbConnection\Listener\CreatingListener' => 'Hyperf\DbConnection\Listener\InitUidOnCreatingListener',
+
+            // HttpMessage
+            'Hyperf\HttpMessage\Server\ConnectionInterface' => 'Hyperf\Engine\Contract\Http\Writable',
+            'Hyperf\HttpMessage\Server\Connection\SwooleConnection' => 'Hyperf\Engine\Http\WritableConnection',
+
+            // Redis
+            'Hyperf\Redis\ScanCaller' => 'Hyperf\Redis\Traits\ScanCaller',
+
+            // Channel
+            'Hyperf\Utils\Channel\Caller' => 'Hyperf\Coroutine\Channel\Caller',
+            'Hyperf\Utils\Channel\ChannelManager' => 'Hyperf\Coroutine\Channel\Manager',
+
+            // Codec
+            'Hyperf\Utils\Codec\Base62' => 'Hyperf\Codec\Base62',
+            'Hyperf\Utils\Codec\Json' => 'Hyperf\Codec\Json',
+            'Hyperf\Utils\Codec\Xml' => 'Hyperf\Codec\Xml',
+
+            // CodeGen
+            'Hyperf\Utils\CodeGen\Package' => 'Hyperf\CodeParser\Package',
+            'Hyperf\Utils\CodeGen\PhpDocReader' => 'Hyperf\CodeParser\PhpDocReader',
+            'Hyperf\Utils\CodeGen\PhpDocReaderManager' => 'Hyperf\CodeParser\PhpDocReaderManager',
+            'Hyperf\Utils\CodeGen\PhpParser' => 'Hyperf\CodeParser\PhpParser',
+            'Hyperf\Utils\CodeGen\Project' => 'Hyperf\CodeParser\Project',
+
+            // Command
+            'Hyperf\Command\ConfirmableTrait' => 'Hyperf\Command\Concerns\Confirmable',
+            'Hyperf\Command\DisableEventDispatcher' => 'Hyperf\Command\Concerns\DisableEventDispatcher',
+            'Hyperf\Command\NullDisableEventDispatcher' => 'Hyperf\Command\Concerns\NullDisableEventDispatcher',
+
+            // Contracts
+            'Hyperf\Utils\Contracts\Arrayable' => 'Hyperf\Contract\Arrayable',
+            'Hyperf\Utils\Contracts\Jsonable' => 'Hyperf\Contract\Jsonable',
+            'Hyperf\Utils\Contracts\MessageBag' => 'Hyperf\Contract\MessageBag',
+            'Hyperf\Utils\Contracts\MessageProvider' => 'Hyperf\Contract\MessageProvider',
+            'Hyperf\Utils\Contracts\Xmlable' => 'Hyperf\Contract\Xmlable',
+
+            // Coordinator
+            'Hyperf\Utils\Coordinator\Constants' => 'Hyperf\Coordinator\Constants',
+            'Hyperf\Utils\Coordinator\Coordinator' => 'Hyperf\Coordinator\Coordinator',
+            'Hyperf\Utils\Coordinator\CoordinatorManager' => 'Hyperf\Coordinator\CoordinatorManager',
+
+            // Coroutine
+            'Hyperf\Utils\Coroutine\Concurrent' => 'Hyperf\Coroutine\Concurrent',
+            'Hyperf\Utils\Coroutine\Locker' => 'Hyperf\Coroutine\Locker',
+
+            // Exception
+            'Hyperf\Utils\Exception\ChannelClosedException' => 'Hyperf\Coroutine\Exception\ChannelClosedException',
+            'Hyperf\Utils\Exception\ExceptionThrower' => 'Hyperf\Support\Exception\ExceptionThrower',
+            'Hyperf\Utils\Exception\InvalidArgumentException' => 'Hyperf\Support\Exception\InvalidArgumentException',
+            'Hyperf\Utils\Exception\IPReadFailedException' => 'Hyperf\Support\Exception\IPReadFailedException',
+            'Hyperf\Utils\Exception\ParallelExecutionException' => 'Hyperf\Coroutine\Exception\ParallelExecutionException',
+            'Hyperf\Utils\Exception\TimeoutException' => 'Hyperf\Coroutine\Exception\TimeoutException',
+            'Hyperf\Utils\Exception\WaitTimeoutException' => 'Hyperf\Coroutine\Exception\WaitTimeoutException',
+
+            // Filesystem
+            'Hyperf\Utils\Filesystem\FileNotFoundException' => 'Hyperf\Support\Filesystem\FileNotFoundException',
+            'Hyperf\Utils\Filesystem\Filesystem' => 'Hyperf\Support\Filesystem\Filesystem',
+
+            // Packer
+            'Hyperf\Utils\Packer\JsonPacker' => 'Hyperf\Codec\Packer\JsonPacker',
+            'Hyperf\Utils\Packer\PhpSerializerPacker' => 'Hyperf\Codec\Packer\PhpSerializerPacker',
+
+            // Reflection
+            'Hyperf\Utils\Reflection\ClassInvoker' => 'Hyperf\Support\Reflection\ClassInvoker',
+
+            // Serializer
+            'Hyperf\Utils\Serializer\ExceptionNormalizer' => 'Hyperf\Serializer\ExceptionNormalizer',
+            'Hyperf\Utils\Serializer\JsonDeNormalizer' => 'Hyperf\Serializer\JsonDeNormalizer',
+            'Hyperf\Utils\Serializer\ScalarNormalizer' => 'Hyperf\Serializer\ScalarNormalizer',
+            'Hyperf\Utils\Serializer\Serializer' => 'Hyperf\Serializer\Serializer',
+            'Hyperf\Utils\Serializer\SerializerFactory' => 'Hyperf\Serializer\SerializerFactory',
+            'Hyperf\Utils\Serializer\SimpleNormalizer' => 'Hyperf\Serializer\SimpleNormalizer',
+            'Hyperf\Utils\Serializer\SymfonyNormalizer' => 'Hyperf\Serializer\SymfonyNormalizer',
+
+            // Traits
+            'Hyperf\Utils\Traits\Conditionable' => 'Hyperf\Conditionable\Conditionable',
+            'Hyperf\Utils\Traits\Container' => 'Hyperf\Support\Traits\Container',
+            'Hyperf\Utils\Traits\CoroutineProxy' => 'Hyperf\Context\Traits\CoroutineProxy',
+            'Hyperf\Utils\Traits\ForwardsCalls' => 'Hyperf\Support\Traits\ForwardsCalls',
+            'Hyperf\Utils\Traits\StaticInstance' => 'Hyperf\Support\Traits\StaticInstance',
+            'Hyperf\Utils\Traits\Tappable' => 'Hyperf\Tappable\Tappable',
+
+            // Utils
+            'Hyperf\Utils\ApplicationContext' => 'Hyperf\Context\ApplicationContext',
+            'Hyperf\Utils\Arr' => 'Hyperf\Collection\Arr',
+            'Hyperf\Utils\Backoff' => 'Hyperf\Support\Backoff',
+            'Hyperf\Utils\ChannelPool' => 'Hyperf\Coroutine\Channel\Pool',
+            'Hyperf\Utils\ClearStatCache' => 'Hyperf\Support\ClearStatCache',
+            'Hyperf\Utils\Collection' => 'Hyperf\Collection\Collection',
+            'Hyperf\Utils\Composer' => 'Hyperf\Support\Composer',
+            'Hyperf\Utils\Coroutine' => 'Hyperf\Coroutine\Coroutine',
+            'Hyperf\Utils\Fluent' => 'Hyperf\Support\Fluent',
+            'Hyperf\Utils\HigherOrderCollectionProxy' => 'Hyperf\Collection\HigherOrderCollectionProxy',
+            'Hyperf\Utils\HigherOrderTapProxy' => 'Hyperf\Tappable\HigherOrderTapProxy',
+            'Hyperf\Utils\InteractsWithTime' => 'Hyperf\Support\Traits\InteractsWithTime',
+            'Hyperf\Utils\IPReader' => 'Hyperf\Support\IPReader',
+            'Hyperf\Utils\MessageBag' => 'Hyperf\Support\MessageBag',
+            'Hyperf\Utils\MimeTypeExtensionGuesser' => 'Hyperf\Support\MimeTypeExtensionGuesser',
+            'Hyperf\Utils\Network' => 'Hyperf\Support\Network',
+            'Hyperf\Utils\Optional' => 'Hyperf\Support\Optional',
+            'Hyperf\Utils\Parallel' => 'Hyperf\Coroutine\Parallel',
+            'Hyperf\Utils\Pipeline' => 'Hyperf\Pipeline\Pipeline',
+            'Hyperf\Utils\Pluralizer' => 'Hyperf\Support\Pluralizer',
+            'Hyperf\Utils\ResourceGenerator' => 'Hyperf\Support\ResourceGenerator',
+            'Hyperf\Utils\SafeCaller' => 'Hyperf\Support\SafeCaller',
+            'Hyperf\Utils\Str' => 'Hyperf\Stringable\Str',
+            'Hyperf\Utils\Stringable' => 'Hyperf\Stringable\Stringable',
+            'Hyperf\Utils\System' => 'Hyperf\Support\System',
+            'Hyperf\Utils\Waiter' => 'Hyperf\Coroutine\Waiter',
+            'Hyperf\Utils\WaitGroup' => 'Hyperf\Coroutine\WaitGroup',
+        ]);
+
+    $rectorConfig
+        ->ruleWithConfiguration(RenameFunctionRector::class, [
+            // hyperf/config
+            'config' => 'Hyperf\Config\config',
+
+            // hyperf/collection
+            'collect' => 'Hyperf\Collection\collect',
+            'data_fill' => 'Hyperf\Collection\data_fill',
+            'data_get' => 'Hyperf\Collection\data_get',
+            'data_set' => 'Hyperf\Collection\data_set',
+            'head' => 'Hyperf\Collection\head',
+            'last' => 'Hyperf\Collection\last',
+
+            // hyperf/continue
+            'co' => 'Hyperf\Coroutine\co',
+            'defer' => 'Hyperf\Coroutine\defer',
+            'go' => 'Hyperf\Coroutine\go',
+            'parallel' => 'Hyperf\Coroutine\parallel',
+            'run' => 'Hyperf\Coroutine\run',
+            'wait' => 'Hyperf\Coroutine\wait',
+
+            // hyperf/tappable
+            'tap' => 'Hyperf\Tappable\tap',
+
+            // hyperf/translation
+            '__' => 'Hyperf\Translation\__',
+            'trans' => 'Hyperf\Translation\trans',
+            'trans_choice' => 'Hyperf\Translation\trans_choice',
+
+            // hyperf/utils
+            'value' => 'Hyperf\Support\value',
+            'env' => 'Hyperf\Support\env',
+            'retry' => 'Hyperf\Support\retry',
+            'with' => 'Hyperf\Support\with',
+            'call' => 'Hyperf\Support\call',
+            'class_basename' => 'Hyperf\Support\class_basename',
+            'trait_uses_recursive' => 'Hyperf\Support\trait_uses_recursive',
+            'class_uses_recursive' => 'Hyperf\Support\class_uses_recursive',
+            'setter' => 'Hyperf\Support\setter',
+            'getter' => 'Hyperf\Support\getter',
+            'make' => 'Hyperf\Support\make',
+            'swoole_hook_flags' => 'Hyperf\Support\swoole_hook_flags',
+            'optional' => 'Hyperf\Support\optional',
+        ]);
+
+    $rectorConfig->ruleWithConfiguration(RenameMethodRector::class, [
+        new MethodCallRename('Hyperf\Dag\Dag', 'checkCircularDependences', 'checkCircularDependencies'),
+        // new MethodCallRename('Hyperf\DbConnection\Connection', 'isTransaction', 'transactionLevel'),
+        new MethodCallRename('Hyperf\Testing\Client', 'init', 'initRequest'),
+        new MethodCallRename('Hyperf\Cache\CacheListenerCollector', 'getListner', 'getListener'),
+    ]);
+};

scripts/release.sh

@@ -2,4 +2,4 @@
 
 docker run --rm -it \
     -v $(pwd):/app -e "GIT_AUTHOR_NAME=$(git config user.name)" -e "EMAIL=$(git config user.email)" \
-    detouched/standard-version:latest -p=alpha $1
+    detouched/standard-version:latest -p=beta $1

src/ConfigProvider.php

@@ -24,7 +24,6 @@ class ConfigProvider
     /** @phpstan-ignore-next-line  */
     public function __invoke(): array
     {
-        /** @noinspection PhpUndefinedConstantInspection */
         return [
             // 合并到  config/autoload/dependencies.php 文件
             'dependencies' => [

src/Exceptions/Handler/CommonHandler.php

@@ -72,10 +72,8 @@ class CommonHandler extends ExceptionHandler
         $message_name = config('common.response.message_name');
         $is_testing = config('app_status') === true;
         $this->request?->url();
-        $is_debug = $this->request?->hasHeader('Postman-Token') || str_starts_with(
-            $this->request?->header('User-Agent', ''),
-            'apifox'
-        );
+
+        $is_debug = $is_testing;
         $error_type = $throwable::class;
         $request_time = Carbon::now()->toDateTimeString();
         $request_data = Json::encode($this->request?->getParsedBody());

src/Http/RequestService.php

@@ -4,7 +4,8 @@ declare(strict_types=1);
 
 namespace Singularity\HDK\Core\Http;
 
-use Ergebnis\Http\Method;
+use Ergebnis\Http\Method\Rfc\Rfc5789;
+use Ergebnis\Http\Method\Rfc\Rfc7231;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Psr7\Request;
@@ -49,7 +50,9 @@ final class RequestService extends AbstractSingleton
 
     /**
      * 定制 options
+     *
      * @param Options $options
+     *
      * @return $this
      */
     public function setOptions(array $options): self
@@ -59,10 +62,11 @@ final class RequestService extends AbstractSingleton
     }
 
     /**
-     * @param string $url
+     * @param string                    $url
      * @param array<string, string|int> $params
-     * @param array<string, mixed> $data
-     * @param Options $options
+     * @param array<string, mixed>      $data
+     * @param Options                   $options
+     *
      * @return ResponseInterface
      * @throws GuzzleException
      */
@@ -73,7 +77,7 @@ final class RequestService extends AbstractSingleton
         array $options = []
     ): ResponseInterface {
         $request = new Request(
-            method: Method\Rfc\Rfc7231::GET,
+            method: Rfc7231::GET,
             uri: $url
         );
         return $this->getClient($options)->send($request, ['query' => $params, 'json' => $data,]);
@@ -81,7 +85,9 @@ final class RequestService extends AbstractSingleton
 
     /**
      *  工厂模式初始化请求
+     *
      * @param Options $options
+     *
      * @return Client
      */
     private function getClient(array $options): Client
@@ -91,10 +97,11 @@ final class RequestService extends AbstractSingleton
     }
 
     /**
-     * @param string $url
+     * @param string                    $url
      * @param array<string, string|int> $params
-     * @param array<string, mixed> $data
-     * @param Options $options
+     * @param array<string, mixed>      $data
+     * @param Options                   $options
+     *
      * @return ResponseInterface
      * @throws GuzzleException
      */
@@ -106,7 +113,7 @@ final class RequestService extends AbstractSingleton
     ): ResponseInterface {
         $data = Json::encode($data);
         $request = new Request(
-            method: Method\Rfc\Rfc7231::POST,
+            method: Rfc7231::POST,
             uri: $url,
             headers: ['Content-Type' => 'application/json'],
             body: Utils::streamFor($data),
@@ -115,10 +122,11 @@ final class RequestService extends AbstractSingleton
     }
 
     /**
-     * @param string $url
-     * @param array<string, mixed> $data
+     * @param string                    $url
+     * @param array<string, mixed>      $data
      * @param array<string, string|int> $params
-     * @param Options $options
+     * @param Options                   $options
+     *
      * @return ResponseInterface
      * @throws GuzzleException
      */
@@ -130,7 +138,7 @@ final class RequestService extends AbstractSingleton
     ): ResponseInterface {
         $data = Json::encode($data);
         $request = new Request(
-            method: Method\Rfc\Rfc7231::PUT,
+            method: Rfc7231::PUT,
             uri: $url,
             headers: ['Content-Type' => 'application/json'],
             body: Utils::streamFor($data)
@@ -142,10 +150,11 @@ final class RequestService extends AbstractSingleton
     }
 
     /**
-     * @param string $url
-     * @param array<string, mixed> $data
+     * @param string                    $url
+     * @param array<string, mixed>      $data
      * @param array<string, string|int> $params
-     * @param Options $options
+     * @param Options                   $options
+     *
      * @return ResponseInterface
      * @throws GuzzleException
      */
@@ -157,7 +166,7 @@ final class RequestService extends AbstractSingleton
     ): ResponseInterface {
         $data = Json::encode($data);
         $request = new Request(
-            method: Method\Rfc\Rfc5789::PATCH,
+            method: Rfc5789::PATCH,
             uri: $url,
             headers: ['Content-Type' => 'application/json'],
             body: Utils::streamFor($data)
@@ -169,10 +178,11 @@ final class RequestService extends AbstractSingleton
     }
 
     /**
-     * @param string $url
-     * @param array<string, mixed> $data
+     * @param string                    $url
+     * @param array<string, mixed>      $data
      * @param array<string, string|int> $params
-     * @param Options $options
+     * @param Options                   $options
+     *
      * @return ResponseInterface
      * @throws GuzzleException
      */
@@ -184,7 +194,7 @@ final class RequestService extends AbstractSingleton
     ): ResponseInterface {
         $data = Json::encode($data);
         $request = new Request(
-            method: Method\Rfc\Rfc7231::DELETE,
+            method: Rfc7231::DELETE,
             uri: $url,
             headers: ['Content-Type' => 'application/json'],
             body: Utils::streamFor($data)

src/I18n/Enum/Languages.php

@@ -22,7 +22,7 @@ enum Languages: string
         return match (mb_strtolower($language)) {
             'en', 'en_us', 'en-us', 'en-uk', 'en_uk' => self::EN,
             'zh', 'zh_cn', 'zh-cn' => self::ZH_CN,
-            default => self::from(config('translation.locale')),
+            default => self::from(config('translation.locale') ?? 'en'),
         };
     }
 }

src/Middleware/CommonCoreMiddleware.php

@@ -18,6 +18,7 @@ use Hyperf\Di\Annotation\Inject;
 use Hyperf\HttpMessage\Server\ResponsePlusProxy;
 use Hyperf\HttpMessage\Stream\SwooleStream;
 use Hyperf\HttpServer\CoreMiddleware;
+use Hyperf\Resource\Json\JsonResource;
 use Lmc\HttpConstants\Header;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -47,14 +48,14 @@ class CommonCoreMiddleware extends CoreMiddleware
      */
     protected function transferToResponse(
         $response,
-        ServerRequestInterface $request
+        ServerRequestInterface $request,
     ): ResponsePlusInterface {
         $style = $this->apiStyleService->get();
 
-        if ($style === ApiStyleService::RESTFUL) {
-            $response = $this->transferToRestfulResponse($response, $request);
-        } else {
-            $response = $this->transferToClassicResponse($response, $request);
+        if (!($response instanceof ResponseInterface) || $response instanceof JsonResource) {
+            $response = $style === ApiStyleService::RESTFUL
+                ? $this->transferToRestfulResponse($response, $request)
+                : $this->transferToClassicResponse($response, $request);
         }
 
         return new ResponsePlusProxy($response);
@@ -68,7 +69,7 @@ class CommonCoreMiddleware extends CoreMiddleware
      */
     protected function transferToRestfulResponse(
         null|array|Arrayable|Jsonable|ResponseInterface|string $response,
-        ServerRequestInterface $request
+        ServerRequestInterface $request,
     ): ResponseInterface {
         // 分页数据
         if ($response instanceof LengthAwarePaginatorInterface) {
@@ -103,7 +104,7 @@ class CommonCoreMiddleware extends CoreMiddleware
      */
     protected function transferToClassicResponse(
         null|array|Arrayable|Jsonable|ResponseInterface|string $response,
-        ServerRequestInterface $request
+        ServerRequestInterface $request,
     ): ResponseInterface {
         $code_name = config('common.response.code_name');
         $message_name = config('common.response.message_name');
@@ -162,6 +163,9 @@ class CommonCoreMiddleware extends CoreMiddleware
                 new SwooleStream(Json::encode($response))
             );
         }
+        if ($response instanceof ResponseInterface) {
+            return $response;
+        }
         // 其他默认按字符串处理
         return $this->response()->withAddedHeader(Header::CONTENT_TYPE, 'text/plain')->withBody(
             new SwooleStream((string)$response)

src/Service/HttpRequestService.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace Singularity\HDK\Core\Service;
 
-use Ergebnis\Http\Method;
+use Ergebnis\Http\Method\Rfc\Rfc7231;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Psr7\Request;
@@ -16,6 +16,7 @@ use Psr\Http\Message\ResponseInterface;
 
 /**
  * 发起 Http 请求的类
+ *
  * @deprecated since version 1.0-alpha.3, to be removed in 1.0
  */
 class HttpRequestService
@@ -31,15 +32,16 @@ class HttpRequestService
     private array $options = [];
 
     /**
-     * @param string $url
+     * @param string                    $url
      * @param array<string, string|int> $params
-     * @param array<string, mixed> $data
+     * @param array<string, mixed>      $data
+     *
      * @return ResponseInterface
      * @throws GuzzleException
      */
     public function requestGet(string $url, array $params = [], array $data = []): ResponseInterface
     {
-        $request = new Request(Method\Rfc\Rfc7231::GET, $url);
+        $request = new Request(Rfc7231::GET, $url);
         return $this->getClient()->send($request, [
             'query' => $params,
             'json' => $data,
@@ -52,9 +54,10 @@ class HttpRequestService
     }
 
     /**
-     * @param string $url
-     * @param array<string, mixed> $data
+     * @param string                    $url
+     * @param array<string, mixed>      $data
      * @param array<string, string|int> $params
+     *
      * @return ResponseInterface
      * @throws GuzzleException
      */
@@ -74,9 +77,10 @@ class HttpRequestService
 
 
     /**
-     * @param string $url
-     * @param array<string, mixed> $data
+     * @param string                    $url
+     * @param array<string, mixed>      $data
      * @param array<string, string|int> $params
+     *
      * @return ResponseInterface
      * @throws GuzzleException
      */
@@ -91,7 +95,9 @@ class HttpRequestService
 
     /**
      * 定制 options
+     *
      * @param array<string, mixed> $options
+     *
      * @return $this
      */
     public function setOptions(array $options): HttpRequestService

tests/Unit/RequestServiceTest.php

@@ -14,6 +14,8 @@ use Singularity\HDK\Core\Http\RequestService;
 use Singularity\HDK\Core\Http\RequestServiceFactory;
 use Teapot\StatusCode\RFC\RFC7231;
 
+use function Hyperf\Support\make;
+
 class RequestServiceTest
 {
     private RequestService $service;
@@ -31,7 +33,7 @@ class RequestServiceTest
 
 test('Http 请求服务可以正常使用', function () {
     /** @var RequestServiceTest $class */
-    $class = \Hyperf\Support\make(RequestServiceTest::class);
+    $class = make(RequestServiceTest::class);
     $response = $class->getInstance()->setOptions([
         'allow_redirects' => false,
     ])->requestGet('https://www.baidu.com');

tests/bootstrap.php

@@ -3,9 +3,11 @@
 declare(strict_types=1);
 
 use Hyperf\Context\ApplicationContext;
+use Hyperf\Di\ClassLoader;
 use Hyperf\Di\Container;
 use Hyperf\Di\Definition\DefinitionSource;
 use Psr\Container\ContainerInterface;
+use Swoole\Runtime;
 
 ini_set('display_errors', 'on');
 ini_set('display_startup_errors', 'on');
@@ -17,10 +19,10 @@ date_default_timezone_set('Asia/Shanghai');
 !defined('BASE_PATH') && define('BASE_PATH', dirname(__DIR__, 1));
 !defined('SWOOLE_HOOK_FLAGS') && define('SWOOLE_HOOK_FLAGS', SWOOLE_HOOK_ALL);
 
-Swoole\Runtime::enableCoroutine(true);
+Runtime::enableCoroutine(true);
 
 require BASE_PATH . '/vendor/autoload.php';
-Hyperf\Di\ClassLoader::init();
+ClassLoader::init();
 
 $container = new Container(new DefinitionSource([]));
 if (!$container instanceof ContainerInterface) {