From 9fd051ac3b3bc2de191c20a09dcfa442a000e09a Mon Sep 17 00:00:00 2001 From: Sebastien Marinier Date: Mon, 28 Oct 2024 12:30:22 +0100 Subject: [PATCH 1/6] release: 2.7.3 --- .github/workflows/php-test.yml | 11 +++++++++-- .github/workflows/static.yml | 2 +- appinfo/info.xml | 4 ++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/php-test.yml b/.github/workflows/php-test.yml index e811d49..3c4cf32 100644 --- a/.github/workflows/php-test.yml +++ b/.github/workflows/php-test.yml @@ -11,8 +11,15 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: ['8.0', '8.1', '8.2'] - nextcloud-versions: ['stable26', 'stable27', 'stable28'] + php-versions: ['8.0', '8.1', '8.2', '8.3'] + nextcloud-versions: ['stable26', 'stable27', 'stable28', 'stable29', 'stable30'] + exclude: +- - php-versions: '8.0' +- nextcloud-versions: 'stable30' +- - php-versions: '8.3' +- nextcloud-versions: 'stable26' +- - php-versions: '8.3' +- nextcloud-versions: 'stable27' name: php${{ matrix.php-versions }} on ${{ matrix.nextcloud-versions }} unit tests env: CI: true diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 33dcb49..177dd2e 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ocp-version: [ '^28', '^27', '^26'] + ocp-version: [ "^30", "^29", '^28', '^27', '^26'] name: Nextcloud ${{ matrix.ocp-version }} steps: - name: Checkout diff --git a/appinfo/info.xml b/appinfo/info.xml index d075ef0..3e5e6e2 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -22,7 +22,7 @@ Contributors are welcome! If you have time it would be awesome if you could help *This app integrates BigBlueButton and is not endorsed or certified by BigBlueButton Inc. BigBlueButton and the BigBlueButton Logo are trademarks of BigBlueButton Inc.* ]]> - 2.7.2 + 2.7.3 agpl Arawa Klaus Herberth @@ -44,7 +44,7 @@ Contributors are welcome! If you have time it would be awesome if you could help curl mbstring SimpleXML - + OCA\BigBlueButton\Command\ClearAvatarCache From 9f2d820d6366764e60afc4fc02c82f704ce6a54b Mon Sep 17 00:00:00 2001 From: Sebastien Marinier Date: Mon, 28 Oct 2024 14:36:09 +0100 Subject: [PATCH 2/6] fix: gitactions (psr 1.1.2 / NC 26) --- .github/workflows/php-test.yml | 12 ++++++------ .github/workflows/static.yml | 6 +++++- composer.json | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/php-test.yml b/.github/workflows/php-test.yml index 3c4cf32..ad59a95 100644 --- a/.github/workflows/php-test.yml +++ b/.github/workflows/php-test.yml @@ -14,12 +14,12 @@ jobs: php-versions: ['8.0', '8.1', '8.2', '8.3'] nextcloud-versions: ['stable26', 'stable27', 'stable28', 'stable29', 'stable30'] exclude: -- - php-versions: '8.0' -- nextcloud-versions: 'stable30' -- - php-versions: '8.3' -- nextcloud-versions: 'stable26' -- - php-versions: '8.3' -- nextcloud-versions: 'stable27' + - php-versions: '8.0' + nextcloud-versions: 'stable30' + - php-versions: '8.3' + nextcloud-versions: 'stable26' + - php-versions: '8.3' + nextcloud-versions: 'stable27' name: php${{ matrix.php-versions }} on ${{ matrix.nextcloud-versions }} unit tests env: CI: true diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 177dd2e..84b6534 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -7,6 +7,10 @@ jobs: strategy: matrix: ocp-version: [ "^30", "^29", '^28', '^27', '^26'] + include: + - psrcontainer: "psr/container" + - psrcontainer: "psr/container:^1.1.2" + ocp-version: '^26' name: Nextcloud ${{ matrix.ocp-version }} steps: - name: Checkout @@ -21,7 +25,7 @@ jobs: - name: Install dependencies run: composer i - name: Install dependencies - run: composer require --dev nextcloud/ocp:${{ matrix.ocp-version }} symfony/service-contracts + run: composer require --dev nextcloud/ocp:${{ matrix.ocp-version }} ${{ matrix.psrcontainer }} symfony/service-contracts - name: Run coding standards check run: composer run psalm diff --git a/composer.json b/composer.json index fd0ca52..67145b3 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "phpstan/phpstan": "^0.12.29", "nextcloud/ocp": "^25.0 || ^26.0 || ^27.0", "vimeo/psalm": "^5.0", - "psr/container": "^1.1.2" + "psr/container": "^2.0.2" }, "config": { "optimize-autoloader": true, From 63982ac2e73eccb477c32b1a77759d5f58f51cd2 Mon Sep 17 00:00:00 2001 From: Sebastien Marinier Date: Mon, 28 Oct 2024 14:46:51 +0100 Subject: [PATCH 3/6] fix: gitactions psr 1.1.2 OR 2.0.2 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 67145b3..5a04a63 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "phpstan/phpstan": "^0.12.29", "nextcloud/ocp": "^25.0 || ^26.0 || ^27.0", "vimeo/psalm": "^5.0", - "psr/container": "^2.0.2" + "psr/container": "^1.1.2 || ^2.0.2" }, "config": { "optimize-autoloader": true, From bbf0abfa751681e8a6270b406a99ff31b35fed0f Mon Sep 17 00:00:00 2001 From: Sebastien Marinier Date: Mon, 28 Oct 2024 14:59:01 +0100 Subject: [PATCH 4/6] fix: gitactions psalm warnings --- lib/NoPermissionResponse.php | 3 +++ lib/NotFoundResponse.php | 3 +++ 2 files changed, 6 insertions(+) diff --git a/lib/NoPermissionResponse.php b/lib/NoPermissionResponse.php index d238b2a..4e29058 100644 --- a/lib/NoPermissionResponse.php +++ b/lib/NoPermissionResponse.php @@ -6,6 +6,9 @@ use OCP\AppFramework\Http\ContentSecurityPolicy; use OCP\AppFramework\Http\Response; use OCP\Template; +/** + * @template-extends Response> + */ class NoPermissionResponse extends Response { public function __construct() { parent::__construct(); diff --git a/lib/NotFoundResponse.php b/lib/NotFoundResponse.php index 815932c..5fbba2e 100644 --- a/lib/NotFoundResponse.php +++ b/lib/NotFoundResponse.php @@ -6,6 +6,9 @@ use OCP\AppFramework\Http\ContentSecurityPolicy; use OCP\AppFramework\Http\Response; use OCP\Template; +/** + * @template-extends Response> + */ class NotFoundResponse extends Response { public function __construct() { parent::__construct(); From 6226921652699899ab24ca085dbe63476121d608 Mon Sep 17 00:00:00 2001 From: Sebastien Marinier Date: Mon, 28 Oct 2024 15:14:22 +0100 Subject: [PATCH 5/6] fix: gitactions (psalm warnings NC < 28) --- lib/NoPermissionResponse.php | 3 +++ lib/NotFoundResponse.php | 3 +++ 2 files changed, 6 insertions(+) diff --git a/lib/NoPermissionResponse.php b/lib/NoPermissionResponse.php index 4e29058..b334923 100644 --- a/lib/NoPermissionResponse.php +++ b/lib/NoPermissionResponse.php @@ -8,6 +8,9 @@ use OCP\Template; /** * @template-extends Response> + * + * (NC < 28) + * @psalm-suppress TooManyTemplateParams */ class NoPermissionResponse extends Response { public function __construct() { diff --git a/lib/NotFoundResponse.php b/lib/NotFoundResponse.php index 5fbba2e..9630175 100644 --- a/lib/NotFoundResponse.php +++ b/lib/NotFoundResponse.php @@ -8,6 +8,9 @@ use OCP\Template; /** * @template-extends Response> + * + * (NC < 28) + * @psalm-suppress TooManyTemplateParams */ class NotFoundResponse extends Response { public function __construct() { From 632ea4a0f5c5c3ee7f04e4ba8d832c6138bb9157 Mon Sep 17 00:00:00 2001 From: Sebastien Marinier Date: Wed, 13 Nov 2024 15:58:35 +0100 Subject: [PATCH 6/6] chore: can't test 8.3 --- .github/workflows/php-test.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/php-test.yml b/.github/workflows/php-test.yml index ad59a95..87d16a0 100644 --- a/.github/workflows/php-test.yml +++ b/.github/workflows/php-test.yml @@ -11,15 +11,11 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: ['8.0', '8.1', '8.2', '8.3'] + php-versions: ['8.0', '8.1', '8.2'] nextcloud-versions: ['stable26', 'stable27', 'stable28', 'stable29', 'stable30'] exclude: - php-versions: '8.0' nextcloud-versions: 'stable30' - - php-versions: '8.3' - nextcloud-versions: 'stable26' - - php-versions: '8.3' - nextcloud-versions: 'stable27' name: php${{ matrix.php-versions }} on ${{ matrix.nextcloud-versions }} unit tests env: CI: true