Skip to content

Commit d597121

Browse files
authored
Merge pull request hoogi91#61 from hoogi91/feature/php81-support
Add PHP 8.1 to ci runs
2 parents 9ba3d84 + 396d280 commit d597121

5 files changed

Lines changed: 613 additions & 576 deletions

File tree

.github/workflows/ci.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ jobs:
2525
strategy:
2626
fail-fast: false
2727
matrix:
28-
php_version: [ '7.3', '7.4', '8.0' ]
29-
typo3_version: [ '^10.4', '^11.5' ]
28+
php_version: [ '7.4', '8.0', '8.1' ]
29+
typo3_version: [ '^11.5' ]
3030
experimental: [ false ]
31-
exclude:
32-
- php_version: '8.0'
33-
typo3_version: '^10.4'
34-
- php_version: '7.3'
35-
typo3_version: '^11.5'
3631
include:
37-
# add experimental dev-master for PHP 8.0
38-
- php_version: '8.0'
32+
- php_version: '7.3'
33+
typo3_version: '^10.4'
34+
experimental: false
35+
- php_version: '7.4'
36+
typo3_version: '^10.4'
37+
experimental: false
38+
- php_version: '8.1'
3939
typo3_version: 'dev-master'
4040
experimental: true
4141

@@ -79,36 +79,36 @@ jobs:
7979
run: .Build/bin/phpstan analyse --level 5 Classes/
8080

8181
- name: Running unit tests
82-
if: (matrix.php_version == '8.0' && matrix.typo3_version == '^11.5') == false
82+
if: (matrix.php_version == '8.1' && matrix.typo3_version == '^11.5') == false
8383
run: |
8484
if [ -d "Tests/Unit" ]; then
8585
.Build/bin/phpunit --bootstrap .Build/vendor/typo3/testing-framework/Resources/Core/Build/UnitTestsBootstrap.php Tests/Unit/
8686
fi
8787
8888
- name: Running unit tests with coverage report
89-
if: matrix.php_version == '8.0' && matrix.typo3_version == '^11.5'
89+
if: matrix.php_version == '8.1' && matrix.typo3_version == '^11.5'
9090
run: |
9191
if [ -d "Tests/Unit" ]; then
9292
.Build/bin/phpunit --bootstrap .Build/vendor/typo3/testing-framework/Resources/Core/Build/UnitTestsBootstrap.php Tests/Unit/ --coverage-clover=./coverage/unit/clover.xml --whitelist=./Classes/
9393
fi
9494
9595
- name: Running functional tests
96-
if: (matrix.php_version == '8.0' && matrix.typo3_version == '^11.5') == false
96+
if: (matrix.php_version == '8.1' && matrix.typo3_version == '^11.5') == false
9797
run: |
9898
if [ -d "Tests/Functional" ]; then
9999
find 'Tests/Functional' -wholename '*Test.php' | parallel --gnu 'echo; echo "Running functional test suite {}"; .Build/bin/phpunit --bootstrap .Build/vendor/typo3/testing-framework/Resources/Core/Build/FunctionalTestsBootstrap.php {}'
100100
fi
101101
102102
- name: Running functional tests with coverage report
103-
if: matrix.php_version == '8.0' && matrix.typo3_version == '^11.5'
103+
if: matrix.php_version == '8.1' && matrix.typo3_version == '^11.5'
104104
run: |
105105
if [ -d "Tests/Functional" ]; then
106106
find 'Tests/Functional' -wholename '*Test.php' | parallel --gnu 'echo; echo "Running functional test suite {}"; .Build/bin/phpunit --bootstrap .Build/vendor/typo3/testing-framework/Resources/Core/Build/FunctionalTestsBootstrap.php {} --coverage-clover=./coverage/functional/{}/clover.xml --whitelist=./Classes/'
107107
fi
108108
109109
- name: Upload coverage report to codecov
110110
uses: codecov/codecov-action@v2
111-
if: matrix.php_version == '8.0' && matrix.typo3_version == '^11.5'
111+
if: matrix.php_version == '8.1' && matrix.typo3_version == '^11.5'
112112
with:
113113
token: ${{ secrets.CODECOV_TOKEN }}
114114
directory: ./coverage/

Classes/Domain/ValueObject/CellDataValueObject.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,7 @@ public function getClass(): string
276276
/**
277277
* @inheritDoc
278278
*/
279+
#[\ReturnTypeWillChange]
279280
public function jsonSerialize()
280281
{
281282
$data = ['val' => $this->getFormattedValue()];

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ Download and install the [extension][3] with the extension manager module.
4040
### Versions and support
4141

4242
| Spreadsheets | TYPO3 | PHP | Support / Development |
43-
| ------------ | ----------- | ----------|------------------------------------- |
44-
| dev-master | 11.5 | 8.0 | unstable development branch |
45-
| 3.x | 10.4 - 11.5 | 7.3 - 8.0 | features, bugfixes, security updates |
43+
| ------------ | ----------- |-----------|------------------------------------- |
44+
| dev-master | 11.5 | 8.1 | unstable development branch |
45+
| 3.x | 10.4 - 11.5 | 7.3 - 8.1 | features, bugfixes, security updates |
4646
| 2.x | 10.4 | 7.2 - 7.4 | bugfixes, security update |
4747
| 1.x | 8.7 - 9.5 | 7.0 - 7.2 | unsupported |
4848

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
}
1919
],
2020
"require": {
21-
"php": ">=7.2",
21+
"php": "^7.2 || ^8.0",
2222
"ext-json": "*",
2323
"ext-mbstring": "*",
2424
"phpoffice/phpspreadsheet": "^1.18",

0 commit comments

Comments
 (0)