diff options
| author | Christoph Wurst <ChristophWurst@users.noreply.github.com> | 2023-10-09 13:29:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-09 13:29:16 +0200 |
| commit | 9854dd89cc575ebd23206831ceed3e31c36038d3 (patch) | |
| tree | 502a4371772db71126a580aa6c7df25ed4d9c6d7 | |
| parent | 813a6c9a69e390679b4456667ebea116d64bdcf9 (diff) | |
| parent | 91d2cb83f5b64180a99d6c972f429fffb1b23eaa (diff) | |
Merge pull request #3642 from nextcloud/feat/php8.3-support
Add support for php8.3
| -rw-r--r-- | .github/workflows/lint-php.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/phpunit.yml | 5 | ||||
| -rw-r--r-- | appinfo/info.xml | 2 | ||||
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | composer.lock | 6 |
5 files changed, 10 insertions, 7 deletions
diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml index 8d7f63f8..a0081dc1 100644 --- a/.github/workflows/lint-php.yml +++ b/.github/workflows/lint-php.yml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: [ "8.0", "8.1", "8.2" ] + php-versions: [ "8.0", "8.1", "8.2", "8.3"] name: php-lint diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 4b7ada07..031b1c10 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -88,10 +88,13 @@ jobs: # do not stop on another job's failure fail-fast: false matrix: - php-versions: ['8.0', '8.1', '8.2'] + php-versions: ['8.1', '8.2', '8.3'] databases: ['mysql'] server-versions: ['master'] include: + - php-versions: '8.0' + server-versions: 'master' + databases: 'mysql' - php-versions: '7.4' server-versions: stable25 databases: 'mysql' diff --git a/appinfo/info.xml b/appinfo/info.xml index 4070bd8c..193ab38c 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -38,7 +38,7 @@ <screenshot>https://raw.githubusercontent.com/nextcloud/screenshots/master/apps/Contacts/contacts.png</screenshot> <dependencies> - <php min-version="7.4" max-version="8.2" /> + <php min-version="7.4" max-version="8.3" /> <nextcloud min-version="25" max-version="28" /> </dependencies> diff --git a/composer.json b/composer.json index d5eadb9e..4207e601 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "test:integration": "phpunit -c phpunit.integration.xml --fail-on-warning" }, "require": { - "php": ">=7.4 <=8.2" + "php": ">=7.4 <=8.3" }, "require-dev": { "christophwurst/nextcloud_testing": "^0.12.4", diff --git a/composer.lock b/composer.lock index 9afd28da..dbd129e1 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7fe5308939c4dcb823f6375366303261", + "content-hash": "e67e8e0b4ca7f901bff816cc045ed61a", "packages": [], "packages-dev": [ { @@ -3989,11 +3989,11 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=7.4 <=8.2" + "php": ">=7.4 <=8.3" }, "platform-dev": [], "platform-overrides": { "php": "7.4" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } |