From 77a78aaabf1cd18e4763fe6f23920cfef20be168 Mon Sep 17 00:00:00 2001
From: Stephan Mikwauschk <16403474+Pappmann@users.noreply.github.com>
Date: Wed, 6 May 2026 15:18:19 +0200
Subject: [PATCH] fix: add Nextcloud 33 compatibility
---
.github/workflows/lint.yml | 2 +-
.github/workflows/php-test.yml | 7 +++++++
.github/workflows/static.yml | 5 ++---
appinfo/info.xml | 2 +-
composer.json | 4 ++--
composer.lock | 16 ++++++++--------
6 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index f0782461..cb8fc7bf 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- php-versions: [8.1, 8.2, 8.3]
+ php-versions: [8.1, 8.2, 8.3, 8.4]
name: php${{ matrix.php-versions }} lint
steps:
- name: Checkout
diff --git a/.github/workflows/php-test.yml b/.github/workflows/php-test.yml
index a5ad6e67..d9e796a0 100644
--- a/.github/workflows/php-test.yml
+++ b/.github/workflows/php-test.yml
@@ -13,6 +13,13 @@ jobs:
matrix:
php-versions: ['8.1', '8.2', '8.3']
nextcloud-versions: ['stable29', 'stable30', 'stable31', 'stable32']
+ include:
+ - php-versions: '8.2'
+ nextcloud-versions: 'stable33'
+ - php-versions: '8.3'
+ nextcloud-versions: 'stable33'
+ - php-versions: '8.4'
+ nextcloud-versions: 'stable33'
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 db09b736..ad29f0d1 100644
--- a/.github/workflows/static.yml
+++ b/.github/workflows/static.yml
@@ -6,7 +6,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- ocp-version: [ "^31", "^30", "^29"]
+ ocp-version: [ "^33", "^32", "^31", "^30", "^29"]
name: Nextcloud ${{ matrix.ocp-version }}
steps:
- name: Checkout
@@ -14,7 +14,7 @@ jobs:
- name: Set up php
uses: shivammathur/setup-php@master
with:
- php-version: 8.1
+ php-version: 8.2
coverage: none
- name: Update php-cs-fixer
run: composer update friendsofphp/php-cs-fixer -W
@@ -24,4 +24,3 @@ jobs:
run: composer require --dev nextcloud/ocp:${{ matrix.ocp-version }} symfony/service-contracts -W
- name: Run coding standards check
run: composer run psalm
-
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 0d0316ea..09deeaad 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -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
diff --git a/composer.json b/composer.json
index c61433ae..798e4d24 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"name": "littleredbutton/bigbluebutton",
"description": "Nextcloud Integration for BigBlueButton",
"type": "project",
- "license": "AGPL",
+ "license": "AGPL-3.0-or-later",
"authors": [
{
"name": "Klaus Herberth"
@@ -16,7 +16,7 @@
"friendsofphp/php-cs-fixer": "^3",
"nextcloud/coding-standard": "^1.1.0",
"phpstan/phpstan": "^2.1.16",
- "nextcloud/ocp": "^29.0 || ^30.0 || ^31.0",
+ "nextcloud/ocp": "^29.0 || ^30.0 || ^31.0 || ^32.0 || ^33.0",
"vimeo/psalm": "^6.1.0",
"psr/container": "^1.1.2 || ^1.1.4 || ^2.0.2"
},
diff --git a/composer.lock b/composer.lock
index 6ab95cea..0d895499 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": "d59a59edeec6dc109da6c5567ca32988",
+ "content-hash": "c1ef8241ce98140a11c34270df154421",
"packages": [
{
"name": "littleredbutton/bigbluebutton-api-php",
@@ -2141,20 +2141,20 @@
},
{
"name": "nextcloud/ocp",
- "version": "v31.0.9",
+ "version": "v33.0.3",
"source": {
"type": "git",
"url": "https://github.com/nextcloud-deps/ocp.git",
- "reference": "abd32429d794ede1d92b7b0a88a1070371c907b5"
+ "reference": "cc85b9dcf0236ff8c3acbe9a62dfd511c6ee5ea6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/abd32429d794ede1d92b7b0a88a1070371c907b5",
- "reference": "abd32429d794ede1d92b7b0a88a1070371c907b5",
+ "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/cc85b9dcf0236ff8c3acbe9a62dfd511c6ee5ea6",
+ "reference": "cc85b9dcf0236ff8c3acbe9a62dfd511c6ee5ea6",
"shasum": ""
},
"require": {
- "php": "~8.1 || ~8.2 || ~8.3 || ~8.4",
+ "php": "~8.1 || ~8.2 || ~8.3 || ~8.4 || ~8.5",
"psr/clock": "^1.0",
"psr/container": "^2.0.2",
"psr/event-dispatcher": "^1.0",
@@ -2163,7 +2163,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-stable31": "31.0.0-dev"
+ "dev-stable33": "33.0.0-dev"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -2185,7 +2185,7 @@
"issues": "https://github.com/nextcloud-deps/ocp/issues",
"source": "https://github.com/nextcloud-deps/ocp/tree/v31.0.9"
},
- "time": "2025-07-31T00:57:37+00:00"
+ "time": "2026-04-29T01:55:00+00:00"
},
{
"name": "nikic/php-parser",