Merge 093e286e0f into c2e61304c1

Merge pull request #307 from arawa/release/2.7.3
Release/2.7.3
2024-11-30 19:06:16 +00:00 · 2024-11-28 16:22:15 +01:00 · 2024-11-19 18:04:01 +01:00 · 2024-11-13 15:58:35 +01:00 · 2024-11-13 14:49:58 +01:00 · 2024-10-28 15:14:22 +01:00
7 changed files with 27 additions and 7 deletions
--- a/.github/workflows/php-test.yml
+++ b/.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
--- a/.github/workflows/static.yml
+++ b/.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

--- 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.*
    ]]></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>
--- 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": "^1.1.2 || ^2.0.2"
    },
    "config": {
        "optimize-autoloader": true,
--- a/lib/BigBlueButton/API.php
+++ b/lib/BigBlueButton/API.php
@ -118,7 +118,8 @@ class API {
 		$joinMeetingParams->addUserData('bbb_skip_video_preview_on_first_join', !$room->getMediaCheck()); // 2.3

 		if ($room->getCleanLayout()) {
-			$joinMeetingParams->addUserData('bbb_auto_swap_layout', true);
+			$joinMeetingParams->addUserData('bbb_auto_swap_layout', true); // 2.5 and below // ToDo: remove in the future
+			$joinMeetingParams->addUserData('bbb_hide_presentation_on_join', true); // 2.6 and up
 			$joinMeetingParams->addUserData('bbb_show_participants_on_login', false);
 			$joinMeetingParams->addUserData('bbb_show_public_chat_on_login', false);
 		}
--- a/lib/NoPermissionResponse.php
+++ b/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();
--- a/lib/NotFoundResponse.php
+++ b/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();
Author	SHA1	Message	Date
Jonas	b5897b4096	Merge `093e286e0f` into `c2e61304c1`	2024-11-30 19:06:16 +00:00
Baptiste Fotia	c2e61304c1	Merge pull request #307 from arawa/release/2.7.3 Release/2.7.3	2024-11-28 16:22:15 +01:00
Sébastien Marinier	c5f8eab5e5	Merge branch 'master' into release/2.7.3	2024-11-19 18:04:01 +01:00
Sebastien Marinier	632ea4a0f5	chore: can't test 8.3	2024-11-13 15:58:35 +01:00
Sébastien Marinier	e70ddcc322	Merge branch 'littleredbutton:master' into release/2.7.3	2024-11-13 14:49:58 +01:00
Sebastien Marinier	6226921652	fix: gitactions (psalm warnings NC < 28)	2024-10-28 15:14:22 +01:00
Sebastien Marinier	bbf0abfa75	fix: gitactions psalm warnings	2024-10-28 14:59:01 +01:00
Sebastien Marinier	63982ac2e7	fix: gitactions psr 1.1.2 OR 2.0.2	2024-10-28 14:46:51 +01:00
Sebastien Marinier	9f2d820d63	fix: gitactions (psr 1.1.2 / NC 26)	2024-10-28 14:36:09 +01:00
Sebastien Marinier	9fd051ac3b	release: 2.7.3	2024-10-28 12:30:22 +01:00
brtbr	093e286e0f	fix: add new hide_presentation_on_join flag As of BBB 2.6 the userdata flag for hiding the presentation has changed. This commit adds the new `bbb_hide_presentation_on_join` flag when a clean layout is selected. In order to keep backwards compatability for BBB 2.5 and lower we can send both flags and remove the deprecated one later on.	2024-06-02 18:16:54 +02:00