Skip to content

Commit 6f08509

Browse files
ramseyramsey
authored
Merge branch 'master' into master
2 parents c86cf24 + 937c0ac commit 6f08509

33 files changed

+841
-652
lines changed

‎.gitattributes

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
/test export-ignore
21
/.gitattributes export-ignore
2+
/.github/ export-ignore
33
/.gitignore export-ignore
4-
/.scrutinizer.yml export-ignore
5-
/.travis.yml export-ignore
4+
/docs/ export-ignore
65
/phpunit.xml export-ignore
7-
/docs export-ignore
6+
/test/ export-ignore

‎.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
The `docs/` directory is what powers the website [oauth2-client.thephpleague.com](https://oauth2-client.thephpleague.com/). Modifying links to work in the Github file browser will break the website. Please do not open a new Issue to report "the broken documentation links"; they will be promptly closed.

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
The `docs/` directory is what powers the website [oauth2-client.thephpleague.com](https://oauth2-client.thephpleague.com/). Modifying links to work in the Github file browser will break the website. Please do not open a new Pull Request to "fix the broken documentation links"; they will be promptly closed.

‎.github/dependabot.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "composer"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"
7+
day: "thursday"
8+
versioning-strategy: "increase-if-necessary"

‎.github/workflows/continuous-integration.yml

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
# https://help.github.com/en/categories/automating-your-workflow-with-github-actions
2+
3+
name: "CI"
4+
5+
on:
6+
pull_request:
7+
push:
8+
branches:
9+
- "master"
10+
11+
env:
12+
COMPOSER_ROOT_VERSION: "1.99.99"
13+
14+
jobs:
15+
16+
lint:
17+
name: "Lint"
18+
runs-on: "ubuntu-latest"
19+
steps:
20+
- uses: "actions/checkout@v2"
21+
- uses: "shivammathur/setup-php@v2"
22+
with:
23+
php-version: "7.4"
24+
coverage: "none"
25+
ini-values: "memory_limit=-1"
26+
tools: "composer:v2"
27+
- uses: "ramsey/composer-install@v1"
28+
- name: "Lint the PHP source code"
29+
run: "./vendor/bin/parallel-lint src test"
30+
31+
coding-standards:
32+
name: "Coding Standards"
33+
runs-on: "ubuntu-latest"
34+
steps:
35+
- uses: "actions/checkout@v2"
36+
- uses: "shivammathur/setup-php@v2"
37+
with:
38+
php-version: "7.4"
39+
coverage: "none"
40+
ini-values: "memory_limit=-1"
41+
tools: "composer:v2"
42+
- uses: "ramsey/composer-install@v1"
43+
- name: "Check coding standards"
44+
run: "./vendor/bin/phpcs src --standard=psr2 -sp --colors"
45+
46+
unit-tests:
47+
name: "Unit Tests"
48+
runs-on: "ubuntu-latest"
49+
continue-on-error: ${{ matrix.experimental }}
50+
strategy:
51+
fail-fast: false
52+
matrix:
53+
php-version:
54+
- "5.6"
55+
- "7.0"
56+
- "7.1"
57+
- "7.2"
58+
- "7.3"
59+
- "7.4"
60+
- "8.0"
61+
experimental:
62+
- false
63+
include:
64+
- php-version: "8.1"
65+
experimental: true
66+
composer-options: "--ignore-platform-reqs"
67+
steps:
68+
- uses: "actions/checkout@v2"
69+
- uses: "shivammathur/setup-php@v2"
70+
with:
71+
php-version: "${{ matrix.php-version }}"
72+
coverage: "pcov"
73+
ini-values: "memory_limit=-1"
74+
tools: "composer:v2"
75+
- name: "Prepare for tests"
76+
run: "mkdir -p build/logs"
77+
- uses: "ramsey/composer-install@v1"
78+
with:
79+
composer-options: "${{ matrix.composer-options }}"
80+
- name: "Run unit tests"
81+
run: "./vendor/bin/phpunit --colors=always --coverage-clover build/logs/clover.xml"
82+
- name: "Publish coverage report to Coveralls"
83+
continue-on-error: true
84+
env:
85+
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
86+
run: |
87+
composer global --ansi require php-coveralls/php-coveralls
88+
php-coveralls --ansi -vv --coverage_clover=build/logs/clover.xml

‎.scrutinizer.yml

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎.travis.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# OAuth 2.0 Client Changelog
22

3+
## 2.6.0
4+
5+
_Released: TBD_
6+
7+
* Support PHP 8
8+
9+
## 2.5.0
10+
11+
_Released: 2020-07-18_
12+
13+
* Allow Guzzle 7.x to be used [#847](https://github.com/thephpleague/oauth2-client/pull/847)
14+
315
## 2.4.1
416

517
_Released: 2018-11-22_

‎CODE_OF_CONDUCT.md

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as
6+
contributors and maintainers pledge to making participation in our project and
7+
our community a harassment-free experience for everyone, regardless of age, body
8+
size, disability, ethnicity, sex characteristics, gender identity and expression,
9+
level of experience, education, socio-economic status, nationality, personal
10+
appearance, race, religion, or sexual identity and orientation.
11+
12+
## Our Standards
13+
14+
Examples of behavior that contributes to creating a positive environment
15+
include:
16+
17+
* Using welcoming and inclusive language
18+
* Being respectful of differing viewpoints and experiences
19+
* Gracefully accepting constructive criticism
20+
* Focusing on what is best for the community
21+
* Showing empathy towards other community members
22+
23+
Examples of unacceptable behavior by participants include:
24+
25+
* The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances
27+
* Trolling, insulting/derogatory comments, and personal or political attacks
28+
* Public or private harassment
29+
* Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission
31+
* Other conduct which could reasonably be considered inappropriate in a
32+
professional setting
33+
34+
## Our Responsibilities
35+
36+
Project maintainers are responsible for clarifying the standards of acceptable
37+
behavior and are expected to take appropriate and fair corrective action in
38+
response to any instances of unacceptable behavior.
39+
40+
Project maintainers have the right and responsibility to remove, edit, or
41+
reject comments, commits, code, wiki edits, issues, and other contributions
42+
that are not aligned to this Code of Conduct, or to ban temporarily or
43+
permanently any contributor for other behaviors that they deem inappropriate,
44+
threatening, offensive, or harmful.
45+
46+
## Scope
47+
48+
This Code of Conduct applies both within project spaces and in public spaces
49+
when an individual is representing the project or its community. Examples of
50+
representing a project or community include using an official project e-mail
51+
address, posting via an official social media account, or acting as an appointed
52+
representative at an online or offline event. Representation of a project may be
53+
further defined and clarified by project maintainers.
54+
55+
## Enforcement
56+
57+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58+
reported by contacting the project team at https://twitter.com/thephpleague. All
59+
complaints will be reviewed and investigated and will result in a response that
60+
is deemed necessary and appropriate to the circumstances. The project team is
61+
obligated to maintain confidentiality with regard to the reporter of an incident.
62+
Further details of specific enforcement policies may be posted separately.
63+
64+
Project maintainers who do not follow or enforce the Code of Conduct in good
65+
faith may face temporary or permanent repercussions as determined by other
66+
members of the project's leadership.
67+
68+
## Attribution
69+
70+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71+
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
72+
73+
[homepage]: https://www.contributor-covenant.org
74+
75+
For answers to common questions about this code of conduct, see
76+
https://www.contributor-covenant.org/faq

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2013-2018 Alex Bilbie <[email protected]>
3+
Copyright (c) 2013-2020 Alex Bilbie <[email protected]>
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)