Skip to content

Commit

Permalink
Merge branch '5.x' into 6.x
Browse files Browse the repository at this point in the history
Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
  • Loading branch information
crynobone committed Feb 16, 2021
2 parents 9bece61 + 693ce1f commit 8b78732
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
- "7.4"
- "8.0"
phpunit:
- "^9.3"
- "^9.3.3"
dependencies:
- "locked"
- "lowest"
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@
"laravel/laravel": "8.x-dev",
"mockery/mockery": "^1.4.2",
"orchestra/canvas": "^6.1",
"phpunit/phpunit": "^8.4 || ^9.3"
"phpunit/phpunit": "^8.4 || ^9.3.3"
},
"suggest": {
"laravel/framework": "Required for testing (^8.25).",
"mockery/mockery": "Allow using Mockery for testing (^1.4.2).",
"orchestra/testbench-browser-kit": "Allow using legacy Laravel BrowserKit for testing (^6.0).",
"orchestra/testbench-dusk": "Allow using Laravel Dusk for testing (^6.0).",
"phpunit/phpunit": "Allow using PHPUnit for testing (^8.4 || ^9.0)."
"phpunit/phpunit": "Allow using PHPUnit for testing (^8.4|^9.3.3)."
},
"extra": {
"branch-alias": {
Expand Down

0 comments on commit 8b78732

Please sign in to comment.