diff options
| author | Anna <anna@nextcloud.com> | 2022-03-22 10:04:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-22 10:04:46 +0100 |
| commit | dc8da35ec7f51d21678e4da2c1d1aeb8a4b8c0d2 (patch) | |
| tree | 4589e8f69bf9b7f32e316781403f27399ad1ecfc | |
| parent | e4e5217fa28aaf8b1f52d408081c3a298b9ddb13 (diff) | |
| parent | eda1e721c442e5b0b5ea37b0fe9f0dc65f5a9d53 (diff) | |
Merge pull request #2683 from nextcloud/enhancement/php8.1
Add PHP8.1 support
| -rw-r--r-- | .github/workflows/lint-php.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/phpunit.yml | 11 | ||||
| -rw-r--r-- | appinfo/info.xml | 2 | ||||
| -rw-r--r-- | composer.json | 3 | ||||
| -rw-r--r-- | composer.lock | 8 |
5 files changed, 16 insertions, 10 deletions
diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml index c1d72cc6..68ae194d 100644 --- a/.github/workflows/lint-php.yml +++ b/.github/workflows/lint-php.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: ["7.4", "8.0"] + php-versions: ["7.4", "8.0", "8.1"] name: php-lint diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 98a546c6..ae3799b1 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -38,7 +38,7 @@ jobs: path: apps/${{ env.APP_NAME }} - name: Set up php ${{ matrix.php-versions }} - uses: shivammathur/setup-php@v1 + uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} tools: phpunit @@ -82,8 +82,9 @@ jobs: databases: ['mysql'] server-versions: ['stable21', 'stable22', 'stable23', 'master'] include: - - php-versions: 7.4 - server-versions: stable23 + - php-versions: '8.1' + databases: 'mysql' + server-versions: master name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} @@ -110,7 +111,7 @@ jobs: path: apps/${{ env.APP_NAME }} - name: Set up php ${{ matrix.php-versions }} - uses: shivammathur/setup-php@v1 + uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} tools: phpunit @@ -176,7 +177,7 @@ jobs: path: apps/${{ env.APP_NAME }} - name: Set up php ${{ matrix.php-versions }} - uses: shivammathur/setup-php@v1 + uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} tools: phpunit diff --git a/appinfo/info.xml b/appinfo/info.xml index 57087b07..de40eaef 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -38,7 +38,7 @@ <screenshot>https://raw.githubusercontent.com/nextcloud/screenshots/main/apps/Contacts/contacts.png</screenshot> <dependencies> - <php min-version="7.3" max-version="8.0" /> + <php min-version="7.3" max-version="8.1" /> <nextcloud min-version="21" max-version="24" /> </dependencies> diff --git a/composer.json b/composer.json index fc5607ec..aaa18d71 100644 --- a/composer.json +++ b/composer.json @@ -14,6 +14,9 @@ "test:unit": "phpunit -c phpunit.xml --fail-on-warning", "test:integration": "phpunit -c phpunit.integration.xml --fail-on-warning" }, + "require": { + "php": ">=7.3 <=8.1" + }, "require-dev": { "christophwurst/nextcloud_testing": "^0.12.4", "nextcloud/coding-standard": "^0.5.0", diff --git a/composer.lock b/composer.lock index 8dc702eb..1dd9f0f9 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": "b5a4281028c39a616597c799ed0b4d9d", + "content-hash": "dba5bbe3402206e45570ddf832c2c0d5", "packages": [], "packages-dev": [ { @@ -4220,10 +4220,12 @@ "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, - "platform": [], + "platform": { + "php": ">=7.3 <=8.1" + }, "platform-dev": [], "platform-overrides": { "php": "7.3" }, - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.2.0" } |