Skip to content

Commit 5786355

Browse files
authored
Merge pull request #15 from amineSt/feature/#14
[Issue #14] : Add PHP 8 to supported php versions
2 parents 5287cc6 + d1beeb8 commit 5786355

File tree

3 files changed

+20
-7
lines changed

3 files changed

+20
-7
lines changed

.circleci/config.yml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,29 @@ unit_tests: &unit_tests
55
- install_deps
66
- run_unit_tests
77

8+
php81: &php81
9+
docker:
10+
- image: cimg/php:8.1.7-browsers
11+
812
php73: &php73
913
docker:
10-
- image: circleci/php:7.3-browsers
14+
- image: cimg/php:7.3-browsers
1115

1216
php72: &php72
1317
docker:
14-
- image: circleci/php:7.2-browsers
18+
- image: cimg/php:7.2-browsers
1519

1620
php71: &php71
1721
docker:
18-
- image: circleci/php:7.1-browsers
22+
- image: cimg/php:7.1-browsers
1923

2024
php70: &php70
2125
docker:
22-
- image: circleci/php:7.0-browsers
26+
- image: cimg/php:7.0-browsers
2327

2428
php56: &php56
2529
docker:
26-
- image: circleci/php:5.6-browsers
30+
- image: cimg/php:5.6-browsers
2731

2832
commands:
2933

@@ -55,6 +59,10 @@ commands:
5559

5660
jobs:
5761

62+
php-81-unit-tests:
63+
<<: *unit_tests
64+
<<: *php81
65+
5866
php-73-unit-tests:
5967
<<: *unit_tests
6068
<<: *php73
@@ -106,6 +114,9 @@ workflows:
106114
- qa-phplint
107115
- qa-phpcs
108116
- qa-phpmd
117+
php-81-tests:
118+
jobs:
119+
- php-81-unit-tests
109120
php-73-tests:
110121
jobs:
111122
- php-73-unit-tests

Serializer/SmartSerializer.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@ private function prepareData(&$data)
103103
/**
104104
* @todo For 2.0, remove the E_NOTICE check before raising the exception.
105105
*
106+
* @SuppressWarnings(PHPMD.ErrorControlOperator)
107+
*
106108
* @throws JsonErrorException
107109
*
108110
* @param $data

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
{"name" : "Aurélien FOUCRET", "email": "aurelien.foucret@elastic.co"}
1515
],
1616
"require" : {
17-
"php" : "^5.6|^7.0",
17+
"php" : "^5.6|^7.0|^8.0",
1818
"guzzlehttp/ringphp" : "^1.0",
1919
"psr/log" : "^1.0."
2020
},
2121
"require-dev" : {
22-
"phpunit/phpunit" : "^5.6.0|^6.3.0",
22+
"phpunit/phpunit" : "^5.6.0|^6.3.0|9.5.20",
2323
"squizlabs/php_codesniffer" : "^3.4.0",
2424
"friendsofphp/php-cs-fixer": "^2.14",
2525
"overtrue/phplint": "^1.1",

0 commit comments

Comments
 (0)