Skip to content

Commit 1ee97d5

Browse files
authored
PHP 8.0 Compatibility (#488)
1 parent c44afc6 commit 1ee97d5

File tree

3 files changed

+18
-10
lines changed

3 files changed

+18
-10
lines changed

.travis.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,26 @@ env:
1010
- VARNISH_VERSION=5.1
1111
- SYMFONY_PHPUNIT_VERSION=8
1212
- SYMFONY_DEPRECATIONS_HELPER="max[self]=0"
13-
- DEPENDENCIES="toflar/psr6-symfony-http-cache-store:^2.2.0"
13+
- DEPENDENCIES="toflar/psr6-symfony-http-cache-store:^2.2.0\|^3.0.0"
1414

1515
matrix:
1616
fast_finish: true
1717
include:
1818
# Minimum supported versions
19-
- php: 7.1
19+
- php: 7.2
2020
env: VARNISH_VERSION=3.0 SYMFONY_PHPUNIT_VERSION=5.7 COMPOSER_FLAGS="--prefer-lowest" DEPENDENCIES=""
2121

22-
- php: 7.1
23-
env: SYMFONY_PHPUNIT_VERSION=7
2422
- php: 7.2
2523
- php: 7.3
2624
- php: 7.4
2725
env: COVERAGE=true PHPUNIT_FLAGS="-v --coverage-text" VARNISH_MODULES_VERSION=0.12.1
2826
#TODO re-add DOCCHECK=true - see https://github.com/FriendsOfSymfony/FOSHttpCache/pull/450
2927

28+
# PHP 8.0 (Travis does not yet support using the stable 8.0.0)
29+
- php: nightly
30+
dist: xenial
31+
env: SYMFONY_PHPUNIT_VERSION=8
32+
3033
# Test with Varnish 4
3134
- php: 7.4
3235
env: VARNISH_VERSION=4.1 VARNISH_MODULES_VERSION=0.9.1
@@ -37,7 +40,7 @@ matrix:
3740

3841
# Test SYMFONY LTS versions
3942
- php: 7.4
40-
env: DEPENDENCIES="symfony/lts:^3 toflar/psr6-symfony-http-cache-store:^2.2.0"
43+
env: DEPENDENCIES="symfony/lts:^3 toflar/psr6-symfony-http-cache-store:^2.2.0\|^3.0.0"
4144
- php: 7.4
4245
env: DEPENDENCIES="symfony/flex" SYMFONY_VERSION="^4"
4346

@@ -86,7 +89,7 @@ script:
8689
- if [[ "$DOCCHECK" = true ]]; then make -C doc spelling; fi
8790

8891
after_script:
89-
- wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.clover
92+
- if [[ $COVERAGE = true ]]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
9093

9194
after_failure:
9295
- cat /tmp/fos_nginx_error.log

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ See also the [GitHub releases page](https://github.com/FriendsOfSymfony/FOSHttpC
66
unreleased
77
----------
88

9+
### General
10+
11+
* Raised minimal PHP version to 7.2
12+
* Added support for PHP 8.0
13+
914
### Symfony HttpCache
1015

1116
* Added a neutral "Bad Request" body to user hash mismatch response to have

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@
2121
}
2222
],
2323
"require": {
24-
"php": "^7.1",
24+
"php": "^7.2 || ^8.0",
2525
"symfony/event-dispatcher": "^3.4 || ^4.3 || ^5.0",
2626
"symfony/options-resolver": "^3.4 || ^4.3 || ^5.0",
2727
"php-http/client-implementation": "^1.0 || ^2.0",
2828
"php-http/client-common": "^1.1.0 || ^2.0",
2929
"php-http/message": "^1.0 || ^2.0",
30-
"php-http/discovery": "^1.0"
30+
"php-http/discovery": "^1.12"
3131
},
3232
"require-dev": {
3333
"mockery/mockery": "^1.3.1",
3434
"monolog/monolog": "^1.0",
35-
"php-http/guzzle6-adapter": "^1.0 || ^2.0",
35+
"php-http/guzzle7-adapter": "^0.1.1",
3636
"php-http/mock-client": "^1.2",
3737
"symfony/process": "^3.4 || ^4.3 || ^5.0",
3838
"symfony/http-kernel": "^3.4 || ^4.3 || ^5.0",
@@ -57,7 +57,7 @@
5757
},
5858
"extra": {
5959
"branch-alias": {
60-
"dev-master": "2.8.x-dev"
60+
"dev-master": "2.10.x-dev"
6161
}
6262
}
6363
}

0 commit comments

Comments
 (0)