Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Enum/ApiMethod.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ enum ApiMethod: string
{
case CREATE = 'create';
case JOIN = 'join';
/** @deprecated Removed in BBB 3.0; will be removed in 8.0. */
case ENTER = 'enter';
case END = 'end';
case IS_MEETING_RUNNING = 'isMeetingRunning';
Expand Down
1 change: 1 addition & 0 deletions src/Enum/Feature.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
enum Feature: string
{
case BREAKOUT_ROOMS = 'breakoutRooms';
/** @deprecated Removed as a disabledFeatures option in BBB 3.0 — use Feature::LIVE_TRANSCRIPTION instead; will be removed in 8.0. */
case CAPTIONS = 'captions';
case CHAT = 'chat';
case PRIVATE_CHAT = 'privateChat';
Expand Down
7 changes: 6 additions & 1 deletion src/Enum/MeetingLayout.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,12 @@ enum MeetingLayout: string
case PRESENTATION_FOCUS = 'PRESENTATION_FOCUS';
case VIDEO_FOCUS = 'VIDEO_FOCUS';
case CAMERAS_ONLY = 'CAMERAS_ONLY';
case PARTICIPANTS_CHAT_ONLY = 'PARTICIPANTS_CHAT_ONLY';
case PARTICIPANTS_AND_CHAT_ONLY = 'PARTICIPANTS_AND_CHAT_ONLY';
case PRESENTATION_ONLY = 'PRESENTATION_ONLY';
case MEDIA_ONLY = 'MEDIA_ONLY';

/**
* @deprecated BC only. Use MeetingLayout::PARTICIPANTS_AND_CHAT_ONLY instead; will be removed in 8.0.
*/
public const PARTICIPANTS_CHAT_ONLY = self::PARTICIPANTS_AND_CHAT_ONLY;
}
20 changes: 18 additions & 2 deletions src/Parameters/JoinMeetingParameters.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@
* @method $this setUserID(string $userID)
* @method string|null getWebVoiceConf()
* @method $this setWebVoiceConf(string $webVoiceConf)
* @method string|null getDefaultLayout()
* @method $this setDefaultLayout(string $defaultLayout)
* @method string|null getAvatarURL()
* @method $this setAvatarURL(string $avatarURL)
* @method bool|null isRedirect()
Expand Down Expand Up @@ -86,4 +84,22 @@ final class JoinMeetingParameters extends UserDataParameters
public function __construct(protected string $meetingID, protected string $fullName, protected Role $role)
{
}

/**
* @deprecated Removed in BBB 3.0 — use addUserData('bbb_default_layout', ...) instead; will be removed in 8.0.
*/
public function getDefaultLayout(): ?string
{
return $this->defaultLayout;
}

/**
* @deprecated Removed in BBB 3.0 — use addUserData('bbb_default_layout', ...) instead; will be removed in 8.0.
*/
public function setDefaultLayout(string $defaultLayout): self
{
$this->defaultLayout = $defaultLayout;

return $this;
}
}
11 changes: 5 additions & 6 deletions tests/common/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -102,18 +102,17 @@ protected function generateCreateParams(): array
'endWhenNoModerator' => $this->faker->boolean(50),
'endWhenNoModeratorDelayInMinutes' => $this->faker->numberBetween(1, 100),
'meetingLayout' => $this->faker->randomElement([
MeetingLayout::CUSTOM_LAYOUT,
MeetingLayout::SMART_LAYOUT,
MeetingLayout::PRESENTATION_FOCUS,
MeetingLayout::VIDEO_FOCUS,
MeetingLayout::UNIFIED_LAYOUT,
MeetingLayout::CAMERAS_ONLY,
MeetingLayout::PARTICIPANTS_AND_CHAT_ONLY,
MeetingLayout::PRESENTATION_ONLY,
MeetingLayout::MEDIA_ONLY,
]),
'learningDashboardCleanupDelayInMinutes' => $this->faker->numberBetween(1, 100),
'breakoutRoomsEnabled' => $this->faker->boolean(50),
'breakoutRoomsPrivateChatEnabled' => $this->faker->boolean(50),
'meetingEndedURL' => $this->faker->url,
'breakoutRoomsRecord' => $this->faker->boolean(50),
'allowRequestsWithoutSession' => $this->faker->boolean(50),
'virtualBackgroundsDisabled' => $this->faker->boolean(50),
'userCameraCap' => $this->faker->numberBetween(1, 5),
'groups' => $this->generateBreakoutRoomsGroups(),
];
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/Parameters/CreateMeetingParametersTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@ public function testDisabledFeatures(): void
$this->assertStringNotContainsString('disabledFeatures=', $params);

// Test with multiple disabled features
$createMeetingParams->setDisabledFeatures([Feature::CHAT, Feature::POLLS, Feature::CAPTIONS]);
$createMeetingParams->setDisabledFeatures([Feature::CHAT, Feature::POLLS, Feature::LIVE_TRANSCRIPTION]);
$params = urldecode($createMeetingParams->getHTTPQuery());
$this->assertStringContainsString('disabledFeatures=chat,polls,captions', $params);
$this->assertStringContainsString('disabledFeatures=chat,polls,liveTranscription', $params);

// Test empty disabled features exclude
$createMeetingParams->setDisabledFeaturesExclude([]);
Expand Down
Loading