chore(release): 0.2.12

限定了 hyperf/crontab 的版本，避开有问题的版本

.idea/HDK-Core.iml

@@ -64,7 +64,6 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/http-message" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/exception-handler" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/macroable" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/engine" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/pool" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/event" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/validation" />
@@ -83,7 +82,6 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/phar-io/manifest" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/phar-io/version" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-timer" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/phpunit" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-text-template" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-code-coverage" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/php-invoker" />
@@ -138,12 +136,19 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/friendsofphp/php-cs-fixer" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/filp/whoops" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/deprecations" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/paginator" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/phpunit/phpunit" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/engine" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/spatie/pest-plugin-test-time" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/coordinator" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/resource" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/spatie/test-time" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/coordinator" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/engine-contract" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/resource" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/paginator" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/guzzle" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/http-foundation" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/collection" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/pipeline" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/tappable" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

.idea/php.xml

@@ -159,6 +159,12 @@
       <path value="$PROJECT_DIR$/vendor/doctrine/deprecations" />
       <path value="$PROJECT_DIR$/vendor/hyperf/coordinator" />
       <path value="$PROJECT_DIR$/vendor/hyperf/guzzle" />
+      <path value="$PROJECT_DIR$/vendor/hyperf/engine-contract" />
+      <path value="$PROJECT_DIR$/vendor/hyperf/crontab" />
+      <path value="$PROJECT_DIR$/vendor/symfony/http-foundation" />
+      <path value="$PROJECT_DIR$/vendor/hyperf/pipeline" />
+      <path value="$PROJECT_DIR$/vendor/hyperf/collection" />
+      <path value="$PROJECT_DIR$/vendor/hyperf/tappable" />
     </include_path>
   </component>
   <component name="PhpProjectSharedConfiguration" php_language_level="8.0" />

CHANGELOG.md

@@ -1,4 +1,35 @@
 # 版本更新日志
+### [0.2.12](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v0.2.11...v0.2.12) (2023-04-10)
+
+
+### 📦‍ Build System | 打包构建
+
+* **composer:** 更新依赖以兼容 nano ([7e5cb89](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/7e5cb89dfe1c09390e78cdd527c60151f2cd0418))
+* **phpstan:** fix ([c25e6ee](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/c25e6eed52e83d2ca62fc3d0cf83f508a1045c5a))
+* **scripts:** 更新脚本 ([4ba0cb8](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/4ba0cb83f5dc88817260cb2b2dfde491c6b5ba75))
+
+### [0.2.11](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v0.2.10...v0.2.11) (2023-04-03)
+
+
+### 📦‍ Build System | 打包构建
+
+* **composer:** 更新依赖 ([78b56a6](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/78b56a6aa9038743be7df9a17787b94771e226c3))
+* **composer:** 更新依赖 ([c991c31](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/c991c312609e7501c7adad28ec8229efad717db0))
+
+
+### ✨ Features | 新功能
+
+* **i18n:** 引入了 symfony 的 Accept-Language 机制 ([859a1a1](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/859a1a1f2aa683f9f026652952d1a03ba5d7be02))
+
+### [0.2.10](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v0.2.9...v0.2.10) (2023-03-21)
+
+
+### 📦‍ Build System | 打包构建
+
+* **composer:** 只留下了腾讯源，更新依赖 ([afec642](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/afec6424545daa3b3f2a4b91e97e359b4a840a19))
+* **composer:** 只留下了腾讯源，更新依赖 ([b2debf9](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/b2debf9c135554a15639c299f183c43f3682545b))
+* **composer:** 更新依赖 ([70ad307](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/70ad3078b1ddeeeb0179dd44770e959ecf072fed))
+
 ### [0.2.9](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v0.2.8...v0.2.9) (2023-03-15)
 
 

VERSION_TRACKER.txt

@@ -1 +1 @@
-0.2.9
+0.2.12

composer.json

@@ -15,26 +15,26 @@
     }
   ],
   "require": {
-    "php": "~8.0",
+    "php": "^8.0",
     "ext-redis": "^5.3",
     "ext-swoole": "*",
     "composer/composer": ">=2.0",
     "ergebnis/http-method": "^2.2",
-    "hyperf/config": "3.0.*",
-    "hyperf/constants": "3.0.*",
-    "hyperf/context": "3.0.*",
-    "hyperf/database": "3.0.*",
-    "hyperf/di": "3.0.*",
-    "hyperf/framework": "3.0.*",
+    "hyperf/config": "^3.0.0",
+    "hyperf/constants": "^3.0.0",
+    "hyperf/context": "^3.0.0",
+    "hyperf/di": "^3.0.0",
+    "hyperf/framework": "^3.0.0",
     "hyperf/http-server": "3.0.*",
-    "hyperf/logger": "3.0.*",
-    "hyperf/redis": "3.0.*",
-    "hyperf/resource": "3.0.*",
-    "hyperf/translation": "3.0.*",
+    "hyperf/logger": "^3.0.0",
+    "hyperf/redis": "^3.0.0",
+    "hyperf/resource": "^3.0.0",
+    "hyperf/translation": "^3.0.0",
     "jetbrains/phpstorm-attributes": "^1.0",
     "lmc/http-constants": "^1.2",
     "myclabs/php-enum": "^1.8",
     "roave/dont": "^1.5",
+    "symfony/http-foundation": "^6.0",
     "symfony/polyfill-php81": "^1.26",
     "teapot/status-code": "^1.1"
   },
@@ -43,22 +43,25 @@
     "firebase/php-jwt": "^6.1",
     "friendsofphp/php-cs-fixer": "^3.13",
     "guzzlehttp/guzzle": "^7.5",
-    "hyperf/guzzle": "^3.0",
-    "hyperf/session": "3.0.*",
-    "hyperf/validation": "3.0.*",
+    "hyperf/crontab": "^3.0.0",
+    "hyperf/guzzle": "^3.0.0",
+    "hyperf/session": "^3.0.0",
+    "hyperf/validation": "^3.0.0",
     "pestphp/pest": "^1.22",
     "phpstan/phpstan": "^1.9",
     "phpunit/phpunit": "^9.5",
     "roave/security-advisories": "dev-latest",
     "spatie/pest-plugin-test-time": "^1.1",
     "swoole/ide-helper": "*",
-    "symfony/mailer": "^6.0"
+    "symfony/mailer": "^6.0",
+    "hyperf/database": "^3.0.0",
+    "hyperf/db": "^3.0.0"
   },
   "suggest": {
     "firebase/php-jwt": "JWT 鉴权必需",
-    "hyperf/session": "Session 鉴权必需",
+    "hyperf/session": "^3.0.0",
     "symfony/mailer": "用于发送电子邮件",
-    "hyperf/guzzle": "需要发起 http 请求时必需",
+    "hyperf/guzzle": "^3.0.0",
     "alibabacloud/dysmsapi-20170525": "阿里云短信服务必需"
   },
   "config": {
@@ -99,17 +102,9 @@
       "url": "https://satis.luxcreo.cn/"
     },
     "packagist": {
-      "type": "composer",
-      "url": "https://mirrors.aliyun.com/composer/"
-    },
-    "packagist-tx": {
       "type": "composer",
       "url": "https://mirrors.cloud.tencent.com/composer/"
-    },
-    "packagist-hw": {
-      "type": "composer",
-      "url": "https://repo.huaweicloud.com/repository/php/"
     }
   },
-  "version": "0.2.9"
+  "version": "0.2.12"
 }

phpstan.dist.neon

@@ -5,7 +5,7 @@ parameters:
     paths:
         - publish
         - src
-        - testsi
+        - tests
     ignoreErrors:
         - '#Constant BASE_PATH not found#'
         - '#Property [a-zA-Z0-9\\_]+::\$[a-zA-Z0-9]+ is never written, only read\.#'

scripts/build-image.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/env sh
-docker login harbor.luxcreo.cn -u php -p fTr6oVvqqdzVlYgnZhRPPAP54u7SmqGA
-
-image_name=harbor.luxcreo.cn/php/composer-template
-docker build --tag $image_name .
-
-#docker push $image_name
-#docker push ${image_name}-dev

scripts/docker-env.sh

@@ -6,4 +6,5 @@ docker run \
     -w "/srv/www" \
     -v "$(pwd)":/srv/www \
     -v ~/.ssh:/root/.ssh \
+    -v ~/.gitconfig:/root/.gitconfig \
    harbor.luxcreo.cn/library/hyperf:8.0-swoole /bin/ash

scripts/release.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
 
 docker run --rm -it \
-    -v $(pwd):/app -e "GIT_AUTHOR_NAME=ch4o5" -e "EMAIL=dongyun.li@luxcreo.ai" \
+    -v $(pwd):/app -e "GIT_AUTHOR_NAME=$(git config user.name)" -e "EMAIL=$(git config user.email)" \
     detouched/standard-version:latest $1

src/Middleware/InternationalizationMiddleware.php

@@ -7,10 +7,12 @@ namespace Singularity\HDK\Core\Middleware;
 use Hyperf\Context\Context;
 use Hyperf\Contract\TranslatorInterface;
 use Hyperf\Di\Annotation\Inject;
+use Lmc\HttpConstants\Header;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Singularity\HDK\Utils\Middleware\InternationalizationMiddleware@HDK
@@ -26,13 +28,16 @@ class InternationalizationMiddleware implements MiddlewareInterface
      */
     #[Inject]
     private TranslatorInterface $translator;
+
     /**
      * @inheritDoc
      */
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
-        $response = Context::get(ResponseInterface::class);
-        $language = $request->getHeaderLine('Accept-Language');
+        $req = (new Request());
+        $req->headers->set(Header::ACCEPT_LANGUAGE, $request->getHeaderLine(Header::ACCEPT_LANGUAGE));
+
+        $language = $req->getPreferredLanguage([config('translation.locale')]);
         if (!empty($language)) {
             $language = match (strtolower($language)) {
                 'en', 'en_us', 'en-us', 'en-uk', 'en_uk' => 'en',
@@ -40,9 +45,14 @@ class InternationalizationMiddleware implements MiddlewareInterface
                 default => config('translation.locale'),
             };
             $this->translator->setLocale($language);
-            $response = $response->withAddedHeader('Content-Language', strtr($this->translator->getLocale(), '_', '-'));
-            Context::set(ResponseInterface::class, $response);
         }
+        $response = Context::get(ResponseInterface::class);
+        $response = $response->withAddedHeader(
+            Header::CONTENT_LANGUAGE,
+            strtr($this->translator->getLocale(), '_', '-')
+        );
+        Context::set(ResponseInterface::class, $response);
+
         return $handler->handle($request);
     }
 }