Merge 5c4b95ea11 into c2e61304c1

Release/2.7.3

.github/workflows/php-test.yml

@@ -12,7 +12,10 @@ jobs:
     strategy:
       matrix:
         php-versions: ['8.0', '8.1', '8.2']
-        nextcloud-versions: ['stable26', 'stable27', 'stable28']
+        nextcloud-versions: ['stable26', 'stable27', 'stable28', 'stable29', 'stable30']
+        exclude:
+          - php-versions: '8.0'
+            nextcloud-versions: 'stable30'
     name: php${{ matrix.php-versions }} on ${{ matrix.nextcloud-versions }} unit tests
     env:
       CI: true

.github/workflows/static.yml

@@ -6,7 +6,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
         matrix:
-            ocp-version: [ '^28', '^27', '^26']
+            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
 

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.*
     ]]></description>
-    <version>2.7.2</version>
+    <version>2.7.3</version>
     <licence>agpl</licence>
     <author mail="cloud_bbb@arawa.fr" homepage="https://arawa.fr/">Arawa</author>
     <author>Klaus Herberth</author>
@@ -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="28"/>
+        <nextcloud min-version="26" max-version="30"/>
     </dependencies>
     <commands>
         <command>OCA\BigBlueButton\Command\ClearAvatarCache</command>

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": "^1.1.2 || ^2.0.2"
     },
     "config": {
         "optimize-autoloader": true,

lib/Migration/Version000000Date20230727145600.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\BigBlueButton\Migration;
+
+use Closure;
+use OCP\DB\ISchemaWrapper;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+/**
+ * Auto-generated migration step: Please modify to your needs!
+ */
+class Version000000Date20230727145600 extends SimpleMigrationStep {
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 * @return null|ISchemaWrapper
+	 */
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+		/** @var ISchemaWrapper $schema */
+		$schema = $schemaClosure();
+
+        if ($schema->hasTable('bbb_rooms')) {
+			$table = $schema->getTable('bbb_rooms');
+
+			if ($table->hasColumn('welcome') && $table->getColumn('welcome')->getNotnull()) {
+				$table->getColumn('welcome')->setNotnull(false);
+			}
+		}
+
+		return null;
+	}
+}

lib/NoPermissionResponse.php

@@ -6,6 +6,12 @@ use OCP\AppFramework\Http\ContentSecurityPolicy;
 use OCP\AppFramework\Http\Response;
 use OCP\Template;
 
+/**
+ * @template-extends Response<int, array<string, mixed>>
+ *
+ * (NC < 28)
+ * @psalm-suppress TooManyTemplateParams
+ */
 class NoPermissionResponse extends Response {
 	public function __construct() {
 		parent::__construct();

lib/NotFoundResponse.php

@@ -6,6 +6,12 @@ use OCP\AppFramework\Http\ContentSecurityPolicy;
 use OCP\AppFramework\Http\Response;
 use OCP\Template;
 
+/**
+ * @template-extends Response<int, array<string, mixed>>
+ *
+ * (NC < 28)
+ * @psalm-suppress TooManyTemplateParams
+ */
 class NotFoundResponse extends Response {
 	public function __construct() {
 		parent::__construct();