Skip to content
This repository has been archived by the owner on Feb 6, 2023. It is now read-only.

Commit

Permalink
Merge pull request #85 from okta/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
bretterer authored Sep 9, 2021
2 parents 0f14ce1 + 369b454 commit caa5475
Show file tree
Hide file tree
Showing 4 changed files with 1,200 additions and 342 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
/vendor/
.vscode
.idea
.phpunit.result.cache
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ after_success:

matrix:
include:
- php: 7.2
- php: 7.3
- php: 7.4
env:
- COVERAGE=true
- php: 8.0
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
}
},
"require": {
"php": "^7.2",
"php": "^7.3 || ~8.0.0",
"nesbot/carbon": "^2.0",
"psr/http-message": "^1.0",
"php-http/client-common": "^2.3",
Expand All @@ -26,11 +26,11 @@
"bretterer/iso_duration_converter": "^0.1.0"
},
"require-dev": {
"phpunit/phpunit": "^7.0 ",
"phpunit/phpunit": "^9.0 ",
"symfony/var-dumper": "^5.1",
"squizlabs/php_codesniffer": "^3.5",
"php-http/mock-client": "^1.4",
"guzzlehttp/psr7": "dev-master#ad1de77a65b751d598ced37747bf4c17d457fbc9",
"guzzlehttp/psr7": "~2.0.0",
"firebase/php-jwt": "^5.2"
}
}
Loading

0 comments on commit caa5475

Please sign in to comment.