Skip to content

Commit 2bb0f7d

Browse files
jonaslmjonaslm
committed
Renamed lockedOnJoin to lockOnJoin internally. Added missing locksettings for HideUserList and LockOnJoinConfigurable
1 parent 853df36 commit 2bb0f7d

File tree

3 files changed

+103
-50
lines changed

3 files changed

+103
-50
lines changed

‎src/Parameters/CreateMeetingParameters.php‎

Lines changed: 66 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -143,18 +143,28 @@ class CreateMeetingParameters extends MetaParameters
143143
*/
144144
private $lockSettingsDisableNote;
145145

146-
/**
147-
* @var bool
146+
/**
147+
* @var bool
148+
*/
149+
private $lockSettingsHideUserList;
150+
151+
/**
152+
* @var bool
148153
*/
149154
private $lockSettingsLockedLayout;
150155

151156
/**
152157
* @var bool
153158
*/
154-
private $lockSettingsLockedOnJoin = true;
159+
private $lockSettingsLockOnJoin = true;
155160

156-
/**
157-
* @var array
161+
/**
162+
* @var bool
163+
*/
164+
private $lockSettingsLockOnJoinConfigurable;
165+
166+
/**
167+
* @var array
158168
*/
159169
private $presentations = [];
160170

@@ -661,10 +671,29 @@ public function setLockSettingsDisableNote($lockSettingsDisableNote)
661671
return $this;
662672
}
663673

664-
/**
665-
* @return bool
666-
*/
667-
public function isLockSettingsLockedLayout()
674+
/**
675+
* @return bool
676+
*/
677+
public function isLockSettingsHideUserList()
678+
{
679+
return $this->lockSettingsHideUserList;
680+
}
681+
682+
/**
683+
* @param bool $lockSettingsHideUserList
684+
* @return CreateMeetingParameters
685+
*/
686+
public function setLockSettingsHideUserList($lockSettingsHideUserList)
687+
{
688+
$this->lockSettingsHideUserList = $lockSettingsHideUserList;
689+
690+
return $this;
691+
}
692+
693+
/**
694+
* @return bool
695+
*/
696+
public function isLockSettingsLockedLayout()
668697
{
669698
return $this->lockSettingsLockedLayout;
670699
}
@@ -683,25 +712,44 @@ public function setLockSettingsLockedLayout($lockSettingsLockedLayout)
683712
/**
684713
* @return bool
685714
*/
686-
public function isLockSettingsLockedOnJoin()
715+
public function isLockSettingsLockOnJoin()
687716
{
688-
return $this->lockSettingsLockedOnJoin;
717+
return $this->lockSettingsLockOnJoin;
689718
}
690719

691720
/**
692-
* @param bool $lockedOnJoin
721+
* @param bool $lockOnJoin
693722
* @return CreateMeetingParameters
694723
*/
695-
public function setLockSettingsLockedOnJoin($lockedOnJoin)
724+
public function setLockSettingsLockOnJoin($lockOnJoin)
696725
{
697-
$this->lockedOnJoin = $lockedOnJoin;
726+
$this->lockSettingsLockOnJoin = $lockOnJoin;
698727

699728
return $this;
700729
}
701730

702-
/**
703-
* @param $endCallbackUrl
704-
* @return CreateMeetingParameters
731+
/**
732+
* @return bool
733+
*/
734+
public function isLockSettingsLockOnJoinConfigurable()
735+
{
736+
return $this->lockSettingsLockOnJoinConfigurable;
737+
}
738+
739+
/**
740+
* @param bool $lockOnJoinConfigurable
741+
* @return CreateMeetingParameters
742+
*/
743+
public function setLockSettingsLockOnJoinConfigurable($lockOnJoinConfigurable)
744+
{
745+
$this->lockSettingsLockOnJoinConfigurable = $lockOnJoinConfigurable;
746+
747+
return $this;
748+
}
749+
750+
/**
751+
* @param $endCallbackUrl
752+
* @return CreateMeetingParameters
705753
*/
706754
public function setEndCallbackUrl($endCallbackUrl)
707755
{
@@ -874,7 +922,7 @@ public function getHTTPQuery()
874922
'lockSettingsDisablePublicChat' => $this->isLockSettingsDisablePublicChat() ? 'true' : 'false',
875923
'lockSettingsDisableNote' => $this->isLockSettingsDisableNote() ? 'true' : 'false',
876924
'lockSettingsLockedLayout' => $this->isLockSettingsLockedLayout() ? 'true' : 'false',
877-
'lockSettingsLockOnJoin' => $this->isLockSettingsLockedOnJoin() ? 'true' : 'false',
925+
'lockSettingsLockOnJoin' => $this->isLockSettingsLockOnJoin() ? 'true' : 'false',
878926
];
879927

880928
// Add breakout rooms parameters only if the meeting is a breakout room

‎tests/Parameters/CreateMeetingParametersTest.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,11 @@ public function testCreateMeetingParameters()
5555
$this->assertEquals($params['lockSettingsDisablePrivateChat'], $createMeetingParams->isLockSettingsDisablePrivateChat());
5656
$this->assertEquals($params['lockSettingsDisablePublicChat'], $createMeetingParams->isLockSettingsDisablePublicChat());
5757
$this->assertEquals($params['lockSettingsDisableNote'], $createMeetingParams->isLockSettingsDisableNote());
58-
$this->assertEquals($params['lockSettingsLockedLayout'], $createMeetingParams->isLockSettingsLockedLayout());
59-
$this->assertEquals($params['lockSettingsLockedOnJoin'], $createMeetingParams->isLockSettingsLockedOnJoin());
60-
$this->assertEquals($params['meta_presenter'], $createMeetingParams->getMeta('presenter'));
58+
$this->assertEquals($params['lockSettingsHideUserList'], $createMeetingParams->isLockSettingsHideUserList());
59+
$this->assertEquals($params['lockSettingsLockedLayout'], $createMeetingParams->isLockSettingsLockedLayout());
60+
$this->assertEquals($params['lockSettingsLockOnJoin'], $createMeetingParams->isLockSettingsLockOnJoin());
61+
$this->assertEquals($params['lockSettingsLockOnJoinConfigurable'], $createMeetingParams->isLockSettingsLockOnJoinConfigurable());
62+
$this->assertEquals($params['meta_presenter'], $createMeetingParams->getMeta('presenter'));
6163
$this->assertEquals($params['meta_endCallbackUrl'], $createMeetingParams->getMeta('endCallbackUrl'));
6264

6365
// Check values are empty of this is not a breakout room

‎tests/TestCase.php‎

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -67,34 +67,36 @@ protected function createRealMeeting($bbb)
6767
protected function generateCreateParams()
6868
{
6969
return [
70-
'meetingName' => $this->faker->name,
71-
'meetingId' => $this->faker->uuid,
72-
'attendeePassword' => $this->faker->password,
73-
'moderatorPassword' => $this->faker->password,
74-
'autoStartRecording' => $this->faker->boolean(50),
75-
'dialNumber' => $this->faker->phoneNumber,
76-
'voiceBridge' => $this->faker->randomNumber(5),
77-
'webVoice' => $this->faker->word,
78-
'logoutUrl' => $this->faker->url,
79-
'maxParticipants' => $this->faker->numberBetween(2, 100),
80-
'record' => $this->faker->boolean(50),
81-
'duration' => $this->faker->numberBetween(0, 6000),
82-
'welcomeMessage' => $this->faker->sentence,
83-
'allowStartStopRecording' => $this->faker->boolean(50),
84-
'moderatorOnlyMessage' => $this->faker->sentence,
85-
'webcamsOnlyForModerator' => $this->faker->boolean(50),
86-
'logo' => $this->faker->imageUrl(330, 70),
87-
'copyright' => $this->faker->text,
88-
'muteOnStart' => $this->faker->boolean(50),
89-
'lockSettingsDisableCam' => $this->faker->boolean(50),
90-
'lockSettingsDisableMic' => $this->faker->boolean(50),
91-
'lockSettingsDisablePrivateChat' => $this->faker->boolean(50),
92-
'lockSettingsDisablePublicChat' => $this->faker->boolean(50),
93-
'lockSettingsDisableNote' => $this->faker->boolean(50),
94-
'lockSettingsLockedLayout' => $this->faker->boolean(50),
95-
'lockSettingsLockedOnJoin' => $this->faker->boolean(50),
96-
'meta_presenter' => $this->faker->name,
97-
'meta_endCallbackUrl' => $this->faker->url
70+
'meetingName' => $this->faker->name,
71+
'meetingId' => $this->faker->uuid,
72+
'attendeePassword' => $this->faker->password,
73+
'moderatorPassword' => $this->faker->password,
74+
'autoStartRecording' => $this->faker->boolean(50),
75+
'dialNumber' => $this->faker->phoneNumber,
76+
'voiceBridge' => $this->faker->randomNumber(5),
77+
'webVoice' => $this->faker->word,
78+
'logoutUrl' => $this->faker->url,
79+
'maxParticipants' => $this->faker->numberBetween(2, 100),
80+
'record' => $this->faker->boolean(50),
81+
'duration' => $this->faker->numberBetween(0, 6000),
82+
'welcomeMessage' => $this->faker->sentence,
83+
'allowStartStopRecording' => $this->faker->boolean(50),
84+
'moderatorOnlyMessage' => $this->faker->sentence,
85+
'webcamsOnlyForModerator' => $this->faker->boolean(50),
86+
'logo' => $this->faker->imageUrl(330, 70),
87+
'copyright' => $this->faker->text,
88+
'muteOnStart' => $this->faker->boolean(50),
89+
'lockSettingsDisableCam' => $this->faker->boolean(50),
90+
'lockSettingsDisableMic' => $this->faker->boolean(50),
91+
'lockSettingsDisablePrivateChat' => $this->faker->boolean(50),
92+
'lockSettingsDisablePublicChat' => $this->faker->boolean(50),
93+
'lockSettingsDisableNote' => $this->faker->boolean(50),
94+
'lockSettingsHideUserList' => $this->faker->boolean(50),
95+
'lockSettingsLockedLayout' => $this->faker->boolean(50),
96+
'lockSettingsLockOnJoin' => $this->faker->boolean(50),
97+
'lockSettingsLockOnJoinConfigurable' => $this->faker->boolean(50),
98+
'meta_presenter' => $this->faker->name,
99+
'meta_endCallbackUrl' => $this->faker->url
98100
];
99101
}
100102

@@ -130,7 +132,8 @@ protected function getCreateMock($params)
130132
->setEndCallbackUrl($params['meta_endCallbackUrl'])->setMuteOnStart($params['muteOnStart'])->setLockSettingsDisableCam($params['lockSettingsDisableCam'])
131133
->setLockSettingsDisableMic($params['lockSettingsDisableMic'])->setLockSettingsDisablePrivateChat($params['lockSettingsDisablePrivateChat'])
132134
->setLockSettingsDisablePublicChat($params['lockSettingsDisablePublicChat'])->setLockSettingsDisableNote($params['lockSettingsDisableNote'])
133-
->setLockSettingsLockedLayout($params['lockSettingsLockedLayout'])->setLockSettingsLockedOnJoin($params['lockSettingsLockedOnJoin'])
135+
->setLockSettingsHideUserList($params['lockSettingsHideUserList'])->setLockSettingsLockedLayout($params['lockSettingsLockedLayout'])
136+
->setLockSettingsLockOnJoin($params['lockSettingsLockOnJoin'])->setLockSettingsLockOnJoinConfigurable($params['lockSettingsLockOnJoin'])
134137
->addMeta('presenter', $params['meta_presenter']);
135138
}
136139

0 commit comments

Comments
 (0)