Skip to content

Commit 6012bf1

Browse files
ramseyramsey
authored
Merge branch 'master' into feat/psr-http-client
2 parents 91d12a3 + b25f04b commit 6012bf1

19 files changed

+187
-173
lines changed

‎.github/dependabot.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,8 @@ updates:
88
directory: "/docs"
99
schedule:
1010
interval: "daily"
11+
- package-ecosystem: "github-actions"
12+
directory: "/"
13+
schedule:
14+
interval: "weekly"
15+
open-pull-requests-limit: 5

‎.github/workflows/continuous-integration.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,39 +19,39 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
php-version: [ '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
22+
php-version: [ '8.1', '8.2', '8.3', '8.4' ]
2323
steps:
24-
- uses: "actions/checkout@v2"
24+
- uses: "actions/checkout@v4"
2525
- uses: "shivammathur/setup-php@v2"
2626
with:
2727
php-version: "${{ matrix.php-version }}"
2828
coverage: "none"
2929
ini-values: "memory_limit=-1, zend.assertions=1, error_reporting=-1, display_errors=On"
3030
tools: "composer:v2"
31-
- uses: "ramsey/composer-install@v2"
31+
- uses: "ramsey/composer-install@v3"
3232
- name: "Lint the PHP source code"
3333
run: "./vendor/bin/parallel-lint src test"
3434

3535
coding-standards:
3636
name: "Coding Standards"
3737
runs-on: "ubuntu-latest"
3838
steps:
39-
- uses: "actions/checkout@v2"
39+
- uses: "actions/checkout@v4"
4040
- uses: "shivammathur/setup-php@v2"
4141
with:
4242
php-version: "latest"
4343
coverage: "none"
4444
ini-values: "memory_limit=-1"
4545
tools: "composer:v2"
46-
- uses: "ramsey/composer-install@v2"
46+
- uses: "ramsey/composer-install@v3"
4747
- name: "Check coding standards"
4848
run: "./vendor/bin/phpcs src --standard=psr2 -sp --colors"
4949

5050
coverage:
5151
name: "Coverage"
5252
runs-on: "ubuntu-latest"
5353
steps:
54-
- uses: "actions/checkout@v2"
54+
- uses: "actions/checkout@v4"
5555
- uses: "shivammathur/setup-php@v2"
5656
with:
5757
php-version: "latest"
@@ -60,21 +60,21 @@ jobs:
6060
tools: "composer"
6161
- name: "Prepare for tests"
6262
run: "mkdir -p build/logs"
63-
- uses: "ramsey/composer-install@v2"
63+
- uses: "ramsey/composer-install@v3"
6464
- name: "Run unit tests"
6565
run: "./vendor/bin/phpunit --colors=always --coverage-clover build/logs/clover.xml --coverage-text"
6666
- name: "Publish coverage report to Codecov"
67-
uses: "codecov/codecov-action@v2"
67+
uses: "codecov/codecov-action@v5"
6868

6969
unit-tests:
7070
name: "Unit Tests"
7171
runs-on: "ubuntu-latest"
7272
strategy:
7373
fail-fast: false
7474
matrix:
75-
php-version: [ '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
75+
php-version: [ '8.1', '8.2', '8.3', '8.4' ]
7676
steps:
77-
- uses: "actions/checkout@v2"
77+
- uses: "actions/checkout@v4"
7878
- uses: "shivammathur/setup-php@v2"
7979
with:
8080
php-version: "${{ matrix.php-version }}"
@@ -83,6 +83,6 @@ jobs:
8383
tools: "composer"
8484
- name: "Prepare for tests"
8585
run: "mkdir -p build/logs"
86-
- uses: "ramsey/composer-install@v2"
86+
- uses: "ramsey/composer-install@v3"
8787
- name: "Run unit tests"
88-
run: "./vendor/bin/phpunit --colors=always"
88+
run: "./vendor/bin/phpunit --colors=always --no-coverage"

‎README.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,10 @@ This package is compliant with [PSR-1][], [PSR-2][], [PSR-4][], and [PSR-7][]. I
2424

2525
We support the following versions of PHP:
2626

27+
* PHP 8.4
28+
* PHP 8.3
2729
* PHP 8.2
2830
* PHP 8.1
29-
* PHP 8.0
30-
* PHP 7.4
31-
* PHP 7.3
32-
* PHP 7.2
33-
* PHP 7.1
34-
* PHP 7.0
35-
* PHP 5.6
3631

3732
## Provider Clients
3833

‎composer.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,17 @@
66
"sort-packages": true
77
},
88
"require": {
9+
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
910
"ext-json": "*",
10-
"php": "^5.6 || ^7.0 || ^8.0",
11-
"paragonie/random_compat": "^1 || ^2 || ^9.99",
1211
"psr/http-client": "^1.0",
1312
"psr/http-factory": "^1.1",
1413
"psr/http-message": "^2.0"
1514
},
1615
"require-dev": {
17-
"guzzlehttp/guzzle": "^6.0 || ^7.0",
18-
"mockery/mockery": "^1.3.5",
19-
"php-parallel-lint/php-parallel-lint": "^1.3.1",
20-
"phpunit/phpunit": "^5.7 || ^6.0 || ^9.5",
21-
"squizlabs/php_codesniffer": "^2.3 || ^3.0"
16+
"mockery/mockery": "^1.6",
17+
"php-parallel-lint/php-parallel-lint": "^1.4",
18+
"phpunit/phpunit": "^10.5 || ^11.5",
19+
"squizlabs/php_codesniffer": "^3.11"
2220
},
2321
"keywords": [
2422
"oauth",

‎docs/Gemfile.lock

Lines changed: 87 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,63 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (7.0.4.3)
5-
concurrent-ruby (~> 1.0, >= 1.0.2)
4+
activesupport (8.0.0)
5+
base64
6+
benchmark (>= 0.3)
7+
bigdecimal
8+
concurrent-ruby (~> 1.0, >= 1.3.1)
9+
connection_pool (>= 2.2.5)
10+
drb
611
i18n (>= 1.6, < 2)
12+
logger (>= 1.4.2)
713
minitest (>= 5.1)
8-
tzinfo (~> 2.0)
9-
addressable (2.8.4)
10-
public_suffix (>= 2.0.2, < 6.0)
14+
securerandom (>= 0.3)
15+
tzinfo (~> 2.0, >= 2.0.5)
16+
uri (>= 0.13.1)
17+
addressable (2.8.7)
18+
public_suffix (>= 2.0.2, < 7.0)
19+
base64 (0.2.0)
20+
benchmark (0.4.0)
21+
bigdecimal (3.1.8)
1122
coffee-script (2.4.1)
1223
coffee-script-source
1324
execjs
14-
coffee-script-source (1.11.1)
25+
coffee-script-source (1.12.2)
1526
colorator (1.1.0)
16-
commonmarker (0.23.9)
17-
concurrent-ruby (1.2.2)
18-
dnsruby (1.70.0)
27+
commonmarker (0.23.11)
28+
concurrent-ruby (1.3.4)
29+
connection_pool (2.4.1)
30+
csv (3.3.0)
31+
dnsruby (1.72.3)
32+
base64 (~> 0.2.0)
1933
simpleidn (~> 0.2.1)
34+
drb (2.2.1)
2035
em-websocket (0.5.3)
2136
eventmachine (>= 0.12.9)
2237
http_parser.rb (~> 0)
2338
ethon (0.16.0)
2439
ffi (>= 1.15.0)
2540
eventmachine (1.2.7)
26-
execjs (2.8.1)
27-
faraday (2.7.4)
28-
faraday-net_http (>= 2.0, < 3.1)
29-
ruby2_keywords (>= 0.0.4)
30-
faraday-net_http (3.0.2)
31-
ffi (1.15.5)
41+
execjs (2.10.0)
42+
faraday (2.12.2)
43+
faraday-net_http (>= 2.0, < 3.5)
44+
json
45+
logger
46+
faraday-net_http (3.4.0)
47+
net-http (>= 0.5.0)
48+
ffi (1.17.0)
3249
forwardable-extended (2.6.0)
33-
gemoji (3.0.1)
34-
github-pages (228)
35-
github-pages-health-check (= 1.17.9)
36-
jekyll (= 3.9.3)
37-
jekyll-avatar (= 0.7.0)
38-
jekyll-coffeescript (= 1.1.1)
39-
jekyll-commonmark-ghpages (= 0.4.0)
40-
jekyll-default-layout (= 0.1.4)
41-
jekyll-feed (= 0.15.1)
50+
gemoji (4.1.0)
51+
github-pages (232)
52+
github-pages-health-check (= 1.18.2)
53+
jekyll (= 3.10.0)
54+
jekyll-avatar (= 0.8.0)
55+
jekyll-coffeescript (= 1.2.2)
56+
jekyll-commonmark-ghpages (= 0.5.1)
57+
jekyll-default-layout (= 0.1.5)
58+
jekyll-feed (= 0.17.0)
4259
jekyll-gist (= 1.5.0)
43-
jekyll-github-metadata (= 2.13.0)
60+
jekyll-github-metadata (= 2.16.1)
4461
jekyll-include-cache (= 0.2.1)
4562
jekyll-mentions (= 1.6.0)
4663
jekyll-optional-front-matter (= 0.3.2)
@@ -67,30 +84,32 @@ GEM
6784
jekyll-theme-tactile (= 0.2.0)
6885
jekyll-theme-time-machine (= 0.2.0)
6986
jekyll-titles-from-headings (= 0.5.3)
70-
jemoji (= 0.12.0)
71-
kramdown (= 2.3.2)
87+
jemoji (= 0.13.0)
88+
kramdown (= 2.4.0)
7289
kramdown-parser-gfm (= 1.1.0)
7390
liquid (= 4.0.4)
7491
mercenary (~> 0.3)
7592
minima (= 2.5.1)
76-
nokogiri (>= 1.13.6, < 2.0)
77-
rouge (= 3.26.0)
93+
nokogiri (>= 1.16.2, < 2.0)
94+
rouge (= 3.30.0)
7895
terminal-table (~> 1.4)
79-
github-pages-health-check (1.17.9)
96+
webrick (~> 1.8)
97+
github-pages-health-check (1.18.2)
8098
addressable (~> 2.3)
8199
dnsruby (~> 1.60)
82-
octokit (~> 4.0)
83-
public_suffix (>= 3.0, < 5.0)
100+
octokit (>= 4, < 8)
101+
public_suffix (>= 3.0, < 6.0)
84102
typhoeus (~> 1.3)
85103
html-pipeline (2.14.3)
86104
activesupport (>= 2)
87105
nokogiri (>= 1.4)
88106
http_parser.rb (0.8.0)
89-
i18n (1.12.0)
107+
i18n (1.14.6)
90108
concurrent-ruby (~> 1.0)
91-
jekyll (3.9.3)
109+
jekyll (3.10.0)
92110
addressable (~> 2.4)
93111
colorator (~> 1.0)
112+
csv (~> 3.0)
94113
em-websocket (~> 0.5)
95114
i18n (>= 0.7, < 2)
96115
jekyll-sass-converter (~> 1.0)
@@ -101,27 +120,28 @@ GEM
101120
pathutil (~> 0.9)
102121
rouge (>= 1.7, < 4)
103122
safe_yaml (~> 1.0)
104-
jekyll-avatar (0.7.0)
123+
webrick (>= 1.0)
124+
jekyll-avatar (0.8.0)
105125
jekyll (>= 3.0, < 5.0)
106-
jekyll-coffeescript (1.1.1)
126+
jekyll-coffeescript (1.2.2)
107127
coffee-script (~> 2.2)
108-
coffee-script-source (~> 1.11.1)
128+
coffee-script-source (~> 1.12)
109129
jekyll-commonmark (1.4.0)
110130
commonmarker (~> 0.22)
111-
jekyll-commonmark-ghpages (0.4.0)
112-
commonmarker (~> 0.23.7)
113-
jekyll (~> 3.9.0)
131+
jekyll-commonmark-ghpages (0.5.1)
132+
commonmarker (>= 0.23.7, < 1.1.0)
133+
jekyll (>= 3.9, < 4.0)
114134
jekyll-commonmark (~> 1.4.0)
115135
rouge (>= 2.0, < 5.0)
116-
jekyll-default-layout (0.1.4)
117-
jekyll (~> 3.0)
118-
jekyll-feed (0.15.1)
136+
jekyll-default-layout (0.1.5)
137+
jekyll (>= 3.0, < 5.0)
138+
jekyll-feed (0.17.0)
119139
jekyll (>= 3.7, < 5.0)
120140
jekyll-gist (1.5.0)
121141
octokit (~> 4.2)
122-
jekyll-github-metadata (2.13.0)
142+
jekyll-github-metadata (2.16.1)
123143
jekyll (>= 3.4, < 5.0)
124-
octokit (~> 4.0, != 4.4.0)
144+
octokit (>= 4, < 7, != 4.4.0)
125145
jekyll-include-cache (0.2.1)
126146
jekyll (>= 3.7, < 5.0)
127147
jekyll-mentions (1.6.0)
@@ -192,41 +212,44 @@ GEM
192212
jekyll (>= 3.3, < 5.0)
193213
jekyll-watch (2.2.1)
194214
listen (~> 3.0)
195-
jemoji (0.12.0)
196-
gemoji (~> 3.0)
215+
jemoji (0.13.0)
216+
gemoji (>= 3, < 5)
197217
html-pipeline (~> 2.2)
198218
jekyll (>= 3.0, < 5.0)
199-
kramdown (2.3.2)
219+
json (2.9.0)
220+
kramdown (2.4.0)
200221
rexml
201222
kramdown-parser-gfm (1.1.0)
202223
kramdown (~> 2.0)
203224
liquid (4.0.4)
204-
listen (3.8.0)
225+
listen (3.9.0)
205226
rb-fsevent (~> 0.10, >= 0.10.3)
206227
rb-inotify (~> 0.9, >= 0.9.10)
228+
logger (1.6.2)
207229
mercenary (0.3.6)
208-
mini_portile2 (2.8.1)
230+
mini_portile2 (2.8.8)
209231
minima (2.5.1)
210232
jekyll (>= 3.5, < 5.0)
211233
jekyll-feed (~> 0.9)
212234
jekyll-seo-tag (~> 2.1)
213-
minitest (5.18.0)
214-
nokogiri (1.14.3)
215-
mini_portile2 (~> 2.8.0)
235+
minitest (5.25.4)
236+
net-http (0.6.0)
237+
uri
238+
nokogiri (1.17.0)
239+
mini_portile2 (~> 2.8.2)
216240
racc (~> 1.4)
217241
octokit (4.25.1)
218242
faraday (>= 1, < 3)
219243
sawyer (~> 0.9)
220244
pathutil (0.16.2)
221245
forwardable-extended (~> 2.6)
222-
public_suffix (4.0.7)
223-
racc (1.6.2)
246+
public_suffix (5.1.1)
247+
racc (1.8.1)
224248
rb-fsevent (0.11.2)
225-
rb-inotify (0.10.1)
249+
rb-inotify (0.11.1)
226250
ffi (~> 1.0)
227-
rexml (3.2.5)
228-
rouge (3.26.0)
229-
ruby2_keywords (0.0.5)
251+
rexml (3.3.9)
252+
rouge (3.30.0)
230253
rubyzip (2.3.2)
231254
safe_yaml (1.0.5)
232255
sass (3.7.4)
@@ -237,18 +260,17 @@ GEM
237260
sawyer (0.9.2)
238261
addressable (>= 2.3.5)
239262
faraday (>= 0.17.3, < 3)
240-
simpleidn (0.2.1)
241-
unf (~> 0.1.4)
263+
securerandom (0.4.0)
264+
simpleidn (0.2.3)
242265
terminal-table (1.8.0)
243266
unicode-display_width (~> 1.1, >= 1.1.1)
244-
typhoeus (1.4.0)
267+
typhoeus (1.4.1)
245268
ethon (>= 0.9.0)
246269
tzinfo (2.0.6)
247270
concurrent-ruby (~> 1.0)
248-
unf (0.1.4)
249-
unf_ext
250-
unf_ext (0.0.8.2)
251271
unicode-display_width (1.8.0)
272+
uri (1.0.2)
273+
webrick (1.9.1)
252274

253275
PLATFORMS
254276
ruby

0 commit comments

Comments
 (0)