Skip to content

Commit

Permalink
Merge pull request #119 from mineadmin/2.0.x-dev
Browse files Browse the repository at this point in the history
fixed pest
  • Loading branch information
zds-s authored Feb 2, 2024
2 parents 0a91c23 + c14e603 commit 6662918
Show file tree
Hide file tree
Showing 10 changed files with 55 additions and 14,318 deletions.
26 changes: 17 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .phpunit.cache/test-results
Original file line number Diff line number Diff line change
@@ -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}}
7 changes: 2 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -59,7 +57,6 @@
"optimize-autoloader": true,
"sort-packages": true,
"allow-plugins": {
"composer/package-versions-deprecated": true,
"pestphp/pest-plugin": true
}
},
Expand All @@ -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": [
Expand Down
Loading

0 comments on commit 6662918

Please sign in to comment.