Skip to content

Commit e150df8

Browse files
authored
Added support for PHP 8.4 & phpoffice/phpspreadsheet: Allow version 3.0 (#839)
* Added support for PHP 8.4 * `phpoffice/phpspreadsheet`: Allow version 3.0
1 parent c412543 commit e150df8

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

.github/workflows/php.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
strategy:
4848
fail-fast: false
4949
matrix:
50-
php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
50+
php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
5151
steps:
5252
- name: Setup PHP
5353
uses: shivammathur/setup-php@v2
@@ -68,7 +68,7 @@ jobs:
6868
strategy:
6969
fail-fast: false
7070
matrix:
71-
php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
71+
php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
7272
steps:
7373
- name: Setup PHP
7474
uses: shivammathur/setup-php@v2
@@ -105,7 +105,7 @@ jobs:
105105
strategy:
106106
fail-fast: false
107107
matrix:
108-
php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
108+
php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
109109
steps:
110110
- name: Setup PHP
111111
uses: shivammathur/setup-php@v2

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"ext-xml": "*",
2424
"ext-zip": "*",
2525
"phpoffice/common": "^1",
26-
"phpoffice/phpspreadsheet": "^1.9 || ^2.0"
26+
"phpoffice/phpspreadsheet": "^1.9 || ^2.0 || ^3.0"
2727
},
2828
"require-dev": {
2929
"phpunit/phpunit": ">=7.0",

docs/changes/1.2.0.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
- `phpoffice/phpspreadsheet`: Allow version 1.9 or 2.0 by [@Progi1984](https://github.com/Progi1984) fixing [#790](https://github.com/PHPOffice/PHPPresentation/pull/790), [#812](https://github.com/PHPOffice/PHPPresentation/pull/812) in [#816](https://github.com/PHPOffice/PHPPresentation/pull/816)
88
- Group Shape: moving the shape now moves all contained shapes. Offsets and size are calculated based on the contained shapes by [@DennisBirkholz](https://github.com/DennisBirkholz) in [#690](https://github.com/PHPOffice/PHPPresentation/pull/690)
9+
- Added support for PHP 8.4 - [@Progi1984](https://github.com/Progi1984) in [#](https://github.com/PHPOffice/PHPPresentation/pull/)
10+
- `phpoffice/phpspreadsheet`: Allow version 3.0 by [@Progi1984](https://github.com/Progi1984) fixing [#836](https://github.com/PHPOffice/PHPPresentation/pull/836) in [#](https://github.com/PHPOffice/PHPPresentation/pull/)
911

1012
## Bug fixes
1113

0 commit comments

Comments
 (0)