Skip to content

Commit

Permalink
Merge branch 'master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
ramsey committed Oct 27, 2020
2 parents 5e15deb + 1dee734 commit 4e5833d
Show file tree
Hide file tree
Showing 32 changed files with 762 additions and 652 deletions.
7 changes: 3 additions & 4 deletions .gitattributes
@@ -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
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE.md
@@ -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.
1 change: 1 addition & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
@@ -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.
8 changes: 8 additions & 0 deletions .github/dependabot.yml
@@ -0,0 +1,8 @@
version: 2
updates:
- package-ecosystem: "composer"
directory: "/"
schedule:
interval: "weekly"
day: "thursday"
versioning-strategy: "increase-if-necessary"
88 changes: 88 additions & 0 deletions .github/workflows/continuous-integration.yml
@@ -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
8 changes: 0 additions & 8 deletions .scrutinizer.yml

This file was deleted.

34 changes: 0 additions & 34 deletions .travis.yml

This file was deleted.

12 changes: 12 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,17 @@
# OAuth 2.0 Client Changelog

## 2.6.0

_Released: TBD_

* Support PHP 8

## 2.5.0

_Released: 2020-07-18_

* Allow Guzzle 7.x to be used [#847](https://github.com/thephpleague/oauth2-client/pull/847)

## 2.4.1

_Released: 2018-11-22_
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2013-2018 Alex Bilbie <hello@alexbilbie.com>
Copyright (c) 2013-2020 Alex Bilbie <hello@alexbilbie.com>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
5 changes: 3 additions & 2 deletions README.md
Expand Up @@ -6,8 +6,7 @@ This package makes it simple to integrate your application with [OAuth 2.0](http
[![Source Code](http://img.shields.io/badge/source-thephpleague/oauth2--client-blue.svg?style=flat-square)](https://github.com/thephpleague/oauth2-client)
[![Latest Version](https://img.shields.io/github/release/thephpleague/oauth2-client.svg?style=flat-square)](https://github.com/thephpleague/oauth2-client/releases)
[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](https://github.com/thephpleague/oauth2-client/blob/master/LICENSE)
[![Build Status](https://img.shields.io/travis/thephpleague/oauth2-client/master.svg?style=flat-square)](https://travis-ci.org/thephpleague/oauth2-client)
[![Scrutinizer](https://img.shields.io/scrutinizer/g/thephpleague/oauth2-client/master.svg?style=flat-square)](https://scrutinizer-ci.com/g/thephpleague/oauth2-client/)
[![Build Status](https://img.shields.io/github/workflow/status/thephpleague/oauth2-client/CI?label=CI&logo=github&style=flat-square)](https://github.com/thephpleague/oauth2-client/actions?query=workflow%3ACI)
[![Coverage Status](https://img.shields.io/coveralls/thephpleague/oauth2-client/master.svg?style=flat-square)](https://coveralls.io/r/thephpleague/oauth2-client?branch=master)
[![Total Downloads](https://img.shields.io/packagist/dt/league/oauth2-client.svg?style=flat-square)](https://packagist.org/packages/league/oauth2-client)

Expand All @@ -30,6 +29,8 @@ The following versions of PHP are supported.
* PHP 7.1
* PHP 7.2
* PHP 7.3
* PHP 7.4
* PHP 8.0

## Providers

Expand Down
15 changes: 7 additions & 8 deletions composer.json
Expand Up @@ -6,16 +6,15 @@
"sort-packages": true
},
"require": {
"php": "^5.6|^7.0",
"guzzlehttp/guzzle": "^6.0",
"paragonie/random_compat": "^1|^2|^9.99"
"php": "^5.6 || ^7.0 || ^8.0",
"guzzlehttp/guzzle": "^6.0 || ^7.0",
"paragonie/random_compat": "^1 || ^2 || ^9.99"
},
"require-dev": {
"eloquent/liberator": "^2.0",
"eloquent/phony-phpunit": "^1.0|^3.0",
"jakub-onderka/php-parallel-lint": "^0.9.2",
"phpunit/phpunit": "^5.7|^6.0",
"squizlabs/php_codesniffer": "^2.3|^3.0"
"mockery/mockery": "^1.3",
"php-parallel-lint/php-parallel-lint": "^1.2",
"phpunit/phpunit": "^5.7 || ^6.0 || ^9.3",
"squizlabs/php_codesniffer": "^2.3 || ^3.0"
},
"keywords": [
"oauth",
Expand Down
2 changes: 1 addition & 1 deletion docs/.ruby-version
@@ -1 +1 @@
2.4.3
2.6.2

0 comments on commit 4e5833d

Please sign in to comment.