From 6425be9740b0d2a1cbb91f9441dbf7dda1c4a564 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Marinier?= <sebastien.marinier@arawa.fr>
Date: Fri, 16 May 2025 17:14:45 +0200
Subject: [PATCH] chore: support nextcloud 31 (#338)

* chore: support nextcloud 31

* chore: psalm for php 8.3
---
 .github/workflows/lint.yml     | 4 ++--
 .github/workflows/php-test.yml | 9 +++------
 .github/workflows/static.yml   | 2 +-
 appinfo/info.xml               | 2 +-
 composer.json                  | 2 +-
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 1a700a2..f078246 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.0, 8.1, 8.2]
+        php-versions: [8.1, 8.2, 8.3]
     name: php${{ matrix.php-versions }} lint
     steps:
     - name: Checkout
@@ -30,4 +30,4 @@ jobs:
         php-version: ${{ matrix.php-versions }}
         coverage: none
     - name: Lint
-      run: composer run lint
\ No newline at end of file
+      run: composer run lint
diff --git a/.github/workflows/php-test.yml b/.github/workflows/php-test.yml
index 2dad2ac..86b794b 100644
--- a/.github/workflows/php-test.yml
+++ b/.github/workflows/php-test.yml
@@ -11,11 +11,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['8.0', '8.1', '8.2']
-        nextcloud-versions: ['stable29', 'stable30']
-        exclude:
-          - php-versions: '8.0'
-            nextcloud-versions: 'stable30'
+        php-versions: ['8.1', '8.2', '8.3']
+        nextcloud-versions: ['stable29', 'stable30', 'stable31']
     name: php${{ matrix.php-versions }} on ${{ matrix.nextcloud-versions }} unit tests
     env:
       CI: true
@@ -37,7 +34,7 @@ jobs:
         path: nextcloud/apps/bbb
     - name: Update test stub
       working-directory: nextcloud/apps/bbb
-      run: composer update friendsofphp/php-cs-fixer nextcloud/ocp phpunit/phpunit -W
+      run: composer update friendsofphp/php-cs-fixer nextcloud/ocp phpunit/phpunit vimeo/psalm -W
     - name: Install dependencies
       working-directory: nextcloud/apps/bbb
       run: composer install
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
index 7306881..db09b73 100644
--- a/.github/workflows/static.yml
+++ b/.github/workflows/static.yml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
         matrix:
-            ocp-version: [ "^30", "^29"]
+            ocp-version: [ "^31", "^30", "^29"]
     name: Nextcloud ${{ matrix.ocp-version }}
     steps:
         - name: Checkout
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 3e5e6e2..ca6df38 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
         <lib>curl</lib>
         <lib>mbstring</lib>
         <lib>SimpleXML</lib>
-        <nextcloud min-version="26" max-version="30"/>
+        <nextcloud min-version="29" max-version="31"/>
     </dependencies>
     <commands>
         <command>OCA\BigBlueButton\Command\ClearAvatarCache</command>
diff --git a/composer.json b/composer.json
index 02e206e..741f6b9 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
         "nextcloud/coding-standard": "^1.1.0",
         "phpstan/phpstan": "^0.12.29",
         "nextcloud/ocp": "^29.0 || ^30.0 || ^31.0",
-        "vimeo/psalm": "5.9.0",
+        "vimeo/psalm": "5.9.0 || ^6.1.0",
         "psr/container": "^1.1.2 || ^1.1.4 || ^2.0.2"
     },
     "config": {