Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into feature/add_provider_mixer
- Loading branch information
Showing
33 changed files
with
846 additions
and
667 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,6 @@ | ||
| /test export-ignore | ||
| /.gitattributes export-ignore | ||
| /.github/ export-ignore | ||
| /.gitignore export-ignore | ||
| /.scrutinizer.yml export-ignore | ||
| /.travis.yml export-ignore | ||
| /docs/ export-ignore | ||
| /phpunit.xml export-ignore | ||
| /docs export-ignore | ||
| /test/ export-ignore |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +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. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +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. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| version: 2 | ||
| updates: | ||
| - package-ecosystem: "composer" | ||
| directory: "/" | ||
| schedule: | ||
| interval: "weekly" | ||
| day: "thursday" | ||
| versioning-strategy: "increase-if-necessary" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| # https://help.github.com/en/categories/automating-your-workflow-with-github-actions | ||
|
|
||
| name: "CI" | ||
|
|
||
| on: | ||
| pull_request: | ||
| push: | ||
| branches: | ||
| - "master" | ||
|
|
||
| env: | ||
| COMPOSER_ROOT_VERSION: "1.99.99" | ||
|
|
||
| jobs: | ||
|
|
||
| lint: | ||
| name: "Lint" | ||
| runs-on: "ubuntu-latest" | ||
| steps: | ||
| - uses: "actions/checkout@v2" | ||
| - uses: "shivammathur/setup-php@v2" | ||
| with: | ||
| php-version: "7.4" | ||
| coverage: "none" | ||
| ini-values: "memory_limit=-1" | ||
| tools: "composer:v2" | ||
| - uses: "ramsey/composer-install@v1" | ||
| - name: "Lint the PHP source code" | ||
| run: "./vendor/bin/parallel-lint src test" | ||
|
|
||
| coding-standards: | ||
| name: "Coding Standards" | ||
| runs-on: "ubuntu-latest" | ||
| steps: | ||
| - uses: "actions/checkout@v2" | ||
| - uses: "shivammathur/setup-php@v2" | ||
| with: | ||
| php-version: "7.4" | ||
| coverage: "none" | ||
| ini-values: "memory_limit=-1" | ||
| tools: "composer:v2" | ||
| - uses: "ramsey/composer-install@v1" | ||
| - name: "Check coding standards" | ||
| run: "./vendor/bin/phpcs src --standard=psr2 -sp --colors" | ||
|
|
||
| unit-tests: | ||
| name: "Unit Tests" | ||
| runs-on: "ubuntu-latest" | ||
| continue-on-error: ${{ matrix.experimental }} | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| php-version: | ||
| - "5.6" | ||
| - "7.0" | ||
| - "7.1" | ||
| - "7.2" | ||
| - "7.3" | ||
| - "7.4" | ||
| - "8.0" | ||
| 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" | ||
| tools: "composer:v2" | ||
| - name: "Prepare for tests" | ||
| run: "mkdir -p build/logs" | ||
| - uses: "ramsey/composer-install@v1" | ||
| with: | ||
| composer-options: "${{ matrix.composer-options }}" | ||
| - name: "Run unit tests" | ||
| run: "./vendor/bin/phpunit --colors=always --coverage-clover build/logs/clover.xml" | ||
| - name: "Publish coverage report to Coveralls" | ||
| continue-on-error: true | ||
| env: | ||
| COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| run: | | ||
| composer global --ansi require php-coveralls/php-coveralls | ||
| php-coveralls --ansi -vv --coverage_clover=build/logs/clover.xml |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| # Contributor Covenant Code of Conduct | ||
|
|
||
| ## Our Pledge | ||
|
|
||
| In the interest of fostering an open and welcoming environment, we as | ||
| contributors and maintainers pledge to making participation in our project and | ||
| our community a harassment-free experience for everyone, regardless of age, body | ||
| size, disability, ethnicity, sex characteristics, gender identity and expression, | ||
| level of experience, education, socio-economic status, nationality, personal | ||
| appearance, race, religion, or sexual identity and orientation. | ||
|
|
||
| ## Our Standards | ||
|
|
||
| Examples of behavior that contributes to creating a positive environment | ||
| include: | ||
|
|
||
| * Using welcoming and inclusive language | ||
| * Being respectful of differing viewpoints and experiences | ||
| * Gracefully accepting constructive criticism | ||
| * Focusing on what is best for the community | ||
| * Showing empathy towards other community members | ||
|
|
||
| Examples of unacceptable behavior by participants include: | ||
|
|
||
| * The use of sexualized language or imagery and unwelcome sexual attention or | ||
| advances | ||
| * Trolling, insulting/derogatory comments, and personal or political attacks | ||
| * Public or private harassment | ||
| * Publishing others' private information, such as a physical or electronic | ||
| address, without explicit permission | ||
| * Other conduct which could reasonably be considered inappropriate in a | ||
| professional setting | ||
|
|
||
| ## Our Responsibilities | ||
|
|
||
| Project maintainers are responsible for clarifying the standards of acceptable | ||
| behavior and are expected to take appropriate and fair corrective action in | ||
| response to any instances of unacceptable behavior. | ||
|
|
||
| Project maintainers have the right and responsibility to remove, edit, or | ||
| reject comments, commits, code, wiki edits, issues, and other contributions | ||
| that are not aligned to this Code of Conduct, or to ban temporarily or | ||
| permanently any contributor for other behaviors that they deem inappropriate, | ||
| threatening, offensive, or harmful. | ||
|
|
||
| ## Scope | ||
|
|
||
| This Code of Conduct applies both within project spaces and in public spaces | ||
| when an individual is representing the project or its community. Examples of | ||
| representing a project or community include using an official project e-mail | ||
| address, posting via an official social media account, or acting as an appointed | ||
| representative at an online or offline event. Representation of a project may be | ||
| further defined and clarified by project maintainers. | ||
|
|
||
| ## Enforcement | ||
|
|
||
| Instances of abusive, harassing, or otherwise unacceptable behavior may be | ||
| reported by contacting the project team at https://twitter.com/thephpleague. All | ||
| complaints will be reviewed and investigated and will result in a response that | ||
| is deemed necessary and appropriate to the circumstances. The project team is | ||
| obligated to maintain confidentiality with regard to the reporter of an incident. | ||
| Further details of specific enforcement policies may be posted separately. | ||
|
|
||
| Project maintainers who do not follow or enforce the Code of Conduct in good | ||
| faith may face temporary or permanent repercussions as determined by other | ||
| members of the project's leadership. | ||
|
|
||
| ## Attribution | ||
|
|
||
| This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, | ||
| available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html | ||
|
|
||
| [homepage]: https://www.contributor-covenant.org | ||
|
|
||
| For answers to common questions about this code of conduct, see | ||
| https://www.contributor-covenant.org/faq |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 2.4.3 | ||
| 2.6.2 |
Oops, something went wrong.