Skip to content

Commit adea181

Browse files
authored
Add support for php 8.4 (#298) (#299)
* Add support for php 8.4 * Add 8.4 * Focus on 8.3 as recommended version * Remove 8.1 from pipelines * Add support for php 8.4 * Adjust CI/CD * Upgrade PHPUnit to 11.5
1 parent 2808965 commit adea181

28 files changed

+1971
-783
lines changed

.github/workflows/lint-fix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010

1111
strategy:
1212
matrix:
13-
php-versions: ['8.2']
13+
php-versions: ['8.3']
1414

1515
steps:
1616
- name: Checkout

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
strategy:
1818
matrix:
19-
php-versions: ['8.2', '8.3']
19+
php-versions: ['8.3', '8.4']
2020

2121
name: php${{ matrix.php-versions }}-LINT
2222
steps:

.github/workflows/phpunit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
# do not stop on another job's failure
7575
fail-fast: false
7676
matrix:
77-
php-versions: ['8.2', '8.3']
77+
php-versions: ['8.3', '8.4']
7878
databases: ['mysql']
7979
server-versions: ['stable31']
8080

.github/workflows/psalm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
matrix:
1616
ocp-version: [ 'dev-stable31' ]
17-
php-version: [ '8.1', '8.2', '8.3' ]
17+
php-version: [ '8.2', '8.3', '8.4' ]
1818

1919
name: Nextcloud ${{ matrix.ocp-version }} PHP${{ matrix.php-version }}
2020
steps:

.github/workflows/sonarqube.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
# do not stop on another job's failure
1919
fail-fast: false
2020
matrix:
21-
php-versions: ['8.2']
21+
php-versions: ['8.3']
2222
databases: ['sqlite']
2323
server-versions: ['stable31']
2424

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ port `9003`. Depending on your system a possible configuration could
276276
look like this:
277277

278278
```ini
279-
; /etc/php/8.1/cli/php.ini
279+
; /etc/php/8.3/cli/php.ini
280280
; ...
281281
[Xdebug]
282282
zend_extension=/usr/lib/php/20190902/xdebug.so
@@ -287,7 +287,7 @@ xdebug.remote_autostart=1
287287
```
288288

289289
```ini
290-
; /etc/php/8.1/apache2/php.ini
290+
; /etc/php/8.3/apache2/php.ini
291291
; ...
292292
[Xdebug]
293293
zend_extension=/usr/lib/php/20190902/xdebug.so
@@ -342,7 +342,7 @@ services:
342342
networks:
343343
- web_dev
344344
```
345-
`IMAGE` could be set to `IMAGE=thecodingmachine/php:8.1-v4-apache-node14` and the content of `Dockerfile` might
345+
`IMAGE` could be set to `IMAGE=thecodingmachine/php:8.3-v4-apache-node14` and the content of `Dockerfile` might
346346
look like this:
347347

348348
```dockerfile

appinfo/info.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828
<screenshot>https://github.com/R0Wi/workflow_ocr/blob/eb2d65e9610406bbab22c4c8dda1cea015b5c791/doc/img/usage_1.jpg?raw=true</screenshot>
2929
<dependencies>
3030
<nextcloud min-version="31" max-version="31"/>
31-
<php min-version="8.1" max-version="8.3"/>
31+
<php min-version="8.1" max-version="8.4"/>
3232
</dependencies>
3333
</info>

composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
"mikehaertl/php-shellcommand": "^1.6"
44
},
55
"require-dev": {
6-
"phpunit/phpunit": "9.3.*",
7-
"phpunit/php-code-coverage": "9.2.5",
8-
"phpunit/phpcov": "8.2.*",
9-
"nextcloud/coding-standard": "^1.0",
10-
"vimeo/psalm": "^5.15",
6+
"phpunit/phpunit": "^11.0",
7+
"phpunit/php-code-coverage": "^11.0",
8+
"phpunit/phpcov": "^10.0",
9+
"nextcloud/coding-standard": "^1.3",
10+
"vimeo/psalm": "6.4.*",
1111
"nextcloud/ocp": "dev-stable31"
1212
},
1313
"config": {
1414
"optimize-autoloader": true,
1515
"platform": {
16-
"php": "8.2"
16+
"php": "8.3"
1717
},
1818
"autoloader-suffix": "WorkflowOcr"
1919
},

0 commit comments

Comments
 (0)