Merge pull request #122 from mineadmin/2.0

v2.0.4-beta

.gitignore

@@ -1,10 +1,18 @@
-/.idea
-/.vscode
-/vendor
-/package
-/runtime
-/libdev
-*.log
+.buildpath
+.settings/
+.project
+*.patch
+.idea/
+.git/
+runtime/
+vendor/
+.phpintel/
 .env
-.gitee
-public/uploadfile/*
+.DS_Store
+.phpunit*
+*.cache
+.vscode/
+tests/cover
+tests/coding_standard.xml
+public
+*.lock

.phpunit.cache/test-results

@@ -1 +1 @@
-{"version":"pest_2.33.1","defects":[],"times":{"P\\Tests\\HttpCases\\ExampleTest::__pest_evaluable_index_testing":0.015}}
+{"version":"pest_2.33.1","defects":[],"times":{"P\\Tests\\HttpCases\\ExampleTest::__pest_evaluable_index_testing":0.018}}

composer.json

@@ -19,16 +19,14 @@
     "xmo/mine-translatable": "2.0.x-dev"
   },
   "require-dev": {
-    "friendsofhyperf/pest-plugin-hyperf": "^3.1",
     "friendsofphp/php-cs-fixer": "^3.0",
     "hyperf/devtool": "3.1.*",
     "hyperf/ide-helper": "3.1.*",
     "hyperf/testing": "3.1.*",
     "hyperf/watcher": "3.1.*",
     "mockery/mockery": "^1.0",
     "pestphp/pest": "^2.33",
-    "pestphp/pest-plugin-drift": "^2.5",
-    "phpstan/phpstan": "^1.0",
+    "phpstan/phpstan": "^1.10",
     "swoole/ide-helper": "^5.0"
   },
   "suggest": {
@@ -59,7 +57,6 @@
     "optimize-autoloader": true,
     "sort-packages": true,
     "allow-plugins": {
-      "composer/package-versions-deprecated": true,
       "pestphp/pest-plugin": true
     }
   },
@@ -71,7 +68,7 @@
     "post-autoload-dump": [
       "rm -rf runtime/container"
     ],
-    "test": "pest --coroutine --prepend tests/bootstrap.php -c phpunit.xml --colors=always",
+    "test": "pest ",
     "cs-fix": "php-cs-fixer fix $1",
     "analyse": "phpstan analyse --memory-limit 500M -l 0 -c phpstan.neon ./app ./config ./api ./common",
     "start": [