Skip to content

Commit

Permalink
Add support for php 8.4 (#298) (#299)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
R0Wi authored Feb 13, 2025
1 parent 2808965 commit adea181
Show file tree
Hide file tree
Showing 28 changed files with 1,971 additions and 783 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint-fix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

strategy:
matrix:
php-versions: ['8.2']
php-versions: ['8.3']

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

strategy:
matrix:
php-versions: ['8.2', '8.3']
php-versions: ['8.3', '8.4']

name: php${{ matrix.php-versions }}-LINT
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
# do not stop on another job's failure
fail-fast: false
matrix:
php-versions: ['8.2', '8.3']
php-versions: ['8.3', '8.4']
databases: ['mysql']
server-versions: ['stable31']

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/psalm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
ocp-version: [ 'dev-stable31' ]
php-version: [ '8.1', '8.2', '8.3' ]
php-version: [ '8.2', '8.3', '8.4' ]

name: Nextcloud ${{ matrix.ocp-version }} PHP${{ matrix.php-version }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonarqube.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
# do not stop on another job's failure
fail-fast: false
matrix:
php-versions: ['8.2']
php-versions: ['8.3']
databases: ['sqlite']
server-versions: ['stable31']

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ port `9003`. Depending on your system a possible configuration could
look like this:

```ini
; /etc/php/8.1/cli/php.ini
; /etc/php/8.3/cli/php.ini
; ...
[Xdebug]
zend_extension=/usr/lib/php/20190902/xdebug.so
Expand All @@ -287,7 +287,7 @@ xdebug.remote_autostart=1
```

```ini
; /etc/php/8.1/apache2/php.ini
; /etc/php/8.3/apache2/php.ini
; ...
[Xdebug]
zend_extension=/usr/lib/php/20190902/xdebug.so
Expand Down Expand Up @@ -342,7 +342,7 @@ services:
networks:
- web_dev
```
`IMAGE` could be set to `IMAGE=thecodingmachine/php:8.1-v4-apache-node14` and the content of `Dockerfile` might
`IMAGE` could be set to `IMAGE=thecodingmachine/php:8.3-v4-apache-node14` and the content of `Dockerfile` might
look like this:

```dockerfile
Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
<screenshot>https://github.com/R0Wi/workflow_ocr/blob/eb2d65e9610406bbab22c4c8dda1cea015b5c791/doc/img/usage_1.jpg?raw=true</screenshot>
<dependencies>
<nextcloud min-version="31" max-version="31"/>
<php min-version="8.1" max-version="8.3"/>
<php min-version="8.1" max-version="8.4"/>
</dependencies>
</info>
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
"mikehaertl/php-shellcommand": "^1.6"
},
"require-dev": {
"phpunit/phpunit": "9.3.*",
"phpunit/php-code-coverage": "9.2.5",
"phpunit/phpcov": "8.2.*",
"nextcloud/coding-standard": "^1.0",
"vimeo/psalm": "^5.15",
"phpunit/phpunit": "^11.0",
"phpunit/php-code-coverage": "^11.0",
"phpunit/phpcov": "^10.0",
"nextcloud/coding-standard": "^1.3",
"vimeo/psalm": "6.4.*",
"nextcloud/ocp": "dev-stable31"
},
"config": {
"optimize-autoloader": true,
"platform": {
"php": "8.2"
"php": "8.3"
},
"autoloader-suffix": "WorkflowOcr"
},
Expand Down
Loading

0 comments on commit adea181

Please sign in to comment.