Skip to content

Commit 088b375

Browse files
Support PHP 8.0
1 parent 1ee3524 commit 088b375

File tree

4 files changed

+25
-9
lines changed

4 files changed

+25
-9
lines changed

.github/workflows/tests.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
strategy:
1313
matrix:
14-
php: ['7.1', '7.2', '7.3', '7.4']
14+
php: ['7.1', '7.2', '7.3', '7.4', '8.0']
1515

1616
steps:
1717
- name: Checkout Code
@@ -27,6 +27,22 @@ jobs:
2727
- name: Setup Problem Matchers
2828
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
2929

30+
- name: Remove Guzzle 6
31+
uses: nick-invision/retry@v1
32+
with:
33+
timeout_minutes: 5
34+
max_attempts: 5
35+
command: composer remove php-http/guzzle6-adapter --dev --no-update --no-interaction
36+
if: matrix.php >= 8
37+
38+
- name: Require Guzzle 7
39+
uses: nick-invision/retry@v1
40+
with:
41+
timeout_minutes: 5
42+
max_attempts: 5
43+
command: composer require php-http/guzzle7-adapter --dev --no-update --no-interaction
44+
if: matrix.php >= 8
45+
3046
- name: Install Dependencies
3147
uses: nick-invision/retry@v1
3248
with:

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ install:
33
@docker run -it -w /data -v ${PWD}:/data:delegated -v ~/.composer:/root/.composer:delegated --entrypoint composer --rm registry.gitlab.com/grahamcampbell/php:7.4-base bin all update
44

55
phpunit:
6-
@rm -f bootstrap/cache/*.php && docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit --rm registry.gitlab.com/grahamcampbell/php:7.4-cli
6+
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit --rm registry.gitlab.com/grahamcampbell/php:7.4-cli
77

88
phpstan-analyze:
99
@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpstan --rm registry.gitlab.com/grahamcampbell/php:7.4-cli analyze

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Check out the [change log](CHANGELOG.md), [releases](https://github.com/Bitbucke
2323

2424
## Installation
2525

26-
This version supports [PHP](https://php.net) 7.1-7.4. To get started, simply require the project using [Composer](https://getcomposer.org). You will also need to install packages that "provide" [`psr/http-client-implementation`](https://packagist.org/providers/psr/http-client-implementation) and [`psr/http-factory-implementation`](https://packagist.org/providers/psr/http-factory-implementation).
26+
This version supports [PHP](https://php.net) 7.1-8.0. To get started, simply require the project using [Composer](https://getcomposer.org). You will also need to install packages that "provide" [`psr/http-client-implementation`](https://packagist.org/providers/psr/http-client-implementation) and [`psr/http-factory-implementation`](https://packagist.org/providers/psr/http-factory-implementation).
2727

2828
### Standard Installation
2929

composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
}
1111
],
1212
"require": {
13-
"php": "^7.1.3",
13+
"php": "^7.1.3 || ^8.0",
1414
"ext-json": "*",
15+
"php-http/cache-plugin": "^1.7.1",
1516
"php-http/client-common": "^2.3",
16-
"php-http/cache-plugin": "^1.7",
1717
"php-http/discovery": "^1.12",
18-
"php-http/httplug": "^2.1",
19-
"php-http/multipart-stream-builder": "^1.1",
18+
"php-http/httplug": "^2.2",
19+
"php-http/multipart-stream-builder": "^1.1.2",
2020
"psr/cache": "^1.0",
2121
"psr/http-client-implementation": "^1.0",
2222
"psr/http-factory-implementation": "^1.0",
@@ -25,9 +25,9 @@
2525
},
2626
"require-dev": {
2727
"bamarni/composer-bin-plugin": "^1.4.1",
28-
"php-http/guzzle6-adapter": "^2.0.1",
2928
"http-interop/http-factory-guzzle": "^1.0",
30-
"php-http/mock-client": "^1.4"
29+
"php-http/guzzle6-adapter": "^2.0.1",
30+
"php-http/mock-client": "^1.4.1"
3131
},
3232
"autoload": {
3333
"psr-4": {

0 commit comments

Comments
 (0)