Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
ramsey committed Nov 30, 2021
2 parents 5843122 + 77def43 commit b7841a4
Show file tree
Hide file tree
Showing 18 changed files with 373 additions and 571 deletions.
8 changes: 5 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ updates:
- package-ecosystem: "composer"
directory: "/"
schedule:
interval: "weekly"
day: "thursday"
versioning-strategy: "increase-if-necessary"
interval: "daily"
- package-ecosystem: "bundler"
directory: "/docs"
schedule:
interval: "daily"
18 changes: 12 additions & 6 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,21 @@ jobs:
lint:
name: "Lint"
runs-on: "ubuntu-latest"

strategy:
fail-fast: false
matrix:
php-version: [ '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ]

continue-on-error: ${{ matrix.php-version == '8.1' }}

steps:
- uses: "actions/checkout@v2"
- uses: "shivammathur/setup-php@v2"
with:
php-version: "7.4"
coverage: "none"
ini-values: "memory_limit=-1"
ini-values: "memory_limit=-1, zend.assertions=1, error_reporting=-1, display_errors=On"
tools: "composer:v2"
- uses: "ramsey/composer-install@v1"
- name: "Lint the PHP source code"
Expand Down Expand Up @@ -58,19 +66,17 @@ jobs:
- "7.3"
- "7.4"
- "8.0"
- "8.1"
experimental:
- false
include:
- php-version: "8.1"
experimental: true
composer-options: "--ignore-platform-reqs"

steps:
- uses: "actions/checkout@v2"
- uses: "shivammathur/setup-php@v2"
with:
php-version: "${{ matrix.php-version }}"
coverage: "pcov"
ini-values: "memory_limit=-1"
ini-values: "memory_limit=-1, zend.assertions=1, error_reporting=-1, display_errors=On"
tools: "composer:v2"
- name: "Prepare for tests"
run: "mkdir -p build/logs"
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ testing/
nbproject/private/
test/log
build
/.phpunit.result.cache
4 changes: 2 additions & 2 deletions CREDITS.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@

Also see <https://github.com/thephpleague/oauth2-client/contributors>.

### Current Maintainer
### Current Maintainers

- [Ben Ramsey](https://github.com/ramsey)
- [Woody Gilk](https://github.com/shadowhand)

### Contributors

Expand All @@ -17,4 +18,3 @@ Also see <https://github.com/thephpleague/oauth2-client/contributors>.
- [Phil Sturgeon](https://github.com/philsturgeon)
- [Rudi Theunissen](https://github.com/rtheunissen)
- [Tom Anderson](https://github.com/TomHAnderson)
- [Woody Gilk](https://github.com/shadowhand)
96 changes: 0 additions & 96 deletions README.PROVIDER-GUIDE.md

This file was deleted.

0 comments on commit b7841a4

Please sign in to comment.