From 8b911587b47147558f5d6105b35f15cebb85dd85 Mon Sep 17 00:00:00 2001 From: nextcloud-command Date: Sun, 23 Oct 2022 05:09:47 +0000 Subject: [PATCH 1/3] Update psalm baseline Signed-off-by: GitHub --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 361f3e1..687a74e 100644 --- a/composer.lock +++ b/composer.lock @@ -179,12 +179,12 @@ "source": { "type": "git", "url": "https://github.com/ChristophWurst/nextcloud_composer.git", - "reference": "67cd5561253fc7773084862caf643073422ffc70" + "reference": "ec5f7afbfc58247d7e5d7aa30f700ce0c42f8829" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/67cd5561253fc7773084862caf643073422ffc70", - "reference": "67cd5561253fc7773084862caf643073422ffc70", + "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/ec5f7afbfc58247d7e5d7aa30f700ce0c42f8829", + "reference": "ec5f7afbfc58247d7e5d7aa30f700ce0c42f8829", "shasum": "" }, "require": { @@ -216,7 +216,7 @@ "source": "https://github.com/ChristophWurst/nextcloud_composer/tree/master" }, "abandoned": "nextcloud/ocp", - "time": "2022-10-02T02:47:38+00:00" + "time": "2022-10-22T02:28:26+00:00" }, { "name": "composer/package-versions-deprecated", From 2b7a5fddb7d53fbd127d4a53c858d712497fc74f Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 25 Oct 2022 10:48:33 +0200 Subject: [PATCH 2/3] Migrate to nextcloud/ocp Signed-off-by: Joas Schilling --- .github/workflows/psalm.yml | 54 +++++++++++ .github/workflows/static-analysis.yml | 41 --------- ...nextcloud.yml => update-nextcloud-ocp.yml} | 23 ++--- composer.json | 11 ++- composer.lock | 91 +++++++++---------- 5 files changed, 116 insertions(+), 104 deletions(-) create mode 100644 .github/workflows/psalm.yml delete mode 100644 .github/workflows/static-analysis.yml rename .github/workflows/{update-christophwurst-nextcloud.yml => update-nextcloud-ocp.yml} (65%) diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml new file mode 100644 index 0000000..3af2854 --- /dev/null +++ b/.github/workflows/psalm.yml @@ -0,0 +1,54 @@ +# This workflow is provided via the organization template repository +# +# https://github.com/nextcloud/.github +# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization + +name: Static analysis + +on: pull_request + +concurrency: + group: lint-psalm-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + +jobs: + static-analysis: + runs-on: ubuntu-latest + strategy: + # do not stop on another job's failure + fail-fast: false + matrix: + ocp-version: [ 'dev-master', 'dev-stable25', 'dev-stable24', 'dev-stable23' ] + + name: Nextcloud ${{ matrix.ocp-version }} + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Set up php + uses: shivammathur/setup-php@v2 + with: + php-version: 7.4 + tools: composer:v1 + coverage: none + + - name: Install dependencies + run: composer i + + - name: Install dependencies + run: composer require --dev nextcloud/ocp:${{ matrix.ocp-version }} --ignore-platform-reqs + + - name: Run coding standards check + run: composer run psalm + + summary: + runs-on: ubuntu-latest + needs: static-analysis + + if: always() + + name: static-psalm-analysis-summary + + steps: + - name: Summary status + run: if ${{ needs.static-analysis.result != 'success' }}; then exit 1; fi diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml deleted file mode 100644 index d07d3c3..0000000 --- a/.github/workflows/static-analysis.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: Static analysis - -on: [pull_request] - -jobs: - static-psalm-analysis: - runs-on: ubuntu-latest - strategy: - # do not stop on another job's failure - fail-fast: false - matrix: - ocp-version: [ 'dev-master', 'dev-stable25', 'dev-stable24', 'dev-stable23' ] - name: Nextcloud ${{ matrix.ocp-version }} - steps: - - name: Checkout - uses: actions/checkout@master - - name: Set up php - uses: shivammathur/setup-php@master - with: - php-version: 7.4 - tools: composer:v1 - coverage: none - - name: Install dependencies - run: composer i - - name: Install dependencies - run: composer require --dev christophwurst/nextcloud:${{ matrix.ocp-version }} - - name: Run coding standards check - run: composer run psalm - - summary: - runs-on: ubuntu-latest - needs: static-psalm-analysis - - if: always() - - name: static-psalm-analysis-summary - - steps: - - name: Summary status - run: if ${{ needs.static-psalm-analysis.result != 'success' && needs.static-psalm-analysis.result != 'skipped' }}; then exit 1; fi - diff --git a/.github/workflows/update-christophwurst-nextcloud.yml b/.github/workflows/update-nextcloud-ocp.yml similarity index 65% rename from .github/workflows/update-christophwurst-nextcloud.yml rename to .github/workflows/update-nextcloud-ocp.yml index e2e5f52..cb4d4d6 100644 --- a/.github/workflows/update-christophwurst-nextcloud.yml +++ b/.github/workflows/update-nextcloud-ocp.yml @@ -3,23 +3,24 @@ # https://github.com/nextcloud/.github # https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization -name: Update christophwurst/nextcloud +name: Update nextcloud/ocp on: workflow_dispatch: schedule: - - cron: "5 4 * * 0" + - cron: "5 2 * * 0" jobs: - update-christophwurst-nextcloud: + update-nextcloud-ocp: runs-on: ubuntu-latest strategy: fail-fast: false matrix: - branches: ["master", "stable24", "stable23", "stable22"] + branches: ["master"] + target: ["stable23"] - name: update-christophwurst-nextcloud-${{ matrix.branches }} + name: update-nextcloud-ocp-${{ matrix.branches }} steps: - uses: actions/checkout@v3 @@ -37,8 +38,8 @@ jobs: - name: Composer install run: composer install - - name: Composer update christophwurst/nextcloud - run: composer require --dev christophwurst/nextcloud:dev-${{ matrix.branches }} + - name: Composer update nextcloud/ocp + run: composer require --dev nextcloud/ocp:dev-${{ matrix.target }} continue-on-error: true - name: Reset checkout dirs @@ -52,14 +53,14 @@ jobs: uses: peter-evans/create-pull-request@v3 with: token: ${{ secrets.COMMAND_BOT_PAT }} - commit-message: Update psalm baseline + commit-message: Update nextcloud/ocp dependency committer: GitHub author: nextcloud-command signoff: true - branch: automated/noid/${{ matrix.branches }}-update-christophwurst-nextcloud - title: "[${{ matrix.branches }}] Update christophwurst/nextcloud dependency" + branch: automated/noid/${{ matrix.branches }}-update-nextcloud-ocp + title: "[${{ matrix.branches }}] Update nextcloud/ocp dependency" body: | - Auto-generated update of [christophwurst/nextcloud](https://github.com/ChristophWurst/nextcloud_composer/) dependency + Auto-generated update of [nextcloud/ocp](https://github.com/nextcloud-deps/ocp/) dependency labels: | dependencies 3. to review diff --git a/composer.json b/composer.json index 28db562..1b72e02 100644 --- a/composer.json +++ b/composer.json @@ -1,8 +1,8 @@ { "autoload-dev": { "psr-4": { - "OCP\\": "vendor/christophwurst/nextcloud/OCP", - "OCA\\Notifications\\": "lib/" + "OCP\\": "vendor/nextcloud/ocp/OCP", + "OCA\\QuotaWarning\\": "lib/" } }, "name": "nextcloud/notifications", @@ -13,7 +13,8 @@ "classmap-authoritative": true, "platform": { "php": "7.4" - } + }, + "sort-packages": true }, "scripts": { "lint": "find . -name \\*.php -not -path './vendor/*' -not -path './build/*' -print0 | xargs -0 -n1 php -l", @@ -25,9 +26,9 @@ "psalm:fix": "psalm --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType" }, "require-dev": { - "phpunit/phpunit": "^9.5", "nextcloud/coding-standard": "^1.0.0", - "christophwurst/nextcloud": "dev-master", + "nextcloud/ocp": "dev-stable23", + "phpunit/phpunit": "^9.5", "vimeo/psalm": "^4.22.0" } } diff --git a/composer.lock b/composer.lock index 687a74e..c79a325 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": "830c66299ee1ea9cad33564a6ac8d2a0", + "content-hash": "a59f4639476d2d299cf4aad5d3675ec5", "packages": [], "packages-dev": [ { @@ -173,51 +173,6 @@ ], "time": "2021-03-30T17:13:30+00:00" }, - { - "name": "christophwurst/nextcloud", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/ChristophWurst/nextcloud_composer.git", - "reference": "ec5f7afbfc58247d7e5d7aa30f700ce0c42f8829" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/ec5f7afbfc58247d7e5d7aa30f700ce0c42f8829", - "reference": "ec5f7afbfc58247d7e5d7aa30f700ce0c42f8829", - "shasum": "" - }, - "require": { - "php": "^7.4 || ~8.0 || ~8.1", - "psr/container": "^1.1.1", - "psr/event-dispatcher": "^1.0", - "psr/log": "^1.1" - }, - "default-branch": true, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "26.0.0-dev" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "AGPL-3.0-or-later" - ], - "authors": [ - { - "name": "Christoph Wurst", - "email": "christoph@winzerhof-wurst.at" - } - ], - "description": "Composer package containing Nextcloud's public API (classes, interfaces)", - "support": { - "issues": "https://github.com/ChristophWurst/nextcloud_composer/issues", - "source": "https://github.com/ChristophWurst/nextcloud_composer/tree/master" - }, - "abandoned": "nextcloud/ocp", - "time": "2022-10-22T02:28:26+00:00" - }, { "name": "composer/package-versions-deprecated", "version": "1.11.99.5", @@ -1105,6 +1060,48 @@ }, "time": "2021-11-10T08:44:10+00:00" }, + { + "name": "nextcloud/ocp", + "version": "dev-stable23", + "source": { + "type": "git", + "url": "https://github.com/nextcloud-deps/ocp.git", + "reference": "f9c2024f8c87a4dc51c17e3eaf3ee267cfe66e12" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/f9c2024f8c87a4dc51c17e3eaf3ee267cfe66e12", + "reference": "f9c2024f8c87a4dc51c17e3eaf3ee267cfe66e12", + "shasum": "" + }, + "require": { + "php": "^7.3 || ~8.0.0", + "psr/container": "^1.1.1", + "psr/event-dispatcher": "^1.0", + "psr/log": "^1.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "23.0.0-dev" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "AGPL-3.0-or-later" + ], + "authors": [ + { + "name": "Christoph Wurst", + "email": "christoph@winzerhof-wurst.at" + } + ], + "description": "Composer package containing Nextcloud's public API (classes, interfaces)", + "support": { + "source": "https://github.com/nextcloud-deps/ocp/tree/stable23" + }, + "time": "2022-09-27T08:15:32+00:00" + }, { "name": "nikic/php-parser", "version": "v4.15.1", @@ -4784,7 +4781,7 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "christophwurst/nextcloud": 20 + "nextcloud/ocp": 20 }, "prefer-stable": false, "prefer-lowest": false, From a2d73075bd1f5397b915ec3136134c78d305edbb Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 25 Oct 2022 10:50:45 +0200 Subject: [PATCH 3/3] Add changelog and 25 support Signed-off-by: Joas Schilling --- CHANGELOG.md | 7 ++++++- appinfo/info.xml | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 01ea686..ac74014 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,12 @@ # Changelog All notable changes to this project will be documented in this file. -## 1.14.0 +## 1.15.0 – 2022-10-25 +### Changed +- Nextcloud 25 compatibility +- Require Nextcloud 23 + +## 1.14.0 – 2022-04-11 ### Changed - Nextcloud 24 compatibility diff --git a/appinfo/info.xml b/appinfo/info.xml index 500a3c4..5b382a3 100755 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -7,7 +7,7 @@ This app sends notifications to users when they reached 85, 90 and 95% of their quota (checked once a day). In addition an email can be sent to the users. The three percentages can be changed in the admin settings. It is also possible to have a link in the email and the notification for upsell options. - 1.14.0 + 1.15.0 agpl Joas Schilling QuotaWarning @@ -23,7 +23,7 @@ It is also possible to have a link in the email and the notification for upsell https://raw.githubusercontent.com/nextcloud/quota_warning/master/docs/email.png https://raw.githubusercontent.com/nextcloud/quota_warning/master/docs/admin-settings.png - +