Merge branch 'master' into 218-add-infinitewhiteboard-to-disabledfeat…

…ures-enum
littleredbutton · Sep 28, 2024 · 01a3249 · 01a3249
2 parents 85024b8 + 7d82f34
commit 01a3249
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 0 deletions.
diff --git a/src/Enum/Feature.php b/src/Enum/Feature.php
@@ -36,6 +36,7 @@ enum Feature: string
     case IMPORT_SHARED_NOTES_FROM_BREAKOUT_ROOMS = 'importSharedNotesFromBreakoutRooms';
     case LAYOUTS = 'layouts';
     case LEARNING_DASHBOARD = 'learningDashboard';
+    case LEARNING_DASHBOARD_DOWNLOAD_SESSION_DATA = 'learningDashboardDownloadSessionData';
     case POLLS = 'polls';
     case SCREENSHARE = 'screenshare';
     case SHARED_NOTES = 'sharedNotes';

diff --git a/src/Parameters/CreateMeetingParameters.php b/src/Parameters/CreateMeetingParameters.php
@@ -73,6 +73,8 @@
  * @method $this     setWebcamsOnlyForModerator(bool $isWebcamsOnlyForModerator)
  * @method string    getLogo()
  * @method $this     setLogo(string $logo)
+ * @method string    getDarklogo()
+ * @method $this     setDarklogo(string $darklogo)
  * @method string    getBannerText()
  * @method $this     setBannerText(string $bannerText)
  * @method string    getBannerColor()
@@ -167,6 +169,7 @@ class CreateMeetingParameters extends MetaParameters
     protected ?bool $allowStartStopRecording = null;
     protected ?bool $webcamsOnlyForModerator = null;
     protected ?string $logo = null;
+    protected ?string $darklogo = null;
     protected ?string $bannerText = null;
     protected ?string $bannerColor = null;
     protected ?string $copyright = null;

diff --git a/src/Parameters/JoinMeetingParameters.php b/src/Parameters/JoinMeetingParameters.php
@@ -51,6 +51,8 @@
  * @method $this     setRole(Role $role)
  * @method bool|null isExcludeFromDashboard()
  * @method $this     setExcludeFromDashboard(bool $excludeFromDashboard)
+ * @method string    getWebcamBackgroundURL()
+ * @method $this     setWebcamBackgroundURL(string $webcamBackgroundURL)
  */
 class JoinMeetingParameters extends UserDataParameters
 {
@@ -63,6 +65,7 @@ class JoinMeetingParameters extends UserDataParameters
     protected ?string $errorRedirectUrl = null;
     protected ?bool $guest = null;
     protected ?bool $excludeFromDashboard = null;
+    protected ?string $webcamBackgroundURL = null;
 
     public function __construct(protected string $meetingID, protected string $fullName, protected Role $role)
     {

diff --git a/tests/common/TestCase.php b/tests/common/TestCase.php
@@ -75,6 +75,7 @@ protected function generateCreateParams(): array
             'moderatorOnlyMessage' => $this->faker->sentence,
             'webcamsOnlyForModerator' => $this->faker->boolean(50),
             'logo' => $this->faker->imageUrl(330, 70),
+            'darklogo' => $this->faker->imageUrl(330, 70),
             'copyright' => $this->faker->text,
             'guestPolicy' => $this->faker->randomElement([GuestPolicy::ALWAYS_ACCEPT, GuestPolicy::ALWAYS_DENY, GuestPolicy::ASK_MODERATOR]),
             'muteOnStart' => $this->faker->boolean(50),
@@ -165,6 +166,7 @@ protected function getCreateMock(array $params): CreateMeetingParameters
             ->setModeratorOnlyMessage($params['moderatorOnlyMessage'])
             ->setWebcamsOnlyForModerator($params['webcamsOnlyForModerator'])
             ->setLogo($params['logo'])
+            ->setDarklogo($params['darklogo'])
             ->setCopyright($params['copyright'])
             ->setEndCallbackUrl($params['meta_endCallbackUrl'])
             ->setRecordingReadyCallbackUrl($params['meta_bbb-recording-ready-url'])

diff --git a/tests/unit/Parameters/CreateMeetingParametersTest.php b/tests/unit/Parameters/CreateMeetingParametersTest.php
@@ -51,6 +51,7 @@ public function testCreateMeetingParameters(): void
         $this->assertEquals($params['moderatorOnlyMessage'], $createMeetingParams->getModeratorOnlyMessage());
         $this->assertEquals($params['webcamsOnlyForModerator'], $createMeetingParams->isWebcamsOnlyForModerator());
         $this->assertEquals($params['logo'], $createMeetingParams->getLogo());
+        $this->assertEquals($params['darklogo'], $createMeetingParams->getDarklogo());
         $this->assertEquals($params['copyright'], $createMeetingParams->getCopyright());
         $this->assertEquals($params['muteOnStart'], $createMeetingParams->isMuteOnStart());
         $this->assertEquals($params['guestPolicy'], $createMeetingParams->getGuestPolicy());

diff --git a/tests/unit/Parameters/JoinMeetingParametersTest.php b/tests/unit/Parameters/JoinMeetingParametersTest.php
@@ -52,12 +52,14 @@ public function testJoinMeetingParameters(): void
         $joinMeetingParams->setRedirect($redirect = $this->faker->boolean(50));
         $joinMeetingParams->setErrorRedirectUrl($newErrorRedirectUrl = $this->faker->url);
         $joinMeetingParams->setGuest($guest = $this->faker->boolean(50));
+        $joinMeetingParams->setWebcamBackgroundURL($webcamBackgroundURL = $this->faker->url);
         $this->assertEquals($newId, $joinMeetingParams->getMeetingID());
         $this->assertEquals($newName, $joinMeetingParams->getFullName());
         $this->assertEquals($newRole, $joinMeetingParams->getRole());
         $this->assertEquals($avatarUrl, $joinMeetingParams->getAvatarURL());
         $this->assertEquals($redirect, $joinMeetingParams->isRedirect());
         $this->assertEquals($newErrorRedirectUrl, $joinMeetingParams->getErrorRedirectUrl());
         $this->assertEquals($guest, $joinMeetingParams->isGuest());
+        $this->assertEquals($webcamBackgroundURL, $joinMeetingParams->getWebcamBackgroundURL());
     }
 }