From 79726eb804b92b770c6027fd5b8fe546eda15c36 Mon Sep 17 00:00:00 2001 From: Richard Steinmetz Date: Mon, 9 May 2022 15:43:01 +0200 Subject: [PATCH 1/2] Add support for Nextcloud 25 and fix static analysis Signed-off-by: Richard Steinmetz --- .github/workflows/static-analysis.yml | 10 +++---- appinfo/info.xml | 2 +- tests/psalm-baseline.xml | 39 ++++++++++++++++++++++++++- 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 880d62a6..c6d57d2a 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ocp-version: [ v21.0.0', 'dev-stable22', 'dev-stable23', 'dev-stable24', 'dev-master' ] + ocp-version: [ 'dev-stable21 as 21', 'dev-stable22 as 22', 'dev-stable23 as 23', 'dev-stable24 as 24', 'dev-master as 25' ] name: Nextcloud ${{ matrix.ocp-version }} steps: - name: Checkout @@ -20,10 +20,10 @@ jobs: - name: Install dependencies run: composer i - name: Install OCP package - if: ${{ matrix.ocp-version == 'stable20' }} - run: composer require --dev christophwurst/nextcloud:${{ matrix.ocp-version }} + if: ${{ contains(matrix.ocp-version, 'dev-stable21') || contains(matrix.ocp-version, 'dev-stable22') || contains(matrix.ocp-version, 'dev-stable23') }} + run: composer require --dev christophwurst/nextcloud:"${{ matrix.ocp-version }}" - name: Install OCP package - if: ${{ matrix.ocp-version == 'dev-master' }} - run: composer require --dev christophwurst/nextcloud:${{ matrix.ocp-version }} --ignore-platform-req=php + if: ${{ contains(matrix.ocp-version, 'dev-stable24') || contains(matrix.ocp-version, 'dev-master') }} + run: composer require --dev christophwurst/nextcloud:"${{ matrix.ocp-version }}" --ignore-platform-req=php - name: Run coding standards check run: composer run psalm diff --git a/appinfo/info.xml b/appinfo/info.xml index f26f1452..144dee23 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -21,7 +21,7 @@ mysql pgsql gmp - + diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml index 07b49b98..8a869d73 100644 --- a/tests/psalm-baseline.xml +++ b/tests/psalm-baseline.xml @@ -1,18 +1,47 @@ - + + registerEventListener + registerEventListener registerEventListener StateChangeActivity::class StateChangeActivity::class StateChangeRegistryUpdater::class + + DisabledByAdmin + StateChanged + StateChanged + Command + + + StateChanged + + + + + Event + + + + + StateChangeActivity + StateChanged + + + + + StateChangeRegistryUpdater + StateChanged + + Template @@ -20,6 +49,14 @@ + + DisabledByAdmin + StateChanged + StateChanged + StateChanged + StateChanged + StateChanged + ServerRequest ServerRequest From 2b2ba6eb05f324a1e5d3adfbabc36ca7a7e3f936 Mon Sep 17 00:00:00 2001 From: Richard Steinmetz Date: Mon, 9 May 2022 16:45:21 +0200 Subject: [PATCH 2/2] Bump christophwurst/nextcloud-http-client from 0.1.0 to 0.2.0 Signed-off-by: Richard Steinmetz --- composer.json | 2 +- composer.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index 7ceab056..bde93774 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "php": ">=7.3.0", "ext-json": "*", "bamarni/composer-bin-plugin": "^1.5", - "christophwurst/nextcloud-http-client": "^0.1.0", + "christophwurst/nextcloud-http-client": "^0.2.0", "web-auth/webauthn-lib": "^3.3" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 988a7c71..600fdf57 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": "38b764eb7e14b662240c77ffa6f6da39", + "content-hash": "1ffbfd9bfc0669367c5acff908a29c5d", "packages": [ { "name": "bamarni/composer-bin-plugin", @@ -228,20 +228,20 @@ }, { "name": "christophwurst/nextcloud-http-client", - "version": "v0.1.0", + "version": "v0.2.0", "source": { "type": "git", "url": "https://github.com/ChristophWurst/nextcloud-http-client.git", - "reference": "f44948c5cca870907f9efd300ad91a852c7e5eb9" + "reference": "79abda558fddd5f7db2d45c44ab6a6718cef8249" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ChristophWurst/nextcloud-http-client/zipball/f44948c5cca870907f9efd300ad91a852c7e5eb9", - "reference": "f44948c5cca870907f9efd300ad91a852c7e5eb9", + "url": "https://api.github.com/repos/ChristophWurst/nextcloud-http-client/zipball/79abda558fddd5f7db2d45c44ab6a6718cef8249", + "reference": "79abda558fddd5f7db2d45c44ab6a6718cef8249", "shasum": "" }, "require": { - "christophwurst/nextcloud": ">=19.0.0 <25.0.0" + "christophwurst/nextcloud": ">=19.0.0 <26.0.0" }, "provide": { "php-http/async-client-implementation": "1.0", @@ -262,9 +262,9 @@ "description": "HTTPlug and PSR7 adapter for Nextcloud", "support": { "issues": "https://github.com/ChristophWurst/nextcloud-http-client/issues", - "source": "https://github.com/ChristophWurst/nextcloud-http-client/tree/v0.1.0" + "source": "https://github.com/ChristophWurst/nextcloud-http-client/tree/v0.2.0" }, - "time": "2022-02-21T15:57:59+00:00" + "time": "2022-05-09T14:26:30+00:00" }, { "name": "fgrosse/phpasn1", @@ -4504,5 +4504,5 @@ "platform-overrides": { "php": "7.3.0" }, - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.3.0" }