From 6037e544a18803cc81addbd755391bff1f2e37a2 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 28 Mar 2024 13:28:10 +0100 Subject: [PATCH 1/3] feat(deps): Add Nextcloud 30 support Signed-off-by: Joas Schilling --- .github/workflows/update-nextcloud-ocp-matrix.yml | 2 +- appinfo/info.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/update-nextcloud-ocp-matrix.yml b/.github/workflows/update-nextcloud-ocp-matrix.yml index 9e291dc..bd7f44b 100644 --- a/.github/workflows/update-nextcloud-ocp-matrix.yml +++ b/.github/workflows/update-nextcloud-ocp-matrix.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: branches: ['main'] - target: ['stable26'] + target: ['stable27'] name: update-nextcloud-ocp-${{ matrix.branches }} diff --git a/appinfo/info.xml b/appinfo/info.xml index 9803c1f..ad4735c 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.18.0 + 1.19.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/main/docs/email.png https://raw.githubusercontent.com/nextcloud/quota_warning/main/docs/admin-settings.png - + From f9b8c1f0c59b021ec9812935028f5c84ee7e5838 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 29 Mar 2024 13:13:15 +0100 Subject: [PATCH 2/3] chore(release): Add changelog for 1.19.0 Signed-off-by: Joas Schilling --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 528d997..20d3950 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Changelog All notable changes to this project will be documented in this file. +## 1.19.0 – 2024-03-29 +### Changed +- Nextcloud 29 compatibility +- Require Nextcloud 27 + ## 1.18.0 – 2023-12-01 ### Changed - Nextcloud 28 compatibility From a3b28f25907f5abf90777c783d039c397ce63c61 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 29 Mar 2024 13:16:07 +0100 Subject: [PATCH 3/3] chore(CI): Update tooling Signed-off-by: Joas Schilling --- composer.json | 7 +-- composer.lock | 98 +++++++++++++++++++++++++++++++--------- tests/psalm-baseline.xml | 10 ++-- 3 files changed, 85 insertions(+), 30 deletions(-) diff --git a/composer.json b/composer.json index 187db5c..f6d6088 100644 --- a/composer.json +++ b/composer.json @@ -21,15 +21,16 @@ "cs:check": "php-cs-fixer fix --dry-run --diff", "cs:fix": "php-cs-fixer fix", "psalm": "psalm.phar --threads=1", + "psalm:dev": "psalm.phar --no-cache --threads=$(nproc)", "psalm:update-baseline": "psalm.phar --threads=1 --update-baseline --set-baseline=tests/psalm-baseline.xml", "psalm:clear": "psalm.phar --clear-cache && psalm.phar --clear-global-cache", "psalm:fix": "psalm.phar --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType", "test:unit": "vendor/bin/phpunit -c tests/phpunit.xml" }, "require-dev": { - "nextcloud/coding-standard": "^1.1.1", - "nextcloud/ocp": "dev-stable26", + "nextcloud/coding-standard": "^1.2", + "nextcloud/ocp": "dev-stable27", "phpunit/phpunit": "^9.6", - "psalm/phar": "^5.16.0" + "psalm/phar": "^5.23" } } diff --git a/composer.lock b/composer.lock index c876dcd..5fbb4e6 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": "250f285b7ed5203f09d9ea510d593c44", + "content-hash": "af48fcce7854cb0fbf168db1632109ae", "packages": [], "packages-dev": [ { @@ -179,28 +179,29 @@ }, { "name": "nextcloud/ocp", - "version": "dev-stable26", + "version": "dev-stable27", "source": { "type": "git", "url": "https://github.com/nextcloud-deps/ocp.git", - "reference": "692e8fb9d10e591600048723c6ed5f7d33fa4275" + "reference": "3beb4e9456fd71c91c299ee416e142ad89901deb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/692e8fb9d10e591600048723c6ed5f7d33fa4275", - "reference": "692e8fb9d10e591600048723c6ed5f7d33fa4275", + "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/3beb4e9456fd71c91c299ee416e142ad89901deb", + "reference": "3beb4e9456fd71c91c299ee416e142ad89901deb", "shasum": "" }, "require": { "php": "^7.4 || ~8.0 || ~8.1", - "psr/container": "^1.1.1", + "psr/clock": "^1.0", + "psr/container": "^2.0.2", "psr/event-dispatcher": "^1.0", - "psr/log": "^1.1" + "psr/log": "^1.1.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "26.0.0-dev" + "dev-stable27": "27.0.0-dev" } }, "notification-url": "https://packagist.org/downloads/", @@ -216,9 +217,9 @@ "description": "Composer package containing Nextcloud's public API (classes, interfaces)", "support": { "issues": "https://github.com/nextcloud-deps/ocp/issues", - "source": "https://github.com/nextcloud-deps/ocp/tree/stable26" + "source": "https://github.com/nextcloud-deps/ocp/tree/stable27" }, - "time": "2024-01-03T00:33:21+00:00" + "time": "2024-03-05T00:31:26+00:00" }, { "name": "nikic/php-parser", @@ -398,16 +399,16 @@ }, { "name": "php-cs-fixer/shim", - "version": "v3.49.0", + "version": "v3.52.1", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/shim.git", - "reference": "f7d3219cac46632f12362c9aa7c2ac0d2fe92c52" + "reference": "baec5a6d4b24bad4c930d39fde34b2b0c1c8cd94" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/f7d3219cac46632f12362c9aa7c2ac0d2fe92c52", - "reference": "f7d3219cac46632f12362c9aa7c2ac0d2fe92c52", + "url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/baec5a6d4b24bad4c930d39fde34b2b0c1c8cd94", + "reference": "baec5a6d4b24bad4c930d39fde34b2b0c1c8cd94", "shasum": "" }, "require": { @@ -444,9 +445,9 @@ "description": "A tool to automatically fix PHP code style", "support": { "issues": "https://github.com/PHP-CS-Fixer/shim/issues", - "source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.49.0" + "source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.52.1" }, - "time": "2024-02-02T00:42:09+00:00" + "time": "2024-03-19T21:03:12+00:00" }, { "name": "phpunit/php-code-coverage", @@ -905,24 +906,77 @@ }, "time": "2024-03-11T20:43:33+00:00" }, + { + "name": "psr/clock", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/clock.git", + "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/clock/zipball/e41a24703d4560fd0acb709162f73b8adfc3aa0d", + "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d", + "shasum": "" + }, + "require": { + "php": "^7.0 || ^8.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Psr\\Clock\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for reading the clock.", + "homepage": "https://github.com/php-fig/clock", + "keywords": [ + "clock", + "now", + "psr", + "psr-20", + "time" + ], + "support": { + "issues": "https://github.com/php-fig/clock/issues", + "source": "https://github.com/php-fig/clock/tree/1.0.0" + }, + "time": "2022-11-25T14:36:26+00:00" + }, { "name": "psr/container", - "version": "1.1.2", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", - "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", + "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963", "shasum": "" }, "require": { "php": ">=7.4.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, "autoload": { "psr-4": { "Psr\\Container\\": "src/" @@ -949,9 +1003,9 @@ ], "support": { "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/1.1.2" + "source": "https://github.com/php-fig/container/tree/2.0.2" }, - "time": "2021-11-05T16:50:12+00:00" + "time": "2021-11-05T16:47:00+00:00" }, { "name": "psr/event-dispatcher", diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml index 7a7ffc5..8773f15 100644 --- a/tests/psalm-baseline.xml +++ b/tests/psalm-baseline.xml @@ -1,13 +1,13 @@ - + - \OC_Util + - setHtmlBody - setPlainBody - setSubject + + +