From 7ec79dcc23e167933846d3fd2fb4359cf8e2e26c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E4=BA=91?= <dongyu.li@luxcreo.ai>
Date: Fri, 13 Oct 2023 15:06:48 +0800
Subject: [PATCH] =?UTF-8?q?build:=20=E5=8D=87=E7=BA=A7=E5=88=B0=208.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 李东云 <dongyu.li@luxcreo.ai>
---
 Dockerfile                                |  4 ++--
 composer.json                             | 11 ++++++-----
 installer/resources/scripts/docker-env.sh |  2 +-
 {test => tests}/Api/ExampleTest.php       |  0
 {test => tests}/HttpTestCase.php          |  0
 {test => tests}/Pest.php                  |  0
 {test => tests}/bootstrap.php             |  0
 7 files changed, 9 insertions(+), 8 deletions(-)
 rename {test => tests}/Api/ExampleTest.php (100%)
 rename {test => tests}/HttpTestCase.php (100%)
 rename {test => tests}/Pest.php (100%)
 rename {test => tests}/bootstrap.php (100%)

diff --git a/Dockerfile b/Dockerfile
index 80e5222..dede4f7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@
 # @link     https://studio.luxcreo.cn/
 # @contact  dongyun.li@luxcreo.cn
 
-FROM harbor.luxcreo.cn/library/hyperf:8.1-swoole
+FROM harbor.luxcreo.cn/library/hyperf:8.2-swoole
 LABEL maintainer="李东云 <dongyun.li@luxcreo.ai>" version="1.0" license="MIT" app.name="LuxStudio"
 
 ##
@@ -39,7 +39,7 @@ ENV TIMEZONE=${timezone:-"Asia/Shanghai"} \
 # 设置时区
 RUN set -ex \
     #  ---------- some config ----------
-    && cd /etc/php81 \
+    && cd /etc/php82 \
     # - config PHP
     && echo "date.timezone=${TIMEZONE}" >> conf.d/99_overrides.ini \
     # - config timezone
diff --git a/composer.json b/composer.json
index 67ca62f..8dc559e 100755
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
       },
       "pre-push": [
         "echo committing as $(git config user.name)",
-        "docker run --rm -t -v \"$(pwd)\":/srv/www harbor.luxcreo.cn/library/hyperf:8.1-swoole composer ci"
+        "docker run --rm -t -v \"$(pwd)\":/srv/www harbor.luxcreo.cn/library/hyperf:8.2-swoole composer ci"
       ]
     }
   },
@@ -33,7 +33,7 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "Test\\": "test/"
+      "Test\\": "tests/"
     }
   },
   "require": {
@@ -47,7 +47,8 @@
     "hyperf/translation": "~3.0.37",
     "hyperf/validation": "~3.0.37",
     "singularity/hdk-core": "^1.0.0",
-    "symfony/polyfill-php81": "^1.28.0"
+    "symfony/polyfill-php81": "^1.28.0",
+    "symfony/polyfill-php82": "^1.28.0"
   },
   "require-dev": {
     "brainmaestro/composer-git-hooks": "^2.8.5",
@@ -85,12 +86,12 @@
     "test": [
       "rm -rf runtime",
       "Composer\\Config::disableProcessTimeout",
-      "APP_STATUS=false co-pest --prepend test/bootstrap.php -c phpunit.xml --colors=always $1"
+      "APP_STATUS=false co-pest --prepend tests/bootstrap.php -c phpunit.xml --colors=always $1"
     ],
     "cs-fix": "php-cs-fixer fix $1 --rules=@PSR12 --allow-risky=yes",
     "analyse": "phpstan analyse $1",
     "ci": [
-      "@analyse app/ config/ test/",
+      "@analyse app/ config/ tests/",
       "@cs-fix",
       "@test",
       "echo CI Success"
diff --git a/installer/resources/scripts/docker-env.sh b/installer/resources/scripts/docker-env.sh
index ce23bd3..b5d3ee0 100755
--- a/installer/resources/scripts/docker-env.sh
+++ b/installer/resources/scripts/docker-env.sh
@@ -8,4 +8,4 @@ docker run \
   -v "$(pwd)":/srv/www \
   -v ~/.ssh:/root/.ssh \
   -p $port:9501 \
-  harbor.luxcreo.cn/library/hyperf:8.1-swoole /bin/ash
+  harbor.luxcreo.cn/library/hyperf:8.2-swoole /bin/ash
diff --git a/test/Api/ExampleTest.php b/tests/Api/ExampleTest.php
similarity index 100%
rename from test/Api/ExampleTest.php
rename to tests/Api/ExampleTest.php
diff --git a/test/HttpTestCase.php b/tests/HttpTestCase.php
similarity index 100%
rename from test/HttpTestCase.php
rename to tests/HttpTestCase.php
diff --git a/test/Pest.php b/tests/Pest.php
similarity index 100%
rename from test/Pest.php
rename to tests/Pest.php
diff --git a/test/bootstrap.php b/tests/bootstrap.php
similarity index 100%
rename from test/bootstrap.php
rename to tests/bootstrap.php