Merge pull request #1425 from ulue/dev2

swoft-cloud · May 6, 2021 · 01a27ec · 01a27ec
2 parents 2599c30 + 9bf50ff
commit 01a27ec
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/composer.cn.json b/composer.cn.json
@@ -27,7 +27,7 @@
   },
   "require-dev": {
     "swoft/swoole-ide-helper": "dev-master",
-    "phpunit/phpunit": "^7.5",
+    "phpunit/phpunit": "^7.5 || ^8.0",
     "swoft/devtool": "~2.0.0"
   },
   "autoload": {

diff --git a/dev.composer.json → composer.dev.json b/dev.composer.json → composer.dev.json
@@ -12,13 +12,13 @@
     "php": ">7.1",
     "ext-pdo": "*",
     "ext-json": "*",
-    "ext-swoole": ">=4.3",
     "swoft/component": "dev-master as 2.0",
     "swoft/ext": "dev-master as 2.0"
   },
   "require-dev": {
+    "swoft/swlib": "~2.0.0",
     "swoft/swoole-ide-helper": "dev-master",
-    "phpunit/phpunit": "^7.5"
+    "phpunit/phpunit": "^7.5 || ^8.0"
   },
   "autoload": {
     "psr-4": {

diff --git a/composer.json b/composer.json
@@ -40,7 +40,7 @@
   "require-dev": {
     "swoft/swlib": "~2.0.0",
     "swoft/swoole-ide-helper": "dev-master",
-    "phpunit/phpunit": "^7.5"
+    "phpunit/phpunit": "^7.5 || ^8.0"
   },
   "autoload": {
     "psr-4": {