Merge branch 'master' of github.com:sualko/cloud_bbb

.github/workflows/php-test.yml

@@ -11,13 +11,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['7.3', '7.4']
+        php-versions: ['7.4', '8']
-        nextcloud-versions: ['stable20', 'stable21', 'stable22']
+        nextcloud-versions: ['stable22', 'stable23', 'stable24']
         include:
-          - php-versions: '7.2'
+          - php-versions: '7.3'
-            nextcloud-versions: 'stable20'
-          - php-versions: '8'
             nextcloud-versions: 'stable22'
+          - php-versions: '7.3'
+            nextcloud-versions: 'stable23'
     name: php${{ matrix.php-versions }} on ${{ matrix.nextcloud-versions }} unit tests
     env:
       CI: true
@@ -37,14 +37,9 @@ jobs:
       uses: actions/checkout@master
       with:
         path: nextcloud/apps/bbb
-    - name: Fix php-parser on stable20 incompatibility with phpunit 9.3+
+    - name: Update test stub
-      if: ${{ matrix.nextcloud-versions == 'stable20' }}
-      working-directory: nextcloud/3rdparty
-      run: composer require nikic/php-parser:4.10
-    - name: Downgrade phpunit for php7.2
-      if: ${{ matrix.php-versions == '7.2' }}
       working-directory: nextcloud/apps/bbb
-      run: composer update phpunit/phpunit christophwurst/nextcloud -W
+      run: composer update christophwurst/nextcloud -W
     - name: Install dependencies
       working-directory: nextcloud/apps/bbb
       run: composer install

.github/workflows/static.yml

@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
         matrix:
-            ocp-version: [ 'dev-stable22', 'dev-stable21', 'dev-stable20' ]
+            ocp-version: [ 'dev-stable24', 'dev-stable23', 'dev-stable22' ]
     name: Nextcloud ${{ matrix.ocp-version }}
     steps:
         - name: Checkout

appinfo/info.xml

@@ -43,7 +43,7 @@ Developer wanted! If you have time it would be awesome if you could help to enha
         <lib>curl</lib>
         <lib>mbstring</lib>
         <lib>SimpleXML</lib>
-        <nextcloud min-version="20" max-version="23"/>
+        <nextcloud min-version="22" max-version="24"/>
     </dependencies>
     <commands>
         <command>OCA\BigBlueButton\Command\ClearAvatarCache</command>

composer.json

@@ -17,7 +17,7 @@
         "friendsofphp/php-cs-fixer": "^2.16",
         "nextcloud/coding-standard": "^0.5.0",
         "phpstan/phpstan": "^0.12.29",
-        "christophwurst/nextcloud": "^20.0 || ^21.0 || ^22.0",
+        "christophwurst/nextcloud": "^22.0 || ^23.0 || ^24.0",
         "vimeo/psalm": "^4.5"
     },
     "config": {