chore(release): 1.0.0-alpha.4

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

.gitignore

@@ -1,3 +1,4 @@
 vendor/
 .phpunit.result.cache
-.php-cs-fixer.cache
+.php-cs-fixer.cache
+runtime/

.idea/HDK-Core.iml

@@ -3,7 +3,6 @@
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="Singularity\HDK\Core\" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="Singularity\HDK\Test\Core\" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/recursion-context" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/sebastian/lines-of-code" />
@@ -31,7 +30,6 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/composer" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/fig/http-message-util" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/lmc/http-constants" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/psr/cache" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/psr/http-server-handler" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/psr/event-dispatcher" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/psr/http-server-middleware" />
@@ -111,7 +109,6 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/theseer/tokenizer" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/lexer" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/inflector" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/annotations" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/instantiator" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/ergebnis/http-method" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/firebase/php-jwt" />
@@ -158,6 +155,9 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/serializer" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/stringable" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/hyperf/support" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/cooper/hyperf-pest" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/psr/clock" />
+      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php83" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

.idea/pest.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PestSettings">
+    <option name="preferredTestFlavor" value="TEST" />
+  </component>
+</project>

.idea/php.xml

@@ -46,7 +46,6 @@
       <path value="$PROJECT_DIR$/vendor/composer" />
       <path value="$PROJECT_DIR$/vendor/fig/http-message-util" />
       <path value="$PROJECT_DIR$/vendor/lmc/http-constants" />
-      <path value="$PROJECT_DIR$/vendor/psr/cache" />
       <path value="$PROJECT_DIR$/vendor/psr/http-server-handler" />
       <path value="$PROJECT_DIR$/vendor/psr/event-dispatcher" />
       <path value="$PROJECT_DIR$/vendor/psr/http-server-middleware" />
@@ -130,7 +129,6 @@
       <path value="$PROJECT_DIR$/vendor/theseer/tokenizer" />
       <path value="$PROJECT_DIR$/vendor/doctrine/lexer" />
       <path value="$PROJECT_DIR$/vendor/doctrine/inflector" />
-      <path value="$PROJECT_DIR$/vendor/doctrine/annotations" />
       <path value="$PROJECT_DIR$/vendor/doctrine/instantiator" />
       <path value="$PROJECT_DIR$/vendor/ergebnis/http-method" />
       <path value="$PROJECT_DIR$/vendor/firebase/php-jwt" />
@@ -175,9 +173,12 @@
       <path value="$PROJECT_DIR$/vendor/hyperf/stringable" />
       <path value="$PROJECT_DIR$/vendor/hyperf/support" />
       <path value="$PROJECT_DIR$/vendor/ralouphie/getallheaders" />
+      <path value="$PROJECT_DIR$/vendor/cooper/hyperf-pest" />
+      <path value="$PROJECT_DIR$/vendor/psr/clock" />
+      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php83" />
     </include_path>
   </component>
-  <component name="PhpProjectSharedConfiguration" php_language_level="8.0" />
+  <component name="PhpProjectSharedConfiguration" php_language_level="8.1" />
   <component name="PhpStan">
     <PhpStan_settings>
       <PhpStanConfiguration tool_path="$PROJECT_DIR$/vendor/bin/phpstan" />

.idea/phpspec.xml

@@ -23,6 +23,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,21 @@
 # 版本更新日志
+## [1.0.0-alpha.4](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-alpha.3...v1.0.0-alpha.4) (2023-09-26)
+
+
+### 📦‍ Build System | 打包构建
+
+* **composer:** 引入 pest 并升级到 php8.1 ([dbbe278](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/dbbe278aa6c96634ed5792b5782825770c5cabe8))
+
+
+### ✨ Features | 新功能
+
+* **i18n:** 增加枚举值，更新中间件调用方式 ([4032d67](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/4032d67f1e56b8ce29fbfa5bd77ead2636a6ffd3))
+
+
+### ✅ Tests | 测试
+
+* **http:** 完成并通过了 http 请求的测试 ([7a209e8](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/7a209e876f8b4301b7bc78f05b68798eb65e77f7))
+
 ## [1.0.0-alpha.3](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-alpha.2...v1.0.0-alpha.3) (2023-08-30)
 
 

VERSION_TRACKER.txt

@@ -1 +1 @@
-1.0.0-alpha.3
+1.0.0-alpha.4

composer.json

@@ -15,7 +15,7 @@
     }
   ],
   "require": {
-    "php": "^8.0",
+    "php": "^8.1",
     "ext-redis": "^5.3",
     "ext-swoole": "*",
     "composer/composer": ">=2.0",
@@ -41,6 +41,7 @@
   },
   "require-dev": {
     "alibabacloud/dysmsapi-20170525": "^2.0",
+    "cooper/hyperf-pest": "^1.1",
     "firebase/php-jwt": "^6.1",
     "friendsofphp/php-cs-fixer": "^3.13",
     "guzzlehttp/guzzle": "^7.5",
@@ -91,7 +92,11 @@
   "prefer-stable": true,
   "scripts": {
     "post-root-package-install": [],
-    "test": "vendor/bin/pest $1",
+    "test": [
+      "rm -rf runtime",
+      "Composer\\Config::disableProcessTimeout",
+      "co-pest --prepend tests/bootstrap.php -c phpunit.xml --colors=always $1"
+    ],
     "cs-fix": "vendor/bin/php-cs-fixer fix $1 --rules=@PSR12 --allow-risky=yes",
     "analyse": "vendor/bin/phpstan analyse $1",
     "ci": [
@@ -111,5 +116,5 @@
       "url": "https://mirrors.aliyun.com/composer/"
     }
   },
-  "version": "1.0.0-alpha.3"
+  "version": "1.0.0-alpha.4"
 }

scripts/docker-env.sh

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

src/Http/RequestService.php

@@ -10,7 +10,6 @@ use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Utils;
 use Hyperf\Codec\Json;
-use Hyperf\Di\Annotation\Inject;
 use Hyperf\Guzzle\ClientFactory;
 use Psr\Http\Message\ResponseInterface;
 use Singularity\HDK\Core\Service\AbstractSingleton;
@@ -28,7 +27,6 @@ final class RequestService extends AbstractSingleton
 {
     // public const TIMEOUT = 20;
 
-    #[Inject]
     private ClientFactory $client;
 
     /**
@@ -42,6 +40,9 @@ final class RequestService extends AbstractSingleton
     public function __construct(array $options = [])
     {
         $this->setOptions($options);
+        /** @var ClientFactory $client */
+        $client = \Hyperf\Support\make(ClientFactory::class);
+        $this->client = $client;
     }
 
     /**

src/I18n/Enum/Languages.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * Languages.php@Core
+ *
+ * @author 李东云 <Dongyun.Li@LuxCreo.Ai>
+ * Powered by PhpStorm
+ * Created on 2023/9/26
+ */
+
+namespace Singularity\HDK\Core\I18n\Enum;
+
+use function Hyperf\Config\config;
+
+enum Languages: string
+{
+    case ZH_CN = 'zh_CN';
+
+    case EN = 'en';
+
+    public static function getLanguage(string $language): Languages
+    {
+        return match ($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')),
+        };
+    }
+}

src/Middleware/InternationalizationMiddleware.php

@@ -12,10 +12,9 @@ use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
+use Singularity\HDK\Core\I18n\Enum\Languages;
 use Symfony\Component\HttpFoundation\Request;
 
-use function Hyperf\Config\config;
-
 /**
  * Singularity\HDK\Utils\Middleware\InternationalizationMiddleware@HDK
  *
@@ -41,12 +40,8 @@ class InternationalizationMiddleware implements MiddlewareInterface
 
         $language = $req->getPreferredLanguage();
         if (!empty($language)) {
-            $language = match (strtolower($language)) {
-                'en', 'en_us', 'en-us', 'en-uk', 'en_uk' => 'en',
-                'zh', 'zh_cn', 'zh-cn' => 'zh_CN',
-                default => config('translation.locale'),
-            };
-            $this->translator->setLocale($language);
+            $language = Languages::getLanguage($language);
+            $this->translator->setLocale($language->value);
         }
         $response = Context::get(ResponseInterface::class);
         $response = $response->withAddedHeader(

tests/Unit/RequestServiceTest.php

@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * RequestServiceTest.php@Core
+ *
+ * @author 李东云 <Dongyun.Li@LuxCreo.Ai>
+ * Powered by PhpStorm
+ * Created on 2023/9/20
+ */
+
+namespace Singularity\HDK\Test\Core\Unit;
+use Singularity\HDK\Core\Http\RequestService;
+use Singularity\HDK\Core\Http\RequestServiceFactory;
+
+class RequestServiceTest
+{
+    private RequestService $service;
+
+    public function __construct()
+    {
+        $this->service = RequestServiceFactory::make();
+    }
+
+    public function getInstance(): RequestService
+    {
+        return $this->service;
+    }
+}
+
+test('Http 请求服务可以正常使用', function () {
+    /** @var RequestServiceTest $class */
+    $class = \Hyperf\Support\make(RequestServiceTest::class);
+    $response = $class->getInstance()->requestGet('http://baidu.com/');
+    $content = $response->getBody()->getContents();
+    expect($content)->toBe(<<<HTML
+<html>
+<meta http-equiv="refresh" content="0;url=http://www.baidu.com/">
+</html>
+
+HTML);
+});

tests/bootstrap.php

@@ -9,8 +9,29 @@ declare(strict_types=1);
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
+use Hyperf\Context\ApplicationContext;
+use Hyperf\Di\Container;
+use Hyperf\Di\Definition\DefinitionSource;
+use Psr\Container\ContainerInterface;
+
 ini_set('display_errors', 'on');
 ini_set('display_startup_errors', 'on');
 
 error_reporting(E_ALL);
 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);
+
+require BASE_PATH . '/vendor/autoload.php';
+Hyperf\Di\ClassLoader::init();
+
+$container = new Container(new DefinitionSource([]));
+if (!$container instanceof ContainerInterface) {
+    throw new RuntimeException('The dependency injection container is invalid.');
+}
+$container = ApplicationContext::setContainer($container);