Skip to content

Commit

Permalink
Merge pull request #21253 from Yoast/fix/tests-mockery-1.6.10
Browse files Browse the repository at this point in the history
Prevent Mockery from being updated to the buggy 1.6.10 version
  • Loading branch information
enricobattocchi authored Mar 21, 2024
2 parents 3d49a01 + 7c813d2 commit 37cf246
Show file tree
Hide file tree
Showing 3 changed files with 139 additions and 138 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jobs:
# Force a `composer update` run.
dependency-versions: "highest"
# But make it selective.
composer-options: "yoast/wp-test-utils --with-dependencies --no-scripts"
composer-options: "yoast/wp-test-utils mockery/mockery --with-dependencies --no-scripts"
# Bust the cache at least once a week - output format: YYYY-MM-DD.
custom-cache-suffix: $(/bin/date -u --date='last Mon' "+%F")

Expand Down Expand Up @@ -230,7 +230,7 @@ jobs:
# Force a `composer update` run.
dependency-versions: "highest"
# But make it selective.
composer-options: "yoast/wp-test-utils --with-dependencies --no-scripts"
composer-options: "yoast/wp-test-utils mockery/mockery --with-dependencies --no-scripts"
# Bust the cache at least once a week - output format: YYYY-MM-DD.
custom-cache-suffix: $(/bin/date -u --date='last Mon' "+%F")

Expand Down
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"guzzlehttp/guzzle": "7.8.1",
"humbug/php-scoper": "^0.13.4",
"league/oauth2-client": "2.7.0",
"mockery/mockery": "~1.3.5 || >= 1.5.1,<1.6.10",
"psr/container": "1.0.0",
"psr/log": "^1.0",
"symfony/config": "^3.4",
Expand Down
Loading

0 comments on commit 37cf246

Please sign in to comment.