Skip to content

Commit 10ca82e

Browse files
ramseyramsey
authored
Merge branch 'master' into patch-1
2 parents 5187d59 + 4604541 commit 10ca82e

File tree

8 files changed

+112
-77
lines changed

8 files changed

+112
-77
lines changed

‎.github/workflows/continuous-integration.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,21 @@ jobs:
1616
lint:
1717
name: "Lint"
1818
runs-on: "ubuntu-latest"
19+
20+
strategy:
21+
fail-fast: false
22+
matrix:
23+
php-version: [ '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ]
24+
25+
continue-on-error: ${{ matrix.php-version == '8.1' }}
26+
1927
steps:
2028
- uses: "actions/checkout@v2"
2129
- uses: "shivammathur/setup-php@v2"
2230
with:
2331
php-version: "7.4"
2432
coverage: "none"
25-
ini-values: "memory_limit=-1"
33+
ini-values: "memory_limit=-1, zend.assertions=1, error_reporting=-1, display_errors=On"
2634
tools: "composer:v2"
2735
- uses: "ramsey/composer-install@v1"
2836
- name: "Lint the PHP source code"
@@ -58,19 +66,17 @@ jobs:
5866
- "7.3"
5967
- "7.4"
6068
- "8.0"
69+
- "8.1"
6170
experimental:
6271
- false
63-
include:
64-
- php-version: "8.1"
65-
experimental: true
66-
composer-options: "--ignore-platform-reqs"
72+
6773
steps:
6874
- uses: "actions/checkout@v2"
6975
- uses: "shivammathur/setup-php@v2"
7076
with:
7177
php-version: "${{ matrix.php-version }}"
7278
coverage: "pcov"
73-
ini-values: "memory_limit=-1"
79+
ini-values: "memory_limit=-1, zend.assertions=1, error_reporting=-1, display_errors=On"
7480
tools: "composer:v2"
7581
- name: "Prepare for tests"
7682
run: "mkdir -p build/logs"

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ testing/
66
nbproject/private/
77
test/log
88
build
9+
/.phpunit.result.cache

‎composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
"paragonie/random_compat": "^1 || ^2 || ^9.99"
1212
},
1313
"require-dev": {
14-
"mockery/mockery": "^1.3",
15-
"php-parallel-lint/php-parallel-lint": "^1.2",
16-
"phpunit/phpunit": "^5.7 || ^6.0 || ^9.3",
14+
"mockery/mockery": "^1.3.5",
15+
"php-parallel-lint/php-parallel-lint": "^1.3.1",
16+
"phpunit/phpunit": "^5.7 || ^6.0 || ^9.5",
1717
"squizlabs/php_codesniffer": "^2.3 || ^3.0"
1818
},
1919
"keywords": [

‎docs/Gemfile.lock

Lines changed: 80 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (6.0.3.6)
4+
activesupport (6.0.4.1)
55
concurrent-ruby (~> 1.0, >= 1.0.2)
66
i18n (>= 0.7, < 2)
77
minitest (~> 5.1)
88
tzinfo (~> 1.1)
99
zeitwerk (~> 2.2, >= 2.2.2)
10-
addressable (2.7.0)
10+
addressable (2.8.0)
1111
public_suffix (>= 2.0.2, < 5.0)
1212
coffee-script (2.4.1)
1313
coffee-script-source
@@ -16,26 +16,40 @@ GEM
1616
colorator (1.1.0)
1717
commonmarker (0.17.13)
1818
ruby-enum (~> 0.5)
19-
concurrent-ruby (1.1.8)
20-
dnsruby (1.61.5)
19+
concurrent-ruby (1.1.9)
20+
dnsruby (1.61.7)
2121
simpleidn (~> 0.1)
22-
em-websocket (0.5.2)
22+
em-websocket (0.5.3)
2323
eventmachine (>= 0.12.9)
24-
http_parser.rb (~> 0.6.0)
25-
ethon (0.13.0)
24+
http_parser.rb (~> 0)
25+
ethon (0.15.0)
2626
ffi (>= 1.15.0)
2727
eventmachine (1.2.7)
28-
execjs (2.7.0)
29-
faraday (1.3.0)
28+
execjs (2.8.1)
29+
faraday (1.8.0)
30+
faraday-em_http (~> 1.0)
31+
faraday-em_synchrony (~> 1.0)
32+
faraday-excon (~> 1.1)
33+
faraday-httpclient (~> 1.0.1)
3034
faraday-net_http (~> 1.0)
35+
faraday-net_http_persistent (~> 1.1)
36+
faraday-patron (~> 1.0)
37+
faraday-rack (~> 1.0)
3138
multipart-post (>= 1.2, < 3)
32-
ruby2_keywords
39+
ruby2_keywords (>= 0.0.4)
40+
faraday-em_http (1.0.0)
41+
faraday-em_synchrony (1.0.0)
42+
faraday-excon (1.1.0)
43+
faraday-httpclient (1.0.1)
3344
faraday-net_http (1.0.1)
34-
ffi (1.15.0)
45+
faraday-net_http_persistent (1.2.0)
46+
faraday-patron (1.0.0)
47+
faraday-rack (1.0.0)
48+
ffi (1.15.4)
3549
forwardable-extended (2.6.0)
3650
gemoji (3.0.1)
37-
github-pages (214)
38-
github-pages-health-check (= 1.17.0)
51+
github-pages (222)
52+
github-pages-health-check (= 1.17.9)
3953
jekyll (= 3.9.0)
4054
jekyll-avatar (= 0.7.0)
4155
jekyll-coffeescript (= 1.1.1)
@@ -55,39 +69,39 @@ GEM
5569
jekyll-seo-tag (= 2.7.1)
5670
jekyll-sitemap (= 1.4.0)
5771
jekyll-swiss (= 1.0.0)
58-
jekyll-theme-architect (= 0.1.1)
59-
jekyll-theme-cayman (= 0.1.1)
60-
jekyll-theme-dinky (= 0.1.1)
61-
jekyll-theme-hacker (= 0.1.2)
62-
jekyll-theme-leap-day (= 0.1.1)
63-
jekyll-theme-merlot (= 0.1.1)
64-
jekyll-theme-midnight (= 0.1.1)
65-
jekyll-theme-minimal (= 0.1.1)
66-
jekyll-theme-modernist (= 0.1.1)
67-
jekyll-theme-primer (= 0.5.4)
68-
jekyll-theme-slate (= 0.1.1)
69-
jekyll-theme-tactile (= 0.1.1)
70-
jekyll-theme-time-machine (= 0.1.1)
72+
jekyll-theme-architect (= 0.2.0)
73+
jekyll-theme-cayman (= 0.2.0)
74+
jekyll-theme-dinky (= 0.2.0)
75+
jekyll-theme-hacker (= 0.2.0)
76+
jekyll-theme-leap-day (= 0.2.0)
77+
jekyll-theme-merlot (= 0.2.0)
78+
jekyll-theme-midnight (= 0.2.0)
79+
jekyll-theme-minimal (= 0.2.0)
80+
jekyll-theme-modernist (= 0.2.0)
81+
jekyll-theme-primer (= 0.6.0)
82+
jekyll-theme-slate (= 0.2.0)
83+
jekyll-theme-tactile (= 0.2.0)
84+
jekyll-theme-time-machine (= 0.2.0)
7185
jekyll-titles-from-headings (= 0.5.3)
7286
jemoji (= 0.12.0)
7387
kramdown (= 2.3.1)
7488
kramdown-parser-gfm (= 1.1.0)
7589
liquid (= 4.0.3)
7690
mercenary (~> 0.3)
7791
minima (= 2.5.1)
78-
nokogiri (>= 1.10.4, < 2.0)
92+
nokogiri (>= 1.12.5, < 2.0)
7993
rouge (= 3.26.0)
8094
terminal-table (~> 1.4)
81-
github-pages-health-check (1.17.0)
95+
github-pages-health-check (1.17.9)
8296
addressable (~> 2.3)
8397
dnsruby (~> 1.60)
8498
octokit (~> 4.0)
85-
public_suffix (>= 2.0.2, < 5.0)
99+
public_suffix (>= 3.0, < 5.0)
86100
typhoeus (~> 1.3)
87101
html-pipeline (2.14.0)
88102
activesupport (>= 2)
89103
nokogiri (>= 1.4)
90-
http_parser.rb (0.6.0)
104+
http_parser.rb (0.8.0)
91105
i18n (0.9.5)
92106
concurrent-ruby (~> 1.0)
93107
jekyll (3.9.0)
@@ -148,45 +162,45 @@ GEM
148162
jekyll-sitemap (1.4.0)
149163
jekyll (>= 3.7, < 5.0)
150164
jekyll-swiss (1.0.0)
151-
jekyll-theme-architect (0.1.1)
152-
jekyll (~> 3.5)
165+
jekyll-theme-architect (0.2.0)
166+
jekyll (> 3.5, < 5.0)
153167
jekyll-seo-tag (~> 2.0)
154-
jekyll-theme-cayman (0.1.1)
155-
jekyll (~> 3.5)
168+
jekyll-theme-cayman (0.2.0)
169+
jekyll (> 3.5, < 5.0)
156170
jekyll-seo-tag (~> 2.0)
157-
jekyll-theme-dinky (0.1.1)
158-
jekyll (~> 3.5)
171+
jekyll-theme-dinky (0.2.0)
172+
jekyll (> 3.5, < 5.0)
159173
jekyll-seo-tag (~> 2.0)
160-
jekyll-theme-hacker (0.1.2)
174+
jekyll-theme-hacker (0.2.0)
161175
jekyll (> 3.5, < 5.0)
162176
jekyll-seo-tag (~> 2.0)
163-
jekyll-theme-leap-day (0.1.1)
164-
jekyll (~> 3.5)
177+
jekyll-theme-leap-day (0.2.0)
178+
jekyll (> 3.5, < 5.0)
165179
jekyll-seo-tag (~> 2.0)
166-
jekyll-theme-merlot (0.1.1)
167-
jekyll (~> 3.5)
180+
jekyll-theme-merlot (0.2.0)
181+
jekyll (> 3.5, < 5.0)
168182
jekyll-seo-tag (~> 2.0)
169-
jekyll-theme-midnight (0.1.1)
170-
jekyll (~> 3.5)
183+
jekyll-theme-midnight (0.2.0)
184+
jekyll (> 3.5, < 5.0)
171185
jekyll-seo-tag (~> 2.0)
172-
jekyll-theme-minimal (0.1.1)
173-
jekyll (~> 3.5)
186+
jekyll-theme-minimal (0.2.0)
187+
jekyll (> 3.5, < 5.0)
174188
jekyll-seo-tag (~> 2.0)
175-
jekyll-theme-modernist (0.1.1)
176-
jekyll (~> 3.5)
189+
jekyll-theme-modernist (0.2.0)
190+
jekyll (> 3.5, < 5.0)
177191
jekyll-seo-tag (~> 2.0)
178-
jekyll-theme-primer (0.5.4)
192+
jekyll-theme-primer (0.6.0)
179193
jekyll (> 3.5, < 5.0)
180194
jekyll-github-metadata (~> 2.9)
181195
jekyll-seo-tag (~> 2.0)
182-
jekyll-theme-slate (0.1.1)
183-
jekyll (~> 3.5)
196+
jekyll-theme-slate (0.2.0)
197+
jekyll (> 3.5, < 5.0)
184198
jekyll-seo-tag (~> 2.0)
185-
jekyll-theme-tactile (0.1.1)
186-
jekyll (~> 3.5)
199+
jekyll-theme-tactile (0.2.0)
200+
jekyll (> 3.5, < 5.0)
187201
jekyll-seo-tag (~> 2.0)
188-
jekyll-theme-time-machine (0.1.1)
189-
jekyll (~> 3.5)
202+
jekyll-theme-time-machine (0.2.0)
203+
jekyll (> 3.5, < 5.0)
190204
jekyll-seo-tag (~> 2.0)
191205
jekyll-titles-from-headings (0.5.3)
192206
jekyll (>= 3.3, < 5.0)
@@ -202,37 +216,37 @@ GEM
202216
kramdown (~> 2.0)
203217
libv8 (3.16.14.19)
204218
liquid (4.0.3)
205-
listen (3.5.1)
219+
listen (3.7.0)
206220
rb-fsevent (~> 0.10, >= 0.10.3)
207221
rb-inotify (~> 0.9, >= 0.9.10)
208222
mercenary (0.3.6)
209-
mini_portile2 (2.5.1)
223+
mini_portile2 (2.6.1)
210224
minima (2.5.1)
211225
jekyll (>= 3.5, < 5.0)
212226
jekyll-feed (~> 0.9)
213227
jekyll-seo-tag (~> 2.1)
214228
minitest (5.14.4)
215229
multipart-post (2.1.1)
216-
nokogiri (1.11.4)
217-
mini_portile2 (~> 2.5.0)
230+
nokogiri (1.12.5)
231+
mini_portile2 (~> 2.6.1)
218232
racc (~> 1.4)
219-
octokit (4.20.0)
233+
octokit (4.21.0)
220234
faraday (>= 0.9)
221235
sawyer (~> 0.8.0, >= 0.5.3)
222236
pathutil (0.16.2)
223237
forwardable-extended (~> 2.6)
224238
public_suffix (4.0.6)
225-
racc (1.5.2)
226-
rb-fsevent (0.10.4)
239+
racc (1.6.0)
240+
rb-fsevent (0.11.0)
227241
rb-inotify (0.10.1)
228242
ffi (~> 1.0)
229243
ref (2.0.0)
230244
rexml (3.2.5)
231245
rouge (3.26.0)
232246
ruby-enum (0.9.0)
233247
i18n
234-
ruby2_keywords (0.0.4)
235-
rubyzip (2.3.0)
248+
ruby2_keywords (0.0.5)
249+
rubyzip (2.3.2)
236250
safe_yaml (1.0.5)
237251
sass (3.7.4)
238252
sass-listen (~> 4.0.0)
@@ -256,9 +270,9 @@ GEM
256270
thread_safe (~> 0.1)
257271
unf (0.1.4)
258272
unf_ext
259-
unf_ext (0.0.7.7)
260-
unicode-display_width (1.7.0)
261-
zeitwerk (2.4.2)
273+
unf_ext (0.0.8)
274+
unicode-display_width (1.8.0)
275+
zeitwerk (2.5.1)
262276

263277
PLATFORMS
264278
ruby

‎docs/providers/thirdparty.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ Gateway | Composer Package | Maintainer
3636
[concrete5](https://github.com/concrete5/oauth2-concrete5) | concrete5/oauth2-concrete5 | [Andrew Embler](https://github.com/aembler)
3737
[ChatWork](https://github.com/chatwork/oauth2-chatwork-php) | chatwork/oauth2-chatwork | [Yuta Adachi](https://github.com/ada-u)
3838
[Clever](https://github.com/schoolrunner/oauth2-clever) | schoolrunner/oauth2-clever | [Schoolrunner](https://github.com/schoolrunner)
39+
[CloudConvert](https://github.com/osavchenko/oauth2-cloudconvert) | osavchenko/oauth2-cloudconvert | [Oleksandr Savchenko](https://github.com/osavchenko)
3940
[Clover](https://github.com/wheniwork/oauth2-clover) | wheniwork/oauth2-clover | [When I Work](https://github.com/wheniwork)
4041
[Coinbase](https://github.com/openclerk/coinbase-oauth2) | openclerk/coinbase-oauth2 | [Openclerk](https://github.com/openclerk)
4142
[Deezer](https://github.com/julienbornstein/oauth2-deezer) | julienbornstein/oauth2-deezer | [Julien Bornstein](https://github.com/julienbornstein)
@@ -87,8 +88,10 @@ Gateway | Composer Package | Maintainer
8788
[Naver](https://packagist.org/packages/deminoth/oauth2-naver) | deminoth/oauth2-naver | [SangYeob Bono Yu](https://github.com/deminoth)
8889
[Netatmo](https://github.com/rugaard/oauth2-netatmo) | rugaard/oauth2-netatmo | [Morten Rugaard](https://github.com/rugaard)
8990
[Nest](https://github.com/stevenmaguire/oauth2-nest) | stevenmaguire/oauth2-nest | [Steven Maguire](https://github.com/stevenmaguire)
91+
[NIBE](https://github.com/olssonm/oauth2-nibe) | olssonm/oauth2-nibe | [Marcus Olsson](https://github.com/olssonm)
9092
[Odnoklassniki](https://packagist.org/packages/aego/oauth2-odnoklassniki) | aego/oauth2-odnoklassniki | [Alexey](https://github.com/rakeev)
9193
[Okta](https://packagist.org/packages/foxworth42/oauth2-okta) | foxworth42/oauth2-okta | [Ed Walker](https://github.com/foxworth42)
94+
[OpenStreetMap](https://packagist.org/packages/jbelien/oauth2-openstreetmap) | jbelien/oauth2-openstreetmap | [Jonathan Beliën](https://github.com/jbelien)
9295
[Optimizely](https://packagist.org/packages/widerfunnel/oauth2-optimizely) | widerfunnel/oauth2-optimizely | [WiderFunnel Labs](https://github.com/WiderFunnel-Labs)
9396
[PayPal](https://github.com/stevenmaguire/oauth2-paypal) | stevenmaguire/oauth2-paypal | [Steven Maguire](https://github.com/stevenmaguire)
9497
[Pipedrive](https://github.com/daniti/oauth2-pipedrive) | daniti/oauth2-pipedrive | [Daniele Timo](https://github.com/daniti)
@@ -104,6 +107,7 @@ Gateway | Composer Package | Maintainer
104107
[Salesforce](https://github.com/stevenmaguire/oauth2-salesforce) | stevenmaguire/oauth2-salesforce | [Steven Maguire](https://github.com/stevenmaguire)
105108
[Shopify](https://github.com/multidimension-al/oauth2-shopify) | multidimensional/oauth2-shopify | [multidimension.al](https://multidimension.al/)
106109
[Slack](https://github.com/adam-paterson/oauth2-slack) | adam-paterson/oauth2-slack | [Adam Paterson](https://github.com/adam-paterson)
110+
[Snapchat](https://github.com/pbringetto/oauth2-snapchat) | pbringetto/oauth2-snapchat | [Paul Bringetto](https://github.com/pbringetto)
107111
[Spotify](https://packagist.org/packages/audeio/spotify-web-api) | audeio/spotify-web-api | [Jonjo McKay](https://github.com/jonjomckay)
108112
[Spotify](https://packagist.org/packages/kerox/oauth2-spotify) | kerox/oauth2-spotify | [Romain Monteil](https://github.com/ker0x)
109113
[SteemConnect V2](https://github.com/hernandev/oauth2-sc2) | hernandev/oauth2-sc2 | [Diego Hernandes](https://github.com/hernandev)
@@ -115,6 +119,7 @@ Gateway | Composer Package | Maintainer
115119
[Thingiverse](https://packagist.org/packages/freshworkx/oauth2-thingiverse) | freshworkx/oauth2-thingiverse | [Jens Neumann](https://github.com/freshworkx)
116120
[ThirtySevenSignals](https://github.com/nilesuan/oauth2-thirtysevensignals) | nilesuan/oauth2-thirtysevensignals | [Nile Suan](https://github.com/nilesuan)
117121
[Trakt.tv](https://github.com/Bogstag/oauth2-trakt) | bogstag/oauth2-trakt | [Krister Bogstag](https://github.com/Bogstag/)
122+
[Trovo](https://github.com/artandor/oauth2-trovo) | artandor/oauth2-trovo | [Nicolas Mylle](https://github.com/artandor/)
118123
[Twinfield](https://github.com/php-twinfield/twinfield) | php-twinfield/twinfield | [Mollie B.V.](https://github.com/mollie)
119124
[Twitch.tv](https://github.com/tpavlek/oauth2-twitch) | depotwarehouse/oauth2-twitch | [Troy Pavlek](https://github.com/tpavlek)
120125
[Twitch.tv (New API Helix)](https://github.com/vertisan/oauth2-twitch-helix) | vertisan/oauth2-twitch-helix | [Paweł Farys](https://github.com/vertisan)

‎phpunit.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit colors="true" bootstrap="./vendor/autoload.php">
2+
<phpunit
3+
bootstrap="./vendor/autoload.php"
4+
colors="true"
5+
convertErrorsToExceptions="true"
6+
convertWarningsToExceptions="true"
7+
convertNoticesToExceptions="true"
8+
convertDeprecationsToExceptions="true"
9+
>
310
<testsuites>
411
<testsuite name="all">
512
<directory>./test</directory>

‎src/Token/AccessTokenInterface.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
namespace League\OAuth2\Client\Token;
1616

1717
use JsonSerializable;
18+
use ReturnTypeWillChange;
1819
use RuntimeException;
1920

2021
interface AccessTokenInterface extends JsonSerializable
@@ -68,5 +69,6 @@ public function __toString();
6869
*
6970
* @return array
7071
*/
72+
#[ReturnTypeWillChange]
7173
public function jsonSerialize();
7274
}

‎src/Tool/QueryBuilderTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ trait QueryBuilderTrait
2828
*/
2929
protected function buildQueryString(array $params)
3030
{
31-
return http_build_query($params, null, '&', \PHP_QUERY_RFC3986);
31+
return http_build_query($params, '', '&', \PHP_QUERY_RFC3986);
3232
}
3333
}

0 commit comments

Comments
 (0)