Skip to content

Commit

Permalink
Merge pull request #986 from lcobucci/feature/allow-newer-lcobucci-cl…
Browse files Browse the repository at this point in the history
…ock-installation

Allow `lcobucci/clock:^3.0` to be installed with `lcobucci/jwt:^4`
  • Loading branch information
lcobucci committed Jan 2, 2023
2 parents 68caae9 + d15f460 commit 4d7de2f
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 51 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/composer-json-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
coverage: "none"
php-version: "${{ matrix.php-version }}"
ini-values: memory_limit=-1
tools: composer:v2, composer-normalize, composer-require-checker, composer-unused
tools: composer:v2, composer-normalize:2.28.3, composer-require-checker, composer-unused

- name: Get composer cache directory
id: composer-cache
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"ext-mbstring": "*",
"ext-openssl": "*",
"ext-sodium": "*",
"lcobucci/clock": "^2.0"
"lcobucci/clock": "^2.0 || ^3.0"
},
"require-dev": {
"infection/infection": "^0.21",
Expand Down
98 changes: 49 additions & 49 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 4d7de2f

Please sign in to comment.